Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs
===================================================================
diff -u -r93044b3ed52a925c5321b68ff2beb886c6bf7068 -rb0e860b4cc7d7639736222c8da9e4d67132961da
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision 93044b3ed52a925c5321b68ff2beb886c6bf7068)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision b0e860b4cc7d7639736222c8da9e4d67132961da)
@@ -84,6 +84,11 @@
public GeneralResult IllustrationPointsResult { get; private set; }
///
+ /// Gets the error message of the illustration points parser.
+ ///
+ public string IllustrationPointsParserError { get; private set; }
+
+ ///
/// Cancels any currently running Hydra-Ring calculation.
///
public void Cancel()
@@ -176,7 +181,7 @@
}
catch (HydraRingFileParserException e)
{
- log.Warn(e.Message, e);
+ IllustrationPointsParserError = e.Message;
IllustrationPointsResult = null;
}
}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs
===================================================================
diff -u -r93044b3ed52a925c5321b68ff2beb886c6bf7068 -rb0e860b4cc7d7639736222c8da9e4d67132961da
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision 93044b3ed52a925c5321b68ff2beb886c6bf7068)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision b0e860b4cc7d7639736222c8da9e4d67132961da)
@@ -50,6 +50,22 @@
}
[Test]
+ public void Constructor_ValidArguments_ReturnsExpectedProperties()
+ {
+ // Setup
+ const string hlcdDirectory = "hlcdDirectory";
+
+ // Call
+ var calculator = new TestHydraRingCalculator(hlcdDirectory);
+
+ // Assert
+ Assert.IsNull(calculator.IllustrationPointsResult);
+ Assert.IsNull(calculator.OutputDirectory);
+ Assert.IsNull(calculator.LastErrorFileContent);
+ Assert.IsNull(calculator.IllustrationPointsParserError);
+ }
+
+ [Test]
public void Calculate_WithCustomParser_ParsersExecutedAndOutputSet()
{
// Setup
@@ -123,17 +139,19 @@
}
[Test]
- public void Calculate_IllustrationPointsParserThrowsException_LogExceptionMessageAsWarning()
+ public void Calculate_IllustrationPointsParserThrowsException_SetsIllustrationPointsParserError()
{
// Setup
var calculator = new TestHydraRingCalculator("", new TestParser());
// Call
- Action test = () => calculator.PublicCalculate();
+ calculator.PublicCalculate();
// Assert
const string expectedMessage = "Er konden geen illustratiepunten worden uitgelezen.";
- TestHelper.AssertLogMessageWithLevelIsGenerated(test, new Tuple(expectedMessage, LogLevelConstant.Warn));
+ Assert.AreEqual(expectedMessage, calculator.IllustrationPointsParserError);
+ Assert.IsNull(calculator.IllustrationPointsResult);
+// TestHelper.AssertLogMessageWithLevelIsGenerated(test, new Tuple(expectedMessage, LogLevelConstant.Warn));
}
}