Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rb3dea6d08961dd57169f6275342311ab662a5d0f -r6a0b8690fd6a3ccc04577ef50c1bb27fc381464c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision b3dea6d08961dd57169f6275342311ab662a5d0f) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 6a0b8690fd6a3ccc04577ef50c1bb27fc381464c) @@ -52,6 +52,7 @@ using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; +using Ringtoets.Revetment.Data; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos @@ -518,7 +519,6 @@ } [Test] - [SetCulture("nl-NL")] public void GivenGrassCoverErosionCalculationsThatSucceed_WhenCalculatingAllFromContextMenu_ThenAllCalculationsScheduled() { // Given @@ -623,17 +623,21 @@ CalculationServiceTestHelper.AssertValidationStartMessage(msgs.ElementAt(81)); CalculationServiceTestHelper.AssertValidationEndMessage(msgs.ElementAt(82)); CalculationServiceTestHelper.AssertCalculationStartMessage(msgs.ElementAt(83)); - AssertWaveConditionsCalculationMessages(msgs, 84, "1,99"); - AssertWaveConditionsCalculationMessages(msgs, 87, "1,50"); - AssertWaveConditionsCalculationMessages(msgs, 90, "1,00"); + + IEnumerable waterLevels = calculation.InputParameters.GetWaterLevels( + failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output.Result); + Assert.AreEqual(3, waterLevels.Count()); + AssertWaveConditionsCalculationMessages(msgs, 84, waterLevels.First()); + AssertWaveConditionsCalculationMessages(msgs, 87, waterLevels.ElementAt(1)); + AssertWaveConditionsCalculationMessages(msgs, 90, waterLevels.ElementAt(2)); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs.ElementAt(93)); Assert.AreEqual($"Golfcondities berekenen voor '{calculation.Name}' is gelukt.", msgs.ElementAt(94)); }); } } } - private static void AssertWaveConditionsCalculationMessages(IEnumerable messages, int startIndex, string waterLevel) + private static void AssertWaveConditionsCalculationMessages(IEnumerable messages, int startIndex, RoundedDouble waterLevel) { Assert.AreEqual($"Berekening voor waterstand '{waterLevel}' is gestart.", messages.ElementAt(startIndex)); Assert.AreEqual("Golfcondities berekening is uitgevoerd op de tijdelijke locatie ''. " + Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -rf84e6d0b153a800efdcf4a2c573074c4280f61dc -r6a0b8690fd6a3ccc04577ef50c1bb27fc381464c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision f84e6d0b153a800efdcf4a2c573074c4280f61dc) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 6a0b8690fd6a3ccc04577ef50c1bb27fc381464c) @@ -45,6 +45,7 @@ using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; +using Ringtoets.Revetment.Data; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos @@ -175,8 +176,8 @@ } }; - var nodeData = new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, - failureMechanism, + var nodeData = new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, + failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -242,7 +243,6 @@ } [Test] - [SetCulture("nl-NL")] public void GivenGrassCoverErosionCalculationsThatSucceed_WhenCalculatingAllFromContextMenu_ThenAllCalculationsScheduled() { // Given @@ -348,9 +348,13 @@ CalculationServiceTestHelper.AssertValidationStartMessage(msgs.ElementAt(81)); CalculationServiceTestHelper.AssertValidationEndMessage(msgs.ElementAt(82)); CalculationServiceTestHelper.AssertCalculationStartMessage(msgs.ElementAt(83)); - AssertWaveConditionsCalculationMessages(msgs, 84, "1,99"); - AssertWaveConditionsCalculationMessages(msgs, 87, "1,50"); - AssertWaveConditionsCalculationMessages(msgs, 90, "1,00"); + + IEnumerable waterLevels = calculation.InputParameters.GetWaterLevels( + failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output.Result); + Assert.AreEqual(3, waterLevels.Count()); + AssertWaveConditionsCalculationMessages(msgs, 84, waterLevels.First()); + AssertWaveConditionsCalculationMessages(msgs, 87, waterLevels.ElementAt(1)); + AssertWaveConditionsCalculationMessages(msgs, 90, waterLevels.ElementAt(2)); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs.ElementAt(93)); Assert.AreEqual($"Golfcondities berekenen voor '{calculation.Name}' is gelukt.", msgs.ElementAt(94)); }); @@ -454,7 +458,7 @@ Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), color); } - private static void AssertWaveConditionsCalculationMessages(IEnumerable messages, int startIndex, string waterLevel) + private static void AssertWaveConditionsCalculationMessages(IEnumerable messages, int startIndex, RoundedDouble waterLevel) { Assert.AreEqual($"Berekening voor waterstand '{waterLevel}' is gestart.", messages.ElementAt(startIndex)); Assert.AreEqual("Golfcondities berekening is uitgevoerd op de tijdelijke locatie ''. " +