Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs
===================================================================
diff -u -r234614cab83ea84164fa9ffaa99adb029dd6a1fb -r725daddfbeb109d25e0818175d888c34da124ada
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision 234614cab83ea84164fa9ffaa99adb029dd6a1fb)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision 725daddfbeb109d25e0818175d888c34da124ada)
@@ -239,7 +239,7 @@
if (readCalculation.SurfaceLine != null)
{
RingtoetsPipingSurfaceLine surfaceLine = failureMechanism.SurfaceLines
- .FirstOrDefault(sl => sl.Name == readCalculation.SurfaceLine);
+ .FirstOrDefault(sl => sl.Name == readCalculation.SurfaceLine);
if (surfaceLine == null)
{
@@ -290,7 +290,7 @@
if (readCalculation.StochasticSoilModel != null)
{
StochasticSoilModel soilModel = failureMechanism.StochasticSoilModels
- .FirstOrDefault(ssm => ssm.Name == readCalculation.StochasticSoilModel);
+ .FirstOrDefault(ssm => ssm.Name == readCalculation.StochasticSoilModel);
if (soilModel == null)
{
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r234614cab83ea84164fa9ffaa99adb029dd6a1fb -r725daddfbeb109d25e0818175d888c34da124ada
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 234614cab83ea84164fa9ffaa99adb029dd6a1fb)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 725daddfbeb109d25e0818175d888c34da124ada)
@@ -289,7 +289,7 @@
}
///
- /// Looks up a localized string similar to Er is geen ondergrondmodel opgegeven bij de ondergrondschematisatie '{0}'..
+ /// Looks up a localized string similar to Er is geen stochastisch ondergrondmodel opgegeven bij de ondergrondschematisatie '{0}'..
///
public static string PipingConfigurationImporter_ReadStochasticSoilProfile_No_soil_model_provided_for_soil_profile_with_name_0 {
get {
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx
===================================================================
diff -u -r234614cab83ea84164fa9ffaa99adb029dd6a1fb -r725daddfbeb109d25e0818175d888c34da124ada
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision 234614cab83ea84164fa9ffaa99adb029dd6a1fb)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision 725daddfbeb109d25e0818175d888c34da124ada)
@@ -338,6 +338,6 @@
Een standaardafwijking van '{0}' is ongeldig voor stochast '{1}'.
- Er is geen ondergrondmodel opgegeven bij de ondergrondschematisatie '{0}'.
+ Er is geen stochastisch ondergrondmodel opgegeven bij de ondergrondschematisatie '{0}'.
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs
===================================================================
diff -u -re03950c62ccfad90eefe8076d668767f69c90a8e -r725daddfbeb109d25e0818175d888c34da124ada
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision e03950c62ccfad90eefe8076d668767f69c90a8e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision 725daddfbeb109d25e0818175d888c34da124ada)
@@ -517,6 +517,30 @@
}
[Test]
+ public void Import_StochasticSoilProfileValidButNoSoilModelSpecified_LogMessageAndContinueImport()
+ {
+ // Setup
+ string filePath = Path.Combine(importerPath, "validConfigurationCalculationContainingSoilProfileWithoutSoilModel.xml");
+
+ var calculationGroup = new CalculationGroup();
+ var pipingFailureMechanism = new PipingFailureMechanism();
+ var importer = new PipingConfigurationImporter(filePath,
+ calculationGroup,
+ new HydraulicBoundaryLocation[0],
+ pipingFailureMechanism);
+
+ // Call
+ var successful = false;
+ Action call = () => successful = importer.Import();
+
+ // Assert
+ const string expectedMessage = "Er is geen stochastisch ondergrondmodel opgegeven bij de ondergrondschematisatie 'Ondergrondschematisatie'. Berekening 'Calculation' is overgeslagen.";
+ TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
+ Assert.IsTrue(successful);
+ CollectionAssert.IsEmpty(calculationGroup.Children);
+ }
+
+ [Test]
[TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml", false)]
[TestCase("validConfigurationFullCalculationContainingAssessmentLevel.xml", true)]
public void Import_ValidConfigurationWithValidHydraulicBoundaryData_DataAddedToModel(string file, bool manualAssessmentLevel)
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationCalculationContainingSoilProfileWithoutSoilModel.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationCalculationContainingSoilProfileWithoutSoilModel.xml (revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationCalculationContainingSoilProfileWithoutSoilModel.xml (revision 725daddfbeb109d25e0818175d888c34da124ada)
@@ -0,0 +1,6 @@
+
+
+
+ Ondergrondschematisatie
+
+
\ No newline at end of file