Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r4216bba67ee7aaf2ac4f4090211ae56e015f7e6d -r38bd4c2f3cbd7a25ba074ec55b7a7a2f3139cdb3 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReaderTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReaderTest.cs) (revision 4216bba67ee7aaf2ac4f4090211ae56e015f7e6d) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReaderTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReaderTest.cs) (revision 38bd4c2f3cbd7a25ba074ec55b7a7a2f3139cdb3) @@ -62,15 +62,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)] - [TestCase(2)] - 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"); @@ -82,42 +82,34 @@ // Assert var configuration = (WaveConditionsCalculationConfiguration) readConfigurationItems.Single(); - AssertMigratedConfiguration(configuration); - Assert.IsNull(configuration.TargetProbability); + AssertConfiguration(configuration, expectedTargetProbability, expectedStepSize); } - private static void AssertConfiguration(WaveConditionsCalculationConfiguration configuration) + private static void AssertConfiguration(WaveConditionsCalculationConfiguration configuration, double? expectedTargetProbability, double expectedStepSize) { 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.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); + + if (expectedTargetProbability.HasValue) + { + Assert.AreEqual(expectedTargetProbability, configuration.TargetProbability); + } + else + { + Assert.IsNull(configuration.TargetProbability); + } } - - 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); - } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/test-data/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml =================================================================== diff -u -r699d925f01e1d0ed1f634b2b4b6c24af1daa306c -r38bd4c2f3cbd7a25ba074ec55b7a7a2f3139cdb3 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/test-data/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml (.../version0ValidConfigurationFullCalculation.xml) (revision 699d925f01e1d0ed1f634b2b4b6c24af1daa306c) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/test-data/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml (.../version0ValidConfigurationFullCalculation.xml) (revision 38bd4c2f3cbd7a25ba074ec55b7a7a2f3139cdb3) @@ -8,11 +8,11 @@ 4.4 0.5 Voorlandprofiel - 5.5 + 6.6 true caisson - 6.6 + 7.7 false Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/test-data/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader/version1ValidConfigurationFullCalculation.xml =================================================================== diff -u -rbb35090e8d4cae279114b41130e228475e10ea57 -r38bd4c2f3cbd7a25ba074ec55b7a7a2f3139cdb3 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/test-data/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader/version1ValidConfigurationFullCalculation.xml (.../version1ValidConfigurationFullCalculation.xml) (revision bb35090e8d4cae279114b41130e228475e10ea57) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/test-data/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader/version1ValidConfigurationFullCalculation.xml (.../version1ValidConfigurationFullCalculation.xml) (revision 38bd4c2f3cbd7a25ba074ec55b7a7a2f3139cdb3) @@ -9,11 +9,11 @@ 4.4 0.5 Voorlandprofiel - 5.5 + 6.6 true caisson - 6.6 + 7.7 false Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/test-data/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader/version2ValidConfigurationFullCalculation.xml =================================================================== diff -u -r4216bba67ee7aaf2ac4f4090211ae56e015f7e6d -r38bd4c2f3cbd7a25ba074ec55b7a7a2f3139cdb3 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/test-data/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader/version2ValidConfigurationFullCalculation.xml (.../version2ValidConfigurationFullCalculation.xml) (revision 4216bba67ee7aaf2ac4f4090211ae56e015f7e6d) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/test-data/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader/version2ValidConfigurationFullCalculation.xml (.../version2ValidConfigurationFullCalculation.xml) (revision 38bd4c2f3cbd7a25ba074ec55b7a7a2f3139cdb3) @@ -2,18 +2,18 @@ Locatie - A + 0.1 1.1 2.2 3.3 4.4 0.5 Voorlandprofiel - 5.5 + 6.6 true caisson - 6.6 + 7.7 false