Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs =================================================================== diff -u -rf905ebfb70394f428ce86bc9d153681a3c37a234 -r438f6d4c93f02e09c1a5b6f5a247c9523266d205 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs) (revision f905ebfb70394f428ce86bc9d153681a3c37a234) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs) (revision 438f6d4c93f02e09c1a5b6f5a247c9523266d205) @@ -98,23 +98,44 @@ IEnumerable readItems = reader.Read().ToArray(); // Assert - var calculation = (GrassCoverErosionOutwardsWaveConditionsCalculationConfiguration) readItems.Single(); + var configuration = (GrassCoverErosionOutwardsWaveConditionsCalculationConfiguration) 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(ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificLowerLimitNorm, calculation.CategoryType); - Assert.AreEqual(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpact, calculation.CalculationType); + AssertConfiguration(configuration); } + + [Test] + public void Read_ValidPreviousVersionConfigurationWithFullCalculation_ReturnExpectedReadCalculation() + { + // Setup + string filePath = Path.Combine(testDirectoryPath, "version0ValidConfigurationFullCalculation.xml"); + var reader = new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader(filePath); + + // Call + IEnumerable readConfigurationItems = reader.Read().ToArray(); + + // Assert + var configuration = (GrassCoverErosionOutwardsWaveConditionsCalculationConfiguration)readConfigurationItems.Single(); + + AssertConfiguration(configuration); + } + + private static void AssertConfiguration(GrassCoverErosionOutwardsWaveConditionsCalculationConfiguration 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(ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificLowerLimitNorm, configuration.CategoryType); + Assert.AreEqual(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpact, configuration.CalculationType); + } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml =================================================================== diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r438f6d4c93f02e09c1a5b6f5a247c9523266d205 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml (.../invalidCalculationMultipleCategoryType.xml) (revision bf1fde9d2147a6eeaecebbb371be2c4856759159) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml (.../invalidCalculationMultipleCategoryType.xml) (revision 438f6d4c93f02e09c1a5b6f5a247c9523266d205) @@ -1,5 +1,5 @@ - + Iv IVv Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleRevetmentType.xml =================================================================== diff -u -r08552d0a7f52e55a76f843a0fdab116300cfa44d -r438f6d4c93f02e09c1a5b6f5a247c9523266d205 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleRevetmentType.xml (.../invalidCalculationMultipleRevetmentType.xml) (revision 08552d0a7f52e55a76f843a0fdab116300cfa44d) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleRevetmentType.xml (.../invalidCalculationMultipleRevetmentType.xml) (revision 438f6d4c93f02e09c1a5b6f5a247c9523266d205) @@ -1,5 +1,5 @@ - + Gras (golfoploop) Gras (golfklap) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCategoryTypeEmpty.xml =================================================================== diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r438f6d4c93f02e09c1a5b6f5a247c9523266d205 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCategoryTypeEmpty.xml (.../invalidCategoryTypeEmpty.xml) (revision bf1fde9d2147a6eeaecebbb371be2c4856759159) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCategoryTypeEmpty.xml (.../invalidCategoryTypeEmpty.xml) (revision 438f6d4c93f02e09c1a5b6f5a247c9523266d205) @@ -1,5 +1,5 @@ - + Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml =================================================================== diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r438f6d4c93f02e09c1a5b6f5a247c9523266d205 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml (.../invalidCategoryTypeUnknownValue.xml) (revision bf1fde9d2147a6eeaecebbb371be2c4856759159) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml (.../invalidCategoryTypeUnknownValue.xml) (revision 438f6d4c93f02e09c1a5b6f5a247c9523266d205) @@ -1,5 +1,5 @@ - + A Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidRevetmentTypeUnknownValue.xml =================================================================== diff -u -r08552d0a7f52e55a76f843a0fdab116300cfa44d -r438f6d4c93f02e09c1a5b6f5a247c9523266d205 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidRevetmentTypeUnknownValue.xml (.../invalidRevetmentTypeUnknownValue.xml) (revision 08552d0a7f52e55a76f843a0fdab116300cfa44d) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidRevetmentTypeUnknownValue.xml (.../invalidRevetmentTypeUnknownValue.xml) (revision 438f6d4c93f02e09c1a5b6f5a247c9523266d205) @@ -1,5 +1,5 @@ - + Gras Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/validConfigurationEmptyCalculation.xml =================================================================== diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r438f6d4c93f02e09c1a5b6f5a247c9523266d205 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/validConfigurationEmptyCalculation.xml (.../validConfigurationEmptyCalculation.xml) (revision bf1fde9d2147a6eeaecebbb371be2c4856759159) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/validConfigurationEmptyCalculation.xml (.../validConfigurationEmptyCalculation.xml) (revision 438f6d4c93f02e09c1a5b6f5a247c9523266d205) @@ -1,4 +1,4 @@ - + Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml =================================================================== diff -u -r08552d0a7f52e55a76f843a0fdab116300cfa44d -r438f6d4c93f02e09c1a5b6f5a247c9523266d205 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 08552d0a7f52e55a76f843a0fdab116300cfa44d) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 438f6d4c93f02e09c1a5b6f5a247c9523266d205) @@ -1,5 +1,5 @@ - + Locatie IIIv Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml =================================================================== diff -u --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml (revision 0) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml (revision 438f6d4c93f02e09c1a5b6f5a247c9523266d205) @@ -0,0 +1,21 @@ + + + + Locatie + IIIv + 1.1 + 2.2 + 3.3 + 4.4 + 0.5 + Voorlandprofiel + 5.5 + + true + caisson + 6.6 + false + + Gras (golfklap) + +