Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r2100 -r2111 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 2100) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 2111) @@ -35,7 +35,6 @@ public class ConversionHelperTests { [Test] - [TestCase(InputDamProjectType.AssessmentRegional, DamProjectType.AssessmentRegional)] [TestCase(InputDamProjectType.Design, DamProjectType.Design)] [TestCase(InputDamProjectType.Operational, DamProjectType.Operational)] public void CanConvertToDamProjectType(InputDamProjectType inputDamProjectType, DamProjectType damProjectType) @@ -44,7 +43,6 @@ } [Test] - [TestCase(DamProjectType.AssessmentRegional, InputDamProjectType.AssessmentRegional)] [TestCase(DamProjectType.Design, InputDamProjectType.Design)] [TestCase(DamProjectType.Operational, InputDamProjectType.Operational)] public void CanConvertToInputDamProjectType(DamProjectType damProjectType, InputDamProjectType inputDamProjectType) @@ -407,73 +405,8 @@ { Assert.AreEqual(inputStabilityDesignMethod, ConversionHelper.ConvertToInputStabilityDesignMethod(stabilityDesignMethod)); } - + [Test] - [TestCase(LoadSituation.Dry, ConversionHelper.LoadSituationDry)] - [TestCase(LoadSituation.Wet, ConversionHelper.LoadSituationWet)] - public void CanConvertToOutputLoadSituation(LoadSituation loadSituation, int outputLoadSituation) - { - Assert.AreEqual(outputLoadSituation, ConversionHelper.ConvertToOutputLoadSituation(loadSituation)); - } - - [Test] - [TestCase(ConversionHelper.LoadSituationDry, LoadSituation.Dry)] - [TestCase(ConversionHelper.LoadSituationWet, LoadSituation.Wet)] - public void CanConvertToLoadSituation(int outputLoadSituation, LoadSituation loadSituation) - { - Assert.AreEqual(loadSituation, ConversionHelper.ConvertToLoadSituation(outputLoadSituation)); - } - - [Test] - [TestCase(DikeDrySensitivity.None, ConversionHelper.DikeDrySensitivityNone)] - [TestCase(DikeDrySensitivity.Dry, ConversionHelper.DikeDrySensitivityDry)] - public void CanConvertToOutputDikeDrySensitivity(DikeDrySensitivity dikeDrySensitivity, int outputDikeDrySensitivity) - { - Assert.AreEqual(outputDikeDrySensitivity, ConversionHelper.ConvertToOutputDikeDrySensitivity(dikeDrySensitivity)); - } - - [Test] - [TestCase(ConversionHelper.DikeDrySensitivityNone, DikeDrySensitivity.None)] - [TestCase(ConversionHelper.DikeDrySensitivityDry, DikeDrySensitivity.Dry)] - public void CanConvertToDikeDrySensitivity(int outputDikeDrySensitivity, DikeDrySensitivity dikeDrySensitivity) - { - Assert.AreEqual(dikeDrySensitivity, ConversionHelper.ConvertToDikeDrySensitivity(outputDikeDrySensitivity)); - } - - - [Test] - [TestCase(HydraulicShortcutType.HydraulicShortcut, ConversionHelper.HydraulicShortcutTypeHydraulicShortcut)] - [TestCase(HydraulicShortcutType.NoHydraulicShortcut, ConversionHelper.HydraulicShortcutTypeNoHydraulicShortcut)] - public void CanConvertToOutputHydraulicShortcutType(HydraulicShortcutType hydraulicShortcutType, int outputHydraulicShortcutType) - { - Assert.AreEqual(outputHydraulicShortcutType, ConversionHelper.ConvertToOutputHydraulicShortcutType(hydraulicShortcutType)); - } - - [Test] - [TestCase(ConversionHelper.HydraulicShortcutTypeHydraulicShortcut, HydraulicShortcutType.HydraulicShortcut)] - [TestCase(ConversionHelper.HydraulicShortcutTypeNoHydraulicShortcut, HydraulicShortcutType.NoHydraulicShortcut)] - public void CanConvertToHydraulicShortcutType(int outputHydraulicShortcutType, HydraulicShortcutType hydraulicShortcutType) - { - Assert.AreEqual(hydraulicShortcutType, ConversionHelper.ConvertToHydraulicShortcutType(outputHydraulicShortcutType)); - } - - [Test] - [TestCase(UpliftType.Uplift, ConversionHelper.UpliftTypeUplift)] - [TestCase(UpliftType.NoUplift, ConversionHelper.UpliftTypeNoUplift)] - public void CanConvertToOutputUpliftType(UpliftType upliftType, int outputUpliftType) - { - Assert.AreEqual(outputUpliftType, ConversionHelper.ConvertToOutputUpliftType(upliftType)); - } - - [Test] - [TestCase(ConversionHelper.UpliftTypeUplift, UpliftType.Uplift)] - [TestCase(ConversionHelper.UpliftTypeNoUplift, UpliftType.NoUplift)] - public void CanConvertToUpliftType(int outputUpliftType, UpliftType upliftType) - { - Assert.AreEqual(upliftType, ConversionHelper.ConvertToUpliftType(outputUpliftType)); - } - - [Test] [TestCase(MStabModelType.Bishop, ConversionHelper.MStabModelTypeBishop)] [TestCase(MStabModelType.Spencer, ConversionHelper.MStabModelTypeSpencer)] [TestCase(MStabModelType.Fellenius, ConversionHelper.MStabModelTypeFellenius)] @@ -508,40 +441,6 @@ } [Test] - [TestCase(ScenarioType.Scenario01, ConversionHelper.ScenarioTypeScenario01)] - [TestCase(ScenarioType.Scenario02, ConversionHelper.ScenarioTypeScenario02)] - [TestCase(ScenarioType.Scenario03, ConversionHelper.ScenarioTypeScenario03)] - [TestCase(ScenarioType.Scenario04, ConversionHelper.ScenarioTypeScenario04)] - [TestCase(ScenarioType.Scenario05, ConversionHelper.ScenarioTypeScenario05)] - [TestCase(ScenarioType.Scenario06, ConversionHelper.ScenarioTypeScenario06)] - [TestCase(ScenarioType.Scenario07, ConversionHelper.ScenarioTypeScenario07)] - [TestCase(ScenarioType.Scenario08, ConversionHelper.ScenarioTypeScenario08)] - [TestCase(ScenarioType.Scenario09, ConversionHelper.ScenarioTypeScenario09)] - [TestCase(ScenarioType.Scenario10, ConversionHelper.ScenarioTypeScenario10)] - [TestCase(ScenarioType.Scenario11, ConversionHelper.ScenarioTypeScenario11)] - public void CanConvertToOutputScenarioType(ScenarioType scenarioType, int outputScenarioType) - { - Assert.AreEqual(outputScenarioType, ConversionHelper.ConvertToOutputScenarioType(scenarioType)); - } - - [Test] - [TestCase(ConversionHelper.ScenarioTypeScenario01, ScenarioType.Scenario01)] - [TestCase(ConversionHelper.ScenarioTypeScenario02, ScenarioType.Scenario02)] - [TestCase(ConversionHelper.ScenarioTypeScenario03, ScenarioType.Scenario03)] - [TestCase(ConversionHelper.ScenarioTypeScenario04, ScenarioType.Scenario04)] - [TestCase(ConversionHelper.ScenarioTypeScenario05, ScenarioType.Scenario05)] - [TestCase(ConversionHelper.ScenarioTypeScenario06, ScenarioType.Scenario06)] - [TestCase(ConversionHelper.ScenarioTypeScenario07, ScenarioType.Scenario07)] - [TestCase(ConversionHelper.ScenarioTypeScenario08, ScenarioType.Scenario08)] - [TestCase(ConversionHelper.ScenarioTypeScenario09, ScenarioType.Scenario09)] - [TestCase(ConversionHelper.ScenarioTypeScenario10, ScenarioType.Scenario10)] - [TestCase(ConversionHelper.ScenarioTypeScenario11, ScenarioType.Scenario11)] - public void CanConvertToScenarioType(int outputScenarioType, ScenarioType scenarioType) - { - Assert.AreEqual(scenarioType, ConversionHelper.ConvertToScenarioType(outputScenarioType)); - } - - [Test] [TestCase(PipingModelType.Bligh, ConversionHelper.PipingModelTypeBligh)] [TestCase(PipingModelType.SellmeijerVnk, ConversionHelper.PipingModelTypeSellmeijer)] [TestCase(PipingModelType.Sellmeijer4Forces, ConversionHelper.PipingModelTypeSellmeijer4Forces)] @@ -582,22 +481,6 @@ } [Test] - [TestCase(RegionalResultType.ProbabilityOfFailure, ConversionHelper.RwResultTypeProbabilityOfFailure)] - [TestCase(RegionalResultType.SafetyFactor, ConversionHelper.RwResultTypeSafetyFactor)] - public void CanConvertToOutputRegionalResultType(RegionalResultType regionalResultType, int outputRegionalResultType) - { - Assert.AreEqual(outputRegionalResultType, ConversionHelper.ConvertToOutputRegionalResultType(regionalResultType)); - } - - [Test] - [TestCase(ConversionHelper.RwResultTypeProbabilityOfFailure, RegionalResultType.ProbabilityOfFailure)] - [TestCase(ConversionHelper.RwResultTypeSafetyFactor, RegionalResultType.SafetyFactor)] - public void CanConvertToRegionalResultType(int outputRegionalResultType, RegionalResultType regionalResultType) - { - Assert.AreEqual(regionalResultType, ConversionHelper.ConvertToRegionalResultType(outputRegionalResultType)); - } - - [Test] [TestCase(ConversionHelper.SoilTypeClay, SoilType.Clay)] [TestCase(ConversionHelper.SoilTypeGravel, SoilType.Gravel)] [TestCase(ConversionHelper.SoilTypeLoam, SoilType.Loam)]