Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs =================================================================== diff -u -re5ae21624afdf7f1608f245f7719f9fe216a1bf2 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision e5ae21624afdf7f1608f245f7719f9fe216a1bf2) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -594,11 +594,13 @@ { File.ReadAllText(Path.Combine(testDirectoryPath, "validConfigurationSchema_0.xsd")), File.ReadAllText(Path.Combine(testDirectoryPath, "validConfigurationSchema_1.xsd")), + File.ReadAllText(Path.Combine(testDirectoryPath, "validConfigurationSchema_2.xsd")), File.ReadAllText(Path.Combine(testDirectoryPath, "validConfigurationSchema.xsd")) }, new[] { Resources.BekledingenConfiguratieBasisSchema0To1, - Resources.BekledingenConfiguratieBasisSchema1To2 + Resources.BekledingenConfiguratieBasisSchema1To2, + Resources.BekledingenConfiguratieBasisSchema2To3 }) {} protected override WaveConditionsCalculationConfiguration ParseCalculationElement(XElement calculationElement) Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationContainingUnknownForeshoreProfile.xml =================================================================== diff -u -rf35dec58647f68d237e8f3a43494909c192e67a0 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationContainingUnknownForeshoreProfile.xml (.../validConfigurationCalculationContainingUnknownForeshoreProfile.xml) (revision f35dec58647f68d237e8f3a43494909c192e67a0) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationContainingUnknownForeshoreProfile.xml (.../validConfigurationCalculationContainingUnknownForeshoreProfile.xml) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -1,5 +1,5 @@ - + Voorlandprofiel Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationContainingUnknownHydraulicBoundaryLocation.xml =================================================================== diff -u -rf35dec58647f68d237e8f3a43494909c192e67a0 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationContainingUnknownHydraulicBoundaryLocation.xml (.../validConfigurationCalculationContainingUnknownHydraulicBoundaryLocation.xml) (revision f35dec58647f68d237e8f3a43494909c192e67a0) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationContainingUnknownHydraulicBoundaryLocation.xml (.../validConfigurationCalculationContainingUnknownHydraulicBoundaryLocation.xml) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -1,5 +1,5 @@ - + Locatie Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationContainingWaveReductionWithoutForeshoreProfile.xml =================================================================== diff -u -rf35dec58647f68d237e8f3a43494909c192e67a0 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationContainingWaveReductionWithoutForeshoreProfile.xml (.../validConfigurationCalculationContainingWaveReductionWithoutForeshoreProfile.xml) (revision f35dec58647f68d237e8f3a43494909c192e67a0) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationContainingWaveReductionWithoutForeshoreProfile.xml (.../validConfigurationCalculationContainingWaveReductionWithoutForeshoreProfile.xml) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -1,5 +1,5 @@ - + true Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreFalseForeshoreProfileWithoutGeometry.xml =================================================================== diff -u -rf35dec58647f68d237e8f3a43494909c192e67a0 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreFalseForeshoreProfileWithoutGeometry.xml (.../validConfigurationCalculationUseForeshoreFalseForeshoreProfileWithoutGeometry.xml) (revision f35dec58647f68d237e8f3a43494909c192e67a0) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreFalseForeshoreProfileWithoutGeometry.xml (.../validConfigurationCalculationUseForeshoreFalseForeshoreProfileWithoutGeometry.xml) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -1,5 +1,5 @@ - + Voorlandprofiel Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreTrueForeshoreProfileWithoutGeometry.xml =================================================================== diff -u -rf35dec58647f68d237e8f3a43494909c192e67a0 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreTrueForeshoreProfileWithoutGeometry.xml (.../validConfigurationCalculationUseForeshoreTrueForeshoreProfileWithoutGeometry.xml) (revision f35dec58647f68d237e8f3a43494909c192e67a0) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreTrueForeshoreProfileWithoutGeometry.xml (.../validConfigurationCalculationUseForeshoreTrueForeshoreProfileWithoutGeometry.xml) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -1,5 +1,5 @@ - + Voorlandprofiel Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml =================================================================== diff -u -rf35dec58647f68d237e8f3a43494909c192e67a0 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision f35dec58647f68d237e8f3a43494909c192e67a0) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -1,5 +1,5 @@ - + Locatie 0.01 Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationOrientationOutOfRange.xml =================================================================== diff -u -rf35dec58647f68d237e8f3a43494909c192e67a0 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationOrientationOutOfRange.xml (.../validConfigurationOrientationOutOfRange.xml) (revision f35dec58647f68d237e8f3a43494909c192e67a0) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationOrientationOutOfRange.xml (.../validConfigurationOrientationOutOfRange.xml) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -1,5 +1,5 @@ - + 380 Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationSchema_2.xsd =================================================================== diff -u --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationSchema_2.xsd (revision 0) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationSchema_2.xsd (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationStepSizeOutOfRange.xml =================================================================== diff -u -re5ae21624afdf7f1608f245f7719f9fe216a1bf2 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationStepSizeOutOfRange.xml (.../validConfigurationStepSizeOutOfRange.xml) (revision e5ae21624afdf7f1608f245f7719f9fe216a1bf2) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationStepSizeOutOfRange.xml (.../validConfigurationStepSizeOutOfRange.xml) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -1,5 +1,5 @@ - + 5 Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationUpperRevetmentBoundBelowLowerRevetmentBound.xml =================================================================== diff -u -rf35dec58647f68d237e8f3a43494909c192e67a0 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationUpperRevetmentBoundBelowLowerRevetmentBound.xml (.../validConfigurationUpperRevetmentBoundBelowLowerRevetmentBound.xml) (revision f35dec58647f68d237e8f3a43494909c192e67a0) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationUpperRevetmentBoundBelowLowerRevetmentBound.xml (.../validConfigurationUpperRevetmentBoundBelowLowerRevetmentBound.xml) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -1,5 +1,5 @@ - + 1.1 2.2 Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationUpperWaterLevelBoundBelowLowerWaterLevelBound.xml =================================================================== diff -u -rf35dec58647f68d237e8f3a43494909c192e67a0 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationUpperWaterLevelBoundBelowLowerWaterLevelBound.xml (.../validConfigurationUpperWaterLevelBoundBelowLowerWaterLevelBound.xml) (revision f35dec58647f68d237e8f3a43494909c192e67a0) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationUpperWaterLevelBoundBelowLowerWaterLevelBound.xml (.../validConfigurationUpperWaterLevelBoundBelowLowerWaterLevelBound.xml) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -1,5 +1,5 @@ - + 1.1 2.2 Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationWithoutTargetProbability.xml =================================================================== diff -u -rcc7d01e84fd44fff418ea8b749ecbcd8e2855957 -r063fdea08406050c928a935d03edd6604e4b49c7 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationWithoutTargetProbability.xml (.../validConfigurationWithoutTargetProbability.xml) (revision cc7d01e84fd44fff418ea8b749ecbcd8e2855957) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationWithoutTargetProbability.xml (.../validConfigurationWithoutTargetProbability.xml) (revision 063fdea08406050c928a935d03edd6604e4b49c7) @@ -1,5 +1,5 @@ - + Locatie 10