Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs =================================================================== diff -u -rf905ebfb70394f428ce86bc9d153681a3c37a234 -rd5d11cbd4f322a3778bfbd0bc63a453bfadadde6 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs) (revision f905ebfb70394f428ce86bc9d153681a3c37a234) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs) (revision d5d11cbd4f322a3778bfbd0bc63a453bfadadde6) @@ -98,23 +98,44 @@ IEnumerable readItems = reader.Read().ToArray(); // Assert - var calculation = (StabilityStoneCoverWaveConditionsCalculationConfiguration) readItems.Single(); + var configuration = (StabilityStoneCoverWaveConditionsCalculationConfiguration) readItems.Single(); - Assert.IsNotNull(calculation); - Assert.AreEqual("Locatie", calculation.HydraulicBoundaryLocationName); - Assert.AreEqual(1.1, calculation.UpperBoundaryRevetment); - Assert.AreEqual(2.2, calculation.LowerBoundaryRevetment); - Assert.AreEqual(3.3, calculation.UpperBoundaryWaterLevels); - Assert.AreEqual(4.4, calculation.LowerBoundaryWaterLevels); - Assert.AreEqual(ConfigurationWaveConditionsInputStepSize.Half, calculation.StepSize); - Assert.AreEqual("Voorlandprofiel", calculation.ForeshoreProfileId); - Assert.AreEqual(5.5, calculation.Orientation); - Assert.IsTrue(calculation.WaveReduction.UseBreakWater); - Assert.AreEqual(ConfigurationBreakWaterType.Caisson, calculation.WaveReduction.BreakWaterType); - Assert.AreEqual(6.6, calculation.WaveReduction.BreakWaterHeight); - Assert.IsFalse(calculation.WaveReduction.UseForeshoreProfile); - Assert.AreEqual(ConfigurationAssessmentSectionCategoryType.SignalingNorm, calculation.CategoryType); - Assert.AreEqual(ConfigurationStabilityStoneCoverCalculationType.Columns, calculation.CalculationType); + AssertConfiguration(configuration); } + + [Test] + public void Read_ValidPreviousVersionConfigurationWithFullCalculation_ReturnExpectedReadCalculation() + { + // Setup + string filePath = Path.Combine(testDirectoryPath, "version0ValidConfigurationFullCalculation.xml"); + var reader = new StabilityStoneCoverWaveConditionsCalculationConfigurationReader(filePath); + + // Call + IEnumerable readConfigurationItems = reader.Read().ToArray(); + + // Assert + var configuration = (StabilityStoneCoverWaveConditionsCalculationConfiguration) readConfigurationItems.Single(); + + AssertConfiguration(configuration); + } + + private static void AssertConfiguration(StabilityStoneCoverWaveConditionsCalculationConfiguration 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(ConfigurationWaveConditionsInputStepSize.Half, 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); + Assert.AreEqual(ConfigurationAssessmentSectionCategoryType.SignalingNorm, configuration.CategoryType); + Assert.AreEqual(ConfigurationStabilityStoneCoverCalculationType.Columns, configuration.CalculationType); + } } } \ No newline at end of file Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml =================================================================== diff -u -r044b0bee4da1078f6ac23d143a4bb6d778b50a92 -rd5d11cbd4f322a3778bfbd0bc63a453bfadadde6 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml (.../invalidCalculationMultipleCategoryType.xml) (revision 044b0bee4da1078f6ac23d143a4bb6d778b50a92) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml (.../invalidCalculationMultipleCategoryType.xml) (revision d5d11cbd4f322a3778bfbd0bc63a453bfadadde6) @@ -1,5 +1,5 @@ - + A+ B Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleRevetmentType.xml =================================================================== diff -u -r044b0bee4da1078f6ac23d143a4bb6d778b50a92 -rd5d11cbd4f322a3778bfbd0bc63a453bfadadde6 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleRevetmentType.xml (.../invalidCalculationMultipleRevetmentType.xml) (revision 044b0bee4da1078f6ac23d143a4bb6d778b50a92) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleRevetmentType.xml (.../invalidCalculationMultipleRevetmentType.xml) (revision d5d11cbd4f322a3778bfbd0bc63a453bfadadde6) @@ -1,5 +1,5 @@ - + Steen (blokken) Steen (zuilen) Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml =================================================================== diff -u -r044b0bee4da1078f6ac23d143a4bb6d778b50a92 -rd5d11cbd4f322a3778bfbd0bc63a453bfadadde6 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml (.../invalidCategoryTypeUnknownValue.xml) (revision 044b0bee4da1078f6ac23d143a4bb6d778b50a92) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml (.../invalidCategoryTypeUnknownValue.xml) (revision d5d11cbd4f322a3778bfbd0bc63a453bfadadde6) @@ -1,5 +1,5 @@ - + F Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidRevetmentTypeUnknownValue.xml =================================================================== diff -u -r044b0bee4da1078f6ac23d143a4bb6d778b50a92 -rd5d11cbd4f322a3778bfbd0bc63a453bfadadde6 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidRevetmentTypeUnknownValue.xml (.../invalidRevetmentTypeUnknownValue.xml) (revision 044b0bee4da1078f6ac23d143a4bb6d778b50a92) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidRevetmentTypeUnknownValue.xml (.../invalidRevetmentTypeUnknownValue.xml) (revision d5d11cbd4f322a3778bfbd0bc63a453bfadadde6) @@ -1,5 +1,5 @@ - + Steen Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/validConfigurationEmptyCalculation.xml =================================================================== diff -u -r044b0bee4da1078f6ac23d143a4bb6d778b50a92 -rd5d11cbd4f322a3778bfbd0bc63a453bfadadde6 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/validConfigurationEmptyCalculation.xml (.../validConfigurationEmptyCalculation.xml) (revision 044b0bee4da1078f6ac23d143a4bb6d778b50a92) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/validConfigurationEmptyCalculation.xml (.../validConfigurationEmptyCalculation.xml) (revision d5d11cbd4f322a3778bfbd0bc63a453bfadadde6) @@ -1,4 +1,4 @@ - + Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml =================================================================== diff -u -r0006259ca598a5a486468f386758f811a88ca21d -rd5d11cbd4f322a3778bfbd0bc63a453bfadadde6 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 0006259ca598a5a486468f386758f811a88ca21d) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision d5d11cbd4f322a3778bfbd0bc63a453bfadadde6) @@ -1,5 +1,5 @@ - + Locatie A Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml =================================================================== diff -u --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml (revision 0) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml (revision d5d11cbd4f322a3778bfbd0bc63a453bfadadde6) @@ -0,0 +1,21 @@ + + + + Locatie + A + 1.1 + 2.2 + 3.3 + 4.4 + 0.5 + Voorlandprofiel + 5.5 + + true + caisson + 6.6 + false + + Steen (zuilen) + + \ No newline at end of file