Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r23b4b07a28204998a36690cb7b88b5d292c098c4 -r43c8122a62d133d269557591dceb6c825d3d8e80 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision 23b4b07a28204998a36690cb7b88b5d292c098c4) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision 43c8122a62d133d269557591dceb6c825d3d8e80) @@ -312,14 +312,15 @@ // Assert var configuration = (WaveConditionsCalculationConfiguration) readItems.Single(); - AssertConfiguration(configuration); - Assert.AreEqual(0.1, configuration.TargetProbability); + AssertConfiguration(configuration, 0.1, 0.55); } [Test] - [TestCase(0)] - [TestCase(1)] - public void Read_ValidPreviousVersionConfigurationWithFullCalculation_ReturnExpectedReadCalculation(int versionNumber) + [TestCase(0, null, 0.5)] + [TestCase(1, null, 0.5)] + [TestCase(2, 0.1, 0.5)] + public void Read_ValidPreviousVersionConfigurationWithFullCalculation_ReturnExpectedReadCalculation( + int versionNumber, double? expectedTargetProbability, double expectedStepSize) { // Setup string filePath = Path.Combine(testDirectoryPath, $"version{versionNumber}ValidConfigurationFullCalculation.xml"); @@ -331,8 +332,7 @@ // Assert var configuration = (WaveConditionsCalculationConfiguration) readConfigurationItems.Single(); - AssertMigratedConfiguration(configuration); - Assert.IsNull(configuration.TargetProbability); + AssertConfiguration(configuration, expectedTargetProbability, expectedStepSize); } [Test] @@ -364,39 +364,32 @@ Assert.IsNull(configuration.WaveReduction.UseForeshoreProfile); } - private static void AssertConfiguration(WaveConditionsCalculationConfiguration configuration) + private static void AssertConfiguration(WaveConditionsCalculationConfiguration configuration, double? expectedTargetProbability, double expectedStepSize) { Assert.IsNotNull(configuration); + + if (expectedTargetProbability.HasValue) + { + Assert.AreEqual(expectedTargetProbability, configuration.TargetProbability); + } + else + { + Assert.IsNull(configuration.TargetProbability); + } + Assert.AreEqual("Locatie", configuration.HydraulicBoundaryLocationName); Assert.AreEqual(1.1, configuration.UpperBoundaryRevetment); Assert.AreEqual(2.2, configuration.LowerBoundaryRevetment); Assert.AreEqual(3.3, configuration.UpperBoundaryWaterLevels); Assert.AreEqual(4.4, configuration.LowerBoundaryWaterLevels); - Assert.AreEqual(0.55, configuration.StepSize); + Assert.AreEqual(expectedStepSize, configuration.StepSize); Assert.AreEqual("Voorlandprofiel", configuration.ForeshoreProfileId); Assert.AreEqual(6.6, configuration.Orientation); Assert.IsTrue(configuration.WaveReduction.UseBreakWater); Assert.AreEqual(ConfigurationBreakWaterType.Caisson, configuration.WaveReduction.BreakWaterType); Assert.AreEqual(7.7, configuration.WaveReduction.BreakWaterHeight); Assert.IsFalse(configuration.WaveReduction.UseForeshoreProfile); } - - private static void AssertMigratedConfiguration(WaveConditionsCalculationConfiguration configuration) - { - Assert.IsNotNull(configuration); - Assert.AreEqual("Locatie", configuration.HydraulicBoundaryLocationName); - Assert.AreEqual(1.1, configuration.UpperBoundaryRevetment); - Assert.AreEqual(2.2, configuration.LowerBoundaryRevetment); - Assert.AreEqual(3.3, configuration.UpperBoundaryWaterLevels); - Assert.AreEqual(4.4, configuration.LowerBoundaryWaterLevels); - Assert.AreEqual(0.5, configuration.StepSize); - Assert.AreEqual("Voorlandprofiel", configuration.ForeshoreProfileId); - Assert.AreEqual(5.5, configuration.Orientation); - Assert.IsTrue(configuration.WaveReduction.UseBreakWater); - Assert.AreEqual(ConfigurationBreakWaterType.Caisson, configuration.WaveReduction.BreakWaterType); - Assert.AreEqual(6.6, configuration.WaveReduction.BreakWaterHeight); - Assert.IsFalse(configuration.WaveReduction.UseForeshoreProfile); - } [OneTimeSetUp] public void OneTimeSetUp() Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml =================================================================== diff -u -r50b8cb8015275ffab688c895f65f45c92bce5c38 -r43c8122a62d133d269557591dceb6c825d3d8e80 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml (.../version0ValidConfigurationFullCalculation.xml) (revision 50b8cb8015275ffab688c895f65f45c92bce5c38) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml (.../version0ValidConfigurationFullCalculation.xml) (revision 43c8122a62d133d269557591dceb6c825d3d8e80) @@ -8,11 +8,11 @@ 4.4 0.5 Voorlandprofiel - 5.5 + 6.6 true caisson - 6.6 + 7.7 false Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/version1ValidConfigurationFullCalculation.xml =================================================================== diff -u -r6670858b51e8d838a50259eaa281eb3cf76d53e1 -r43c8122a62d133d269557591dceb6c825d3d8e80 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/version1ValidConfigurationFullCalculation.xml (.../version1ValidConfigurationFullCalculation.xml) (revision 6670858b51e8d838a50259eaa281eb3cf76d53e1) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/version1ValidConfigurationFullCalculation.xml (.../version1ValidConfigurationFullCalculation.xml) (revision 43c8122a62d133d269557591dceb6c825d3d8e80) @@ -8,11 +8,11 @@ 4.4 0.5 Voorlandprofiel - 5.5 + 6.6 true caisson - 6.6 + 7.7 false Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/version2ValidConfigurationFullCalculation.xml =================================================================== diff -u --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/version2ValidConfigurationFullCalculation.xml (revision 0) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/version2ValidConfigurationFullCalculation.xml (revision 43c8122a62d133d269557591dceb6c825d3d8e80) @@ -0,0 +1,20 @@ + + + + Locatie + 0.1 + 1.1 + 2.2 + 3.3 + 4.4 + 0.5 + Voorlandprofiel + 6.6 + + true + caisson + 7.7 + false + + +