Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs =================================================================== diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r7044ef7d789aec3c3d9dd2c6f38b3699bea0444b --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 7044ef7d789aec3c3d9dd2c6f38b3699bea0444b) @@ -1050,7 +1050,7 @@ var overtoppingCalculator = new TestOvertoppingCalculator { LastErrorFileContent = "An error occurred", - EndInFailure = true + EndInFailure = false }; var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(overtoppingCalculator); @@ -1069,7 +1069,7 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { - var exceptionThrown = false; + HydraRingCalculationException exception = null; // Call Action call = () => @@ -1082,9 +1082,9 @@ failureMechanism.Contribution, validFile); } - catch (HydraRingCalculationException) + catch (HydraRingCalculationException e) { - exceptionThrown = true; + exception = e; } }; @@ -1098,8 +1098,9 @@ StringAssert.StartsWith("De overloop en overslag berekening is uitgevoerd op de tijdelijke locatie", msgs[2]); Assert.AreEqual($"Berekening van '{calculation.Name}' beƫindigd.", msgs[3]); }); - Assert.IsTrue(exceptionThrown); + Assert.IsInstanceOf(exception); Assert.IsNull(calculation.Output); + Assert.AreEqual(overtoppingCalculator.LastErrorFileContent, exception.Message); } } @@ -1258,7 +1259,8 @@ validFile); var dikeHeightCalculator = new TestHydraulicLoadsCalculator { - LastErrorFileContent = "An error occurred" + LastErrorFileContent = "An error occurred", + EndInFailure = false }; var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator());