Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs =================================================================== diff -u -r889e8e4ee8267b316e00e8f8a1035c60afb200a0 -rc72b7ff765e65c4c17bfa01fcb940ef61ba9f86f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 889e8e4ee8267b316e00e8f8a1035c60afb200a0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision c72b7ff765e65c4c17bfa01fcb940ef61ba9f86f) @@ -1693,7 +1693,7 @@ } [Test] - public void ConvertIllustrationPointsResult_OvertoppingGeneralResultNull_WarnErrorMessage() + public void CalculateAndConvertIllustrationPointsResult_OvertoppingGeneralResultNull_WarnErrorMessage() { // Setup GrassCoverErosionInwardsFailureMechanism failureMechanism = CreateGrassCoverErosionInwardsFailureMechanism(); @@ -1783,17 +1783,18 @@ } [Test] - public void ConvertIllustrationPointsResult_OvertoppingGeneralResultNullNoErrorMessage_NoWarning() + public void DontCalculateAndConvertIllustrationPointsResult_OvertoppingGeneralResultNull_WarnErrorMessage() { // Setup GrassCoverErosionInwardsFailureMechanism failureMechanism = CreateGrassCoverErosionInwardsFailureMechanism(); + const string parserError = "Parser error message"; var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator { IllustrationPointsResult = null, - IllustrationPointsParserErrorMessage = null + IllustrationPointsParserErrorMessage = parserError }); calculatorFactory.Stub(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(new TestHydraulicLoadsCalculator { @@ -1821,7 +1822,7 @@ OvertoppingRateCalculationType = OvertoppingRateCalculationType.CalculateByAssessmentSectionNorm, UseForeshore = true, ShouldDikeHeightIllustrationPointsBeCalculated = true, - ShouldOvertoppingOutputIllustrationPointsBeCalculated = true, + ShouldOvertoppingOutputIllustrationPointsBeCalculated = false, ShouldOvertoppingRateIllustrationPointsBeCalculated = true } }; @@ -1961,11 +1962,12 @@ } [Test] - public void ConvertIllustrationPointsResult_OvertoppingRateGeneralResultNullNoErrorMessage_NoWarning() + public void DontCalculateAndConvertIllustrationPointsResult_OvertoppingRateGeneralResultNull_WarnErrorMessage() { // Setup GrassCoverErosionInwardsFailureMechanism failureMechanism = CreateGrassCoverErosionInwardsFailureMechanism(); + const string parserError = "Parser error message"; var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator @@ -1979,7 +1981,7 @@ calculatorFactory.Stub(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(new TestHydraulicLoadsCalculator { IllustrationPointsResult = null, - IllustrationPointsParserErrorMessage = null + IllustrationPointsParserErrorMessage = parserError }); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, @@ -2000,7 +2002,7 @@ UseForeshore = true, ShouldDikeHeightIllustrationPointsBeCalculated = true, ShouldOvertoppingOutputIllustrationPointsBeCalculated = true, - ShouldOvertoppingRateIllustrationPointsBeCalculated = true + ShouldOvertoppingRateIllustrationPointsBeCalculated = false } }; @@ -2139,11 +2141,12 @@ } [Test] - public void ConvertIllustrationPointsResult_DikeHeightGeneralResultNullNoErrorMessage_NoWarning() + public void DontCalculateAndConvertIllustrationPointsResult_DikeHeightGeneralResultNull_WarnErrorMessage() { // Setup GrassCoverErosionInwardsFailureMechanism failureMechanism = CreateGrassCoverErosionInwardsFailureMechanism(); + const string parserError = "Parser error message"; var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator @@ -2153,11 +2156,12 @@ calculatorFactory.Stub(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(new TestHydraulicLoadsCalculator { IllustrationPointsResult = null, - IllustrationPointsParserErrorMessage = null + IllustrationPointsParserErrorMessage = parserError }); calculatorFactory.Stub(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(new TestHydraulicLoadsCalculator { IllustrationPointsResult = new TestGeneralResult() + }); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, @@ -2176,7 +2180,7 @@ DikeHeightCalculationType = DikeHeightCalculationType.CalculateByAssessmentSectionNorm, OvertoppingRateCalculationType = OvertoppingRateCalculationType.CalculateByAssessmentSectionNorm, UseForeshore = true, - ShouldDikeHeightIllustrationPointsBeCalculated = true, + ShouldDikeHeightIllustrationPointsBeCalculated = false, ShouldOvertoppingOutputIllustrationPointsBeCalculated = true, ShouldOvertoppingRateIllustrationPointsBeCalculated = true } @@ -2459,7 +2463,7 @@ failureMechanism.Contribution, validFile); } - catch (ArgumentException) + catch (ArgumentException e) { exceptionThrown = true; }