Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs =================================================================== diff -u -r0bb11ec189709c999bee440a31c003f00b0a3a2b -r2c68fa9dd748870624f45c0f2ae6a30327485a63 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision 0bb11ec189709c999bee440a31c003f00b0a3a2b) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision 2c68fa9dd748870624f45c0f2ae6a30327485a63) @@ -87,7 +87,7 @@ protected override void OnRun() { - PerformRun(() => true, + PerformRun(() => WaveConditionsCalculationService.Instance.Validate(calculation.InputParameters, assessmentSection.HydraulicBoundaryDatabase, calculation.Name), () => GrassCoverErosionOutwardsDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation), () => { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r7da3e50da60f27ba27ec7c97c860d8c0b92eb313 -r2c68fa9dd748870624f45c0f2ae6a30327485a63 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 7da3e50da60f27ba27ec7c97c860d8c0b92eb313) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 2c68fa9dd748870624f45c0f2ae6a30327485a63) @@ -663,8 +663,9 @@ assessmentSection.Stub(a => a.FailureMechanismContribution).Return( new FailureMechanismContribution(Enumerable.Empty(), 30, 2)); - var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation + var calculationA = new GrassCoverErosionOutwardsWaveConditionsCalculation { + Name = "A", InputParameters = { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 1, 1) @@ -678,10 +679,27 @@ UpperBoundaryWaterLevels = (RoundedDouble) 10.0 } }; + var calculationB = new GrassCoverErosionOutwardsWaveConditionsCalculation + { + Name = "B", + InputParameters = + { + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 1, 1) + { + DesignWaterLevel = (RoundedDouble)12.0 + }, + LowerBoundaryRevetment = (RoundedDouble)1.0, + UpperBoundaryRevetment = (RoundedDouble)10.0, + StepSize = WaveConditionsInputStepSize.One, + LowerBoundaryWaterLevels = (RoundedDouble)1.0, + UpperBoundaryWaterLevels = (RoundedDouble)10.0 + } + }; + var group = new CalculationGroup(); - group.Children.Add(calculation); - group.Children.Add(calculation); + group.Children.Add(calculationA); + group.Children.Add(calculationB); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); @@ -714,15 +732,15 @@ { var messages = m.ToArray(); Assert.AreEqual(4, messages.Length); - StringAssert.StartsWith("Validatie van 'Nieuwe berekening' gestart om: ", messages[0]); - StringAssert.StartsWith("Validatie van 'Nieuwe berekening' beëindigd om: ", messages[1]); - StringAssert.StartsWith("Validatie van 'Nieuwe berekening' gestart om: ", messages[2]); - StringAssert.StartsWith("Validatie van 'Nieuwe berekening' beëindigd om: ", messages[3]); + StringAssert.StartsWith("Validatie van 'A' gestart om: ", messages[0]); + StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messages[1]); + StringAssert.StartsWith("Validatie van 'B' gestart om: ", messages[2]); + StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messages[3]); }); } } } - + [Test] public void ContextMenuStrip_TwoCalculationsClickOnCalculateAllInGroup_MessagesLogged() { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r14a346e335356ca0a7403cfc940610f739a6362e -r2c68fa9dd748870624f45c0f2ae6a30327485a63 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 14a346e335356ca0a7403cfc940610f739a6362e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 2c68fa9dd748870624f45c0f2ae6a30327485a63) @@ -156,10 +156,12 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(11, msgs.Length); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); + Assert.AreEqual(13, msgs.Length); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); - int i = 0; + int i = 2; foreach (var waterLevel in calculation.InputParameters.WaterLevels) { StringAssert.StartsWith(string.Format("Berekening '{0}' voor waterstand '{1}' gestart om: ", calculation.Name, waterLevel), msgs[i + 1]); @@ -169,7 +171,7 @@ i = i + 3; } - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[10]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[12]); }); Assert.AreEqual(ActivityState.Failed, activity.State); }