Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r711f6909f672eff30cea67489cb7372f01e7aff9 -rfae525350cc755ecc783bd4ac3fc13aed2e4ccaa --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 711f6909f672eff30cea67489cb7372f01e7aff9) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision fae525350cc755ecc783bd4ac3fc13aed2e4ccaa) @@ -85,10 +85,11 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(3, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - StringAssert.StartsWith("Validatie mislukt: Fout bij het lezen van bestand", msgs[1]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + Assert.AreEqual(4, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + StringAssert.StartsWith("Validatie mislukt: Fout bij het lezen van bestand", msgs[2]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[3]); }); Assert.AreEqual(ActivityState.Failed, activity.State); } @@ -330,13 +331,14 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(6, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); - Assert.AreEqual($"De overloop en overslag berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. {detailedReport}", msgs[3]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, calculator.OutputDirectory, msgs[4]); - CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[5]); + Assert.AreEqual(7, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[3]); + Assert.AreEqual($"De overloop en overslag berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. {detailedReport}", msgs[4]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, calculator.OutputDirectory, msgs[5]); + CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]); }); Assert.AreEqual(ActivityState.Failed, activity.State); } @@ -378,12 +380,13 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(5, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]); - CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[4]); + Assert.AreEqual(6, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[3]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[4]); + CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[5]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -620,14 +623,15 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(7, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[4]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[5]); - CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]); + Assert.AreEqual(8, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[3]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[4]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[5]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[6]); + CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[7]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -678,14 +682,15 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(7, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[4]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[5]); - CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]); + Assert.AreEqual(8, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[3]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[4]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[5]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[6]); + CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[7]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -737,14 +742,15 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(7, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[4]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[5]); - CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]); + Assert.AreEqual(8, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[3]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[4]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[5]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[6]); + CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[7]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -802,14 +808,15 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(7, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[4]); - Assert.AreEqual($"De HBN berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet geconvergeerd.", msgs[5]); - CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]); + Assert.AreEqual(8, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[3]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[4]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[5]); + Assert.AreEqual($"De HBN berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet geconvergeerd.", msgs[6]); + CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[7]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -1051,14 +1058,15 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(7, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[4]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[5]); - CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]); + Assert.AreEqual(8, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[3]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[4]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[5]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[6]); + CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[7]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -1109,14 +1117,15 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(7, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[4]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[5]); - CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]); + Assert.AreEqual(8, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[3]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[4]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[5]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[6]); + CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[7]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -1168,14 +1177,15 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(7, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[4]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[5]); - CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]); + Assert.AreEqual(8, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[3]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[4]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[5]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[6]); + CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[7]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -1233,14 +1243,15 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(7, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]); - GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[4]); - Assert.AreEqual($"De overslagdebiet berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet geconvergeerd.", msgs[5]); - CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]); + Assert.AreEqual(8, msgs.Length); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[3]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[4]); + GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[5]); + Assert.AreEqual($"De overslagdebiet berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet geconvergeerd.", msgs[6]); + CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[7]); }); Assert.AreEqual(ActivityState.Executed, activity.State); }