Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -ra8bc394180aa765a9faeb140a90e60599e64cf3e -rfae525350cc755ecc783bd4ac3fc13aed2e4ccaa --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision a8bc394180aa765a9faeb140a90e60599e64cf3e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision fae525350cc755ecc783bd4ac3fc13aed2e4ccaa) @@ -97,10 +97,11 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(3, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - Assert.AreEqual($"Validatie mislukt: Fout bij het lezen van bestand '{testFilePath}': het bestand bestaat niet.", msgs[1]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + Assert.AreEqual(4, msgs.Length); + Assert.AreEqual($"Golfcondities berekenen voor '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + Assert.AreEqual($"Validatie mislukt: Fout bij het lezen van bestand '{testFilePath}': het bestand bestaat niet.", msgs[2]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[3]); }); Assert.AreEqual(ActivityState.Failed, activity.State); } @@ -140,12 +141,13 @@ TestHelper.AssertLogMessages(call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(13, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); + Assert.AreEqual(14, msgs.Length); + Assert.AreEqual($"Golfcondities berekenen voor '{calculation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[3]); - var i = 2; + var i = 3; foreach (RoundedDouble waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevel}' is gestart.", msgs[i + 1]); @@ -154,7 +156,7 @@ i = i + 3; } - Assert.AreEqual($"Berekening van '{calculation.Name}' is beëindigd.", msgs[12]); + Assert.AreEqual($"Berekening van '{calculation.Name}' is beëindigd.", msgs[13]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -303,14 +305,15 @@ string[] msgs = messages.ToArray(); RoundedDouble firstWaterLevel = calculation.InputParameters.WaterLevels.First(); - Assert.AreEqual(7, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]); - CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]); - CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]); - Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{firstWaterLevel}' is gestart.", msgs[3]); - StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[4]); - Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{firstWaterLevel}' is beëindigd.", msgs[5]); - CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]); + Assert.AreEqual(8, msgs.Length); + Assert.AreEqual($"Golfcondities berekenen voor '{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($"Berekening '{calculation.Name}' voor waterstand '{firstWaterLevel}' is gestart.", msgs[4]); + StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[5]); + Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{firstWaterLevel}' is beëindigd.", msgs[6]); + CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[7]); }); Assert.AreEqual(ActivityState.Canceled, activity.State);