Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs =================================================================== diff -u -ref93d030dc8400084c8e53058f072d096ff6217a -r72219083e4cccda7cbb5ab8e18a80724d7b2abed --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision ef93d030dc8400084c8e53058f072d096ff6217a) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision 72219083e4cccda7cbb5ab8e18a80724d7b2abed) @@ -179,7 +179,10 @@ } catch (Exception e) when (e is CriticalFileValidationException || e is ArgumentOutOfRangeException) { - log.ErrorFormat(Resources.PipingConfigurationImporter_ValidateCalculation_Error_message_0_calculation_1_skipped, e.Message, readCalculation.Name); + string message = string.Format(Resources.PipingConfigurationImporter_ValidateCalculation_Error_message_0_calculation_1_skipped, + e.Message, + readCalculation.Name); + log.Error(message, e); return null; } @@ -371,7 +374,7 @@ { var errorMessage = string.Format(Resources.PipingConfigurationImporter_HandleCriticalFileReadError_Error_0_no_configuration_imported, e.Message); - log.Error(errorMessage); + log.Error(errorMessage, e); return new ReadResult(true); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs =================================================================== diff -u -r6928d01beb183acca2937ed5835e951e999be5cb -r72219083e4cccda7cbb5ab8e18a80724d7b2abed --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs (.../PipingConfigurationReaderTest.cs) (revision 6928d01beb183acca2937ed5835e951e999be5cb) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs (.../PipingConfigurationReaderTest.cs) (revision 72219083e4cccda7cbb5ab8e18a80724d7b2abed) @@ -144,9 +144,18 @@ yield return new TestCaseData("invalidCalculationMultipleStochasts.xml", "The element 'berekening' has invalid child element 'stochasts'.") .SetName("invalidCalculationMultipleStochasts"); - yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyStrings.xml", - "The 'hrlocatie' element is invalid - The value '' is invalid according to its datatype 'Token' - The actual length is less than the MinLength value.") - .SetName("invalidConfigurationCalculationContainingEmptyStrings"); + yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml", + "The 'hrlocatie' element is invalid - The value '' is invalid according to its datatype 'Token' - The actual length is less than the MinLength value.") + .SetName("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation"); + yield return new TestCaseData("invalidConfigurationCalculationContainingEmptySurfaceLine.xml", + "The 'profielschematisatie' element is invalid - The value '' is invalid according to its datatype 'Token' - The actual length is less than the MinLength value.") + .SetName("invalidConfigurationCalculationContainingEmptySurfaceLine"); + yield return new TestCaseData("invalidConfigurationCalculationContainingEmptySoilModel.xml", + "The 'ondergrondmodel' element is invalid - The value '' is invalid according to its datatype 'Token' - The actual length is less than the MinLength value.") + .SetName("invalidConfigurationCalculationContainingEmptySoilModel"); + yield return new TestCaseData("invalidConfigurationCalculationContainingEmptySoilProfile.xml", + "The 'ondergrondschematisatie' element is invalid - The value '' is invalid according to its datatype 'Token' - The actual length is less than the MinLength value.") + .SetName("invalidConfigurationCalculationContainingEmptySoilProfile"); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml (revision 72219083e4cccda7cbb5ab8e18a80724d7b2abed) @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptySoilModel.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptySoilModel.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptySoilModel.xml (revision 72219083e4cccda7cbb5ab8e18a80724d7b2abed) @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptySoilProfile.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptySoilProfile.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptySoilProfile.xml (revision 72219083e4cccda7cbb5ab8e18a80724d7b2abed) @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptySurfaceLine.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptySurfaceLine.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidConfigurationCalculationContainingEmptySurfaceLine.xml (revision 72219083e4cccda7cbb5ab8e18a80724d7b2abed) @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file