Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -rd907ed695ba2fb1bdf239919d9e475b51e7d812c -r341fd656e87d738e16f7ab1f2d25e5d36709880c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 341fd656e87d738e16f7ab1f2d25e5d36709880c)
@@ -41,9 +41,6 @@
[TestFixture]
public class MacroStabilityInwardsCalculationConfigurationImporterTest
{
- private readonly string readerPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.MacroStabilityInwards.IO,
- nameof(MacroStabilityInwardsCalculationConfigurationReader));
-
private readonly string importerPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.MacroStabilityInwards.IO,
nameof(MacroStabilityInwardsCalculationConfigurationImporter));
@@ -105,7 +102,7 @@
Action call = () => successful = importer.Import();
// Assert
- const string expectedMessage = "De hydraulische belastingenlocatie 'HRlocatie' bestaat niet. Berekening 'Calculation' is overgeslagen.";
+ const string expectedMessage = "De hydraulische belastingenlocatie 'HBlocatie' bestaat niet. Berekening 'Calculation' is overgeslagen.";
TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1);
Assert.IsTrue(successful);
CollectionAssert.IsEmpty(calculationGroup.Children);
@@ -822,11 +819,11 @@
[Test]
[TestCase(false, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml")]
- [TestCase(true, "validConfigurationFullCalculationContainingAssessmentLevel.xml")]
+ [TestCase(true, "validConfigurationFullCalculationContainingWaterLevel.xml")]
public void Import_ValidConfigurationWithValidHydraulicBoundaryData_DataAddedToModel(bool manualAssessmentLevel, string file)
{
// Setup
- string filePath = Path.Combine(readerPath, file);
+ string filePath = Path.Combine(importerPath, file);
var calculationGroup = new CalculationGroup();
var surfaceLine = new MacroStabilityInwardsSurfaceLine("Profielschematisatie");
@@ -860,7 +857,7 @@
stochasticSoilModel
}, "readerPath");
- var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "HRlocatie", 10, 20);
+ var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "HBlocatie", 10, 20);
var importer = new MacroStabilityInwardsCalculationConfigurationImporter(filePath,
calculationGroup,
new[]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationWithUnknownHydraulicBoundaryLocation.xml
===================================================================
diff -u -r160a4b53f535c18af17184fbfa94a241f36198e5 -r341fd656e87d738e16f7ab1f2d25e5d36709880c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationWithUnknownHydraulicBoundaryLocation.xml (.../validConfigurationCalculationWithUnknownHydraulicBoundaryLocation.xml) (revision 160a4b53f535c18af17184fbfa94a241f36198e5)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationWithUnknownHydraulicBoundaryLocation.xml (.../validConfigurationCalculationWithUnknownHydraulicBoundaryLocation.xml) (revision 341fd656e87d738e16f7ab1f2d25e5d36709880c)
@@ -1,6 +1,6 @@
- HRlocatie
+ HBlocatie
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml (revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml (revision 341fd656e87d738e16f7ab1f2d25e5d36709880c)
@@ -0,0 +1,95 @@
+
+
+
+ HBlocatie
+ Profielschematisatie
+ Ondergrondmodel
+ Ondergrondschematisatie
+ zanddijkopklei
+
+ 10.5
+
+ true
+ 10.6
+ 10.7
+
+
+ 10.8
+ 10.9
+
+ true
+
+ 10.1
+ 10.2
+
+
+ 10.3
+ 10.4
+
+
+ 20.1
+ 20.2
+
+
+ 2.2
+
+ true
+ 2.21
+ 2.22
+ 2.23
+ 2.24
+
+
+
+ 15.2
+ 16.2
+
+ false
+ 15.21
+ 15.22
+ 15.23
+ 15.24
+
+
+
+ 0.4
+ 0.5
+ 0.6
+
+ true
+ handmatig
+ 10
+ 43.5
+
+
+ true
+ automatisch
+
+ laagscheiding
+ 10
+ 1
+ 5
+
+
+ NaN
+ NaN
+ NaN
+ NaN
+ 6
+ 5
+
+
+ 1
+ 2
+ 4
+ 3
+ 5
+ 6
+
+
+
+ false
+ 8.8
+
+
+
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationFullCalculationContainingWaterLevel.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationFullCalculationContainingWaterLevel.xml (revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationFullCalculationContainingWaterLevel.xml (revision 341fd656e87d738e16f7ab1f2d25e5d36709880c)
@@ -0,0 +1,95 @@
+
+
+
+ 1.1
+ Profielschematisatie
+ Ondergrondmodel
+ Ondergrondschematisatie
+ zanddijkopklei
+
+ 10.5
+
+ true
+ 10.6
+ 10.7
+
+
+ 10.8
+ 10.9
+
+ true
+
+ 10.1
+ 10.2
+
+
+ 10.3
+ 10.4
+
+
+ 20.1
+ 20.2
+
+
+ 2.2
+
+ true
+ 2.21
+ 2.22
+ 2.23
+ 2.24
+
+
+
+ 15.2
+ 16.2
+
+ false
+ 15.21
+ 15.22
+ 15.23
+ 15.24
+
+
+
+ 0.4
+ 0.5
+ 0.6
+
+ true
+ handmatig
+ 10
+ 43.5
+
+
+ true
+ automatisch
+
+ laagscheiding
+ 10
+ 1
+ 5
+
+
+ NaN
+ NaN
+ NaN
+ NaN
+ 6
+ 5
+
+
+ 1
+ 2
+ 4
+ 3
+ 5
+ 6
+
+
+
+ false
+ 8.8
+
+
+
\ No newline at end of file