Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs =================================================================== diff -u -rf2ba7f68f5de2fc3c8dec8baf7326808120cee52 -r966dc7335defa901104fd4168d57c08315db2de0 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision f2ba7f68f5de2fc3c8dec8baf7326808120cee52) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision 966dc7335defa901104fd4168d57c08315db2de0) @@ -29,6 +29,7 @@ using Ringtoets.Common.Service.TestUtil; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Data.TestUtil; +using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; namespace Ringtoets.MacroStabilityInwards.Service.Test { @@ -118,26 +119,30 @@ validMacroStabilityInwardsCalculation.SemiProbabilisticOutput = null; double norm = new Random(21).NextDouble(); - var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation, new MacroStabilityInwardsProbabilityAssessmentInput(), norm, double.NaN); - activity.Run(); - // Call - Action call = () => activity.Run(); - - // Assert - TestHelper.AssertLogMessages(call, messages => + using (new MacroStabilityInwardsCalculatorFactoryConfig(new TestMacroStabilityInwardsCalculatorFactory())) { - string[] msgs = messages.ToArray(); - Assert.AreEqual(5, msgs.Length); - Assert.AreEqual($"Uitvoeren van berekening '{validMacroStabilityInwardsCalculation.Name}' is gestart.", msgs[0]); - CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]); - CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]); - CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[3]); - CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[4]); - }); - Assert.AreEqual(ActivityState.Executed, activity.State); - Assert.IsNotNull(validMacroStabilityInwardsCalculation.Output); - Assert.IsNotNull(validMacroStabilityInwardsCalculation.SemiProbabilisticOutput); + var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation, new MacroStabilityInwardsProbabilityAssessmentInput(), norm, double.NaN); + activity.Run(); + + // Call + Action call = () => activity.Run(); + + // Assert + TestHelper.AssertLogMessages(call, messages => + { + string[] msgs = messages.ToArray(); + Assert.AreEqual(5, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{validMacroStabilityInwardsCalculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[3]); + CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[4]); + }); + Assert.AreEqual(ActivityState.Executed, activity.State); + Assert.IsNotNull(validMacroStabilityInwardsCalculation.Output); + Assert.IsNotNull(validMacroStabilityInwardsCalculation.SemiProbabilisticOutput); + } } [Test]