Fisheye: Tag 9fb6b330d45af8ac4ebdf127bb5907781cdb5155 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Plugin.TestUtil/HydraulicBoundaryLocationCalculationActivityTestHelper.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Plugin.TestUtil/Ringtoets.Common.Plugin.TestUtil.csproj =================================================================== diff -u -r7a522db606159a6bea54bdb2b5370460c786336a -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/Common/test/Ringtoets.Common.Plugin.TestUtil/Ringtoets.Common.Plugin.TestUtil.csproj (.../Ringtoets.Common.Plugin.TestUtil.csproj) (revision 7a522db606159a6bea54bdb2b5370460c786336a) +++ Ringtoets/Common/test/Ringtoets.Common.Plugin.TestUtil/Ringtoets.Common.Plugin.TestUtil.csproj (.../Ringtoets.Common.Plugin.TestUtil.csproj) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -20,7 +20,7 @@ - + Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r55733817774ea50c28f90a92eb32ddc245891c89 -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision 55733817774ea50c28f90a92eb32ddc245891c89) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -508,15 +508,15 @@ Assert.AreEqual(40, msgs.Length); const string duneCalculationName = "Hydraulische randvoorwaarden"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( duneLocation.Name, duneCalculationName, "Iv->IIv", msgs, 0); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( duneLocation.Name, duneCalculationName, "IIv->IIIv", msgs, 8); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( duneLocation.Name, duneCalculationName, "IIIv->IVv", msgs, 16); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( duneLocation.Name, duneCalculationName, "IVv->Vv", msgs, 24); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( duneLocation.Name, duneCalculationName, "Vv->VIv", msgs, 32); }); } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r55733817774ea50c28f90a92eb32ddc245891c89 -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision 55733817774ea50c28f90a92eb32ddc245891c89) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -465,15 +465,15 @@ Assert.AreEqual(40, msgs.Length); const string duneCalculationName = "Hydraulische randvoorwaarden"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( duneLocation.Name, duneCalculationName, "Iv->IIv", msgs, 0); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( duneLocation.Name, duneCalculationName, "IIv->IIIv", msgs, 8); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( duneLocation.Name, duneCalculationName, "IIIv->IVv", msgs, 16); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( duneLocation.Name, duneCalculationName, "IVv->Vv", msgs, 24); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( duneLocation.Name, duneCalculationName, "Vv->VIv", msgs, 32); }); } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsCalculationActivityFactory.cs =================================================================== diff -u -r4fc78c9315e9878052cc9f8340acf46c3bcb6f76 -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsCalculationActivityFactory.cs (.../GrassCoverErosionOutwardsCalculationActivityFactory.cs) (revision 4fc78c9315e9878052cc9f8340acf46c3bcb6f76) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsCalculationActivityFactory.cs (.../GrassCoverErosionOutwardsCalculationActivityFactory.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -38,8 +38,8 @@ public static class GrassCoverErosionOutwardsCalculationActivityFactory { /// - /// Creates a collection of for all calculations - /// on grass cover erosion outwards level. + /// Creates a collection of based on the calculations in + /// . /// /// The failure mechanism to create the activities for. /// The assessment section the failure mechanism belongs to. @@ -142,8 +142,8 @@ #region Hydraulic Boundary Location Calculations /// - /// Creates a collection of for wave height calculations - /// on grass cover erosion outwards level. + /// Creates a collection of based on the wave height calculations in + /// . /// /// The failure mechanism to create the activities for. /// The assessment section the failure mechanism belongs to. @@ -199,8 +199,8 @@ } /// - /// Creates a collection of for design water level calculations - /// on grass cover erosion outwards level. + /// Creates a collection of based on the design water level calculations in + /// . /// /// The failure mechanism to create the activities for. /// The assessment section the failure mechanism belongs to. Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r55733817774ea50c28f90a92eb32ddc245891c89 -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 55733817774ea50c28f90a92eb32ddc245891c89) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -372,15 +372,15 @@ Assert.AreEqual(40, msgs.Length); const string designWaterLevelName = "Waterstand"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "Iv->IIv", msgs, 0); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "IIv->IIIv", msgs, 8); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "IIIv->IVv", msgs, 16); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "IVv->Vv", msgs, 24); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "Vv->VIv", msgs, 32); }); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r6a0b8690fd6a3ccc04577ef50c1bb27fc381464c -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 6a0b8690fd6a3ccc04577ef50c1bb27fc381464c) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -596,27 +596,27 @@ Assert.AreEqual(95, msgs.Length); const string designWaterLevelName = "Waterstand"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "Iv->IIv", msgs, 0); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "IIv->IIIv", msgs, 8); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "IIIv->IVv", msgs, 16); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "IVv->Vv", msgs, 24); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "Vv->VIv", msgs, 32); const string waveHeightName = "Golfhoogte"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "Iv->IIv", msgs, 40); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "IIv->IIIv", msgs, 48); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "IIIv->IVv", msgs, 56); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "IVv->Vv", msgs, 64); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "Vv->VIv", msgs, 72); Assert.AreEqual($"Golfcondities berekenen voor '{calculation.Name}' is gestart.", msgs.ElementAt(80)); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -r6a0b8690fd6a3ccc04577ef50c1bb27fc381464c -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 6a0b8690fd6a3ccc04577ef50c1bb27fc381464c) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -321,27 +321,27 @@ Assert.AreEqual(95, msgs.Length); const string designWaterLevelName = "Waterstand"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "Iv->IIv", msgs, 0); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "IIv->IIIv", msgs, 8); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "IIIv->IVv", msgs, 16); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "IVv->Vv", msgs, 24); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "Vv->VIv", msgs, 32); const string waveHeightName = "Golfhoogte"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "Iv->IIv", msgs, 40); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "IIv->IIIv", msgs, 48); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "IIIv->IVv", msgs, 56); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "IVv->Vv", msgs, 64); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "Vv->VIv", msgs, 72); Assert.AreEqual($"Golfcondities berekenen voor '{calculation.Name}' is gestart.", msgs.ElementAt(80)); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r55733817774ea50c28f90a92eb32ddc245891c89 -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 55733817774ea50c28f90a92eb32ddc245891c89) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -372,15 +372,15 @@ Assert.AreEqual(40, msgs.Length); const string waveHeightName = "Golfhoogte"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "Iv->IIv", msgs, 0); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "IIv->IIIv", msgs, 8); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "IIIv->IVv", msgs, 16); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "IVv->Vv", msgs, 24); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "Vv->VIv", msgs, 32); }); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -r3af700006b3a91867ab1a9bb3526ff6715561847 -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 3af700006b3a91867ab1a9bb3526ff6715561847) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -37,10 +37,12 @@ using Ringtoets.Common.Service; using Ringtoets.Common.Service.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Data; +using Ringtoets.GrassCoverErosionOutwards.Data.TestUtil; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics; using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; +using Ringtoets.Revetment.Data; namespace Ringtoets.GrassCoverErosionOutwards.Service.Test { @@ -86,14 +88,11 @@ GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanism(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName 1"); - TestHydraulicBoundaryLocation[] hydraulicBoundaryLocations = + GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[] { hydraulicBoundaryLocation - }; + }); - assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations); - failureMechanism.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations); - GrassCoverErosionOutwardsWaveConditionsCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation); GrassCoverErosionOutwardsWaveConditionsCalculation calculation2 = CreateValidCalculation(hydraulicBoundaryLocation); @@ -113,9 +112,9 @@ Assert.AreEqual(12, activities.Count()); double mechanismSpecificFactorizedSignalingNorm = GetExpectedNorm(failureMechanism, - () => assessmentSection.FailureMechanismContribution.SignalingNorm / 30); - double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, () => assessmentSection.FailureMechanismContribution.SignalingNorm); - double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, () => assessmentSection.FailureMechanismContribution.LowerLimitNorm); + assessmentSection.FailureMechanismContribution.SignalingNorm / 30); + double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.SignalingNorm); + double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.LowerLimitNorm); double lowerLimitNorm = assessmentSection.FailureMechanismContribution.LowerLimitNorm; double factorizedLowerLimitNorm = lowerLimitNorm * 30; @@ -163,10 +162,11 @@ factorizedLowerLimitNorm, "Vv->VIv"); - failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output = new TestHydraulicBoundaryLocationCalculationOutput(2.0); + var hydraulicBoundaryLocationCalculationOutput = new TestHydraulicBoundaryLocationCalculationOutput(2.0); + failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output = hydraulicBoundaryLocationCalculationOutput; - AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(10), calculation1); - AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(11), calculation2); + AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(10), calculation1, hydraulicBoundaryLocationCalculationOutput.Result); + AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(11), calculation2, hydraulicBoundaryLocationCalculationOutput.Result); } private static GrassCoverErosionOutwardsFailureMechanism CreateFailureMechanism() @@ -213,23 +213,14 @@ }; } - private static void AddHydraulicBoundaryLocationToFailureMechanism(GrassCoverErosionOutwardsFailureMechanism failureMechanism, - TestHydraulicBoundaryLocation hydraulicBoundaryLocation) - { - failureMechanism.SetHydraulicBoundaryLocationCalculations(new[] - { - hydraulicBoundaryLocation - }); - failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output = new TestHydraulicBoundaryLocationCalculationOutput(2.0); - } - private static void AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(Activity activity, - GrassCoverErosionOutwardsWaveConditionsCalculation calculation) + GrassCoverErosionOutwardsWaveConditionsCalculation calculation, + RoundedDouble assessmentLevel) { var mocks = new MockRepository(); var testCalculator = new TestWaveConditionsCosineCalculator(); var calculatorFactory = mocks.StrictMock(); - const int nrOfCalculations = 3; + int nrOfCalculations = calculation.InputParameters.GetWaterLevels(assessmentLevel).Count(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, "")) .Return(testCalculator).Repeat.Times(nrOfCalculations); mocks.ReplayAll(); @@ -248,7 +239,7 @@ mocks.VerifyAll(); } - #region Wave Conditions + #region Wave Conditions Calculations [Test] public void CreateCalculationActivity_CalculationNull_ThrowsArgumentNullException() @@ -308,28 +299,27 @@ { // Setup GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanism(); + var assessmentSection = new AssessmentSectionStub(); + assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath; - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, - mocks, - validFilePath); - - mocks.ReplayAll(); - - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); + var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName 1"); + GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[] + { + hydraulicBoundaryLocation + }, true); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(hydraulicBoundaryLocation); - AddHydraulicBoundaryLocationToFailureMechanism(failureMechanism, hydraulicBoundaryLocation); - // Call CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation, failureMechanism, assessmentSection); // Assert Assert.IsInstanceOf(activity); - AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activity, calculation); - mocks.VerifyAll(); + AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity( + activity, + calculation, + failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output.Result); } [Test] @@ -388,20 +378,17 @@ { // Setup GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanism(); + var assessmentSection = new AssessmentSectionStub(); + assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath; - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, - mocks, - validFilePath); - - mocks.ReplayAll(); - - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); + var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName 1"); + GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[] + { + hydraulicBoundaryLocation + }, true); GrassCoverErosionOutwardsWaveConditionsCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation); GrassCoverErosionOutwardsWaveConditionsCalculation calculation2 = CreateValidCalculation(hydraulicBoundaryLocation); - AddHydraulicBoundaryLocationToFailureMechanism(failureMechanism, hydraulicBoundaryLocation); - var calculations = new CalculationGroup { Children = @@ -419,9 +406,10 @@ CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(GrassCoverErosionOutwardsWaveConditionsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.First(), calculation1); - AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2); - mocks.VerifyAll(); + RoundedDouble assessmentLevel = failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output.Result; + + AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.First(), calculation1, assessmentLevel); + AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel); } #endregion @@ -490,7 +478,7 @@ Assert.AreEqual(10, activities.Count()); double mechanismSpecificFactorizedSignalingNorm = GetExpectedNorm(failureMechanism, - () => assessmentSection.FailureMechanismContribution.SignalingNorm / 30); + assessmentSection.FailureMechanismContribution.SignalingNorm / 30); AssertDesignWaterLevelCalculationActivity(activities.First(), hydraulicBoundaryLocation1, mechanismSpecificFactorizedSignalingNorm, @@ -500,7 +488,7 @@ mechanismSpecificFactorizedSignalingNorm, "Iv->IIv"); - double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, () => assessmentSection.FailureMechanismContribution.SignalingNorm); + double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.SignalingNorm); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation1, mechanismSpecificSignalingNorm, @@ -510,7 +498,7 @@ mechanismSpecificSignalingNorm, "IIv->IIIv"); - double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, () => assessmentSection.FailureMechanismContribution.LowerLimitNorm); + double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.LowerLimitNorm); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(4), hydraulicBoundaryLocation1, mechanismSpecificLowerLimitNorm, @@ -603,7 +591,7 @@ Assert.AreEqual(10, activities.Count()); double mechanismSpecificFactorizedSignalingNorm = GetExpectedNorm(failureMechanism, - () => assessmentSection.FailureMechanismContribution.SignalingNorm / 30); + assessmentSection.FailureMechanismContribution.SignalingNorm / 30); AssertWaveHeightCalculationActivity(activities.First(), hydraulicBoundaryLocation1, mechanismSpecificFactorizedSignalingNorm, @@ -613,7 +601,7 @@ mechanismSpecificFactorizedSignalingNorm, "Iv->IIv"); - double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, () => assessmentSection.FailureMechanismContribution.SignalingNorm); + double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.SignalingNorm); AssertWaveHeightCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation1, mechanismSpecificSignalingNorm, @@ -623,7 +611,7 @@ mechanismSpecificSignalingNorm, "IIv->IIIv"); - double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, () => assessmentSection.FailureMechanismContribution.LowerLimitNorm); + double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.LowerLimitNorm); AssertWaveHeightCalculationActivity(activities.ElementAt(4), hydraulicBoundaryLocation1, mechanismSpecificLowerLimitNorm, @@ -733,10 +721,10 @@ CalculationServiceTestHelper.AssertCalculationEndMessage(messages.ElementAt(6)); } - private static double GetExpectedNorm(GrassCoverErosionOutwardsFailureMechanism failureMechanism, Func getNormFunc) + private static double GetExpectedNorm(GrassCoverErosionOutwardsFailureMechanism failureMechanism, double norm) { return RingtoetsCommonDataCalculationService.ProfileSpecificRequiredProbability( - getNormFunc(), + norm, failureMechanism.Contribution, failureMechanism.GeneralInput.N); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r55733817774ea50c28f90a92eb32ddc245891c89 -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 55733817774ea50c28f90a92eb32ddc245891c89) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -348,13 +348,13 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(32, msgs.Length); const string designWaterLevelName = "Waterstand"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "A+->A", msgs, 0); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "A->B", msgs, 8); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "B->C", msgs, 16); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "C->D", msgs, 24); }); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -r55733817774ea50c28f90a92eb32ddc245891c89 -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 55733817774ea50c28f90a92eb32ddc245891c89) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -862,23 +862,23 @@ Assert.AreEqual(64, msgs.Length); const string designWaterLevelName = "Waterstand"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "A+->A", msgs, 0); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "A->B", msgs, 8); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "B->C", msgs, 16); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, designWaterLevelName, "C->D", msgs, 24); const string waveHeightName = "Golfhoogte"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "A+->A", msgs, 32); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "A->B", msgs, 40); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "B->C", msgs, 48); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "C->D", msgs, 56); }); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r55733817774ea50c28f90a92eb32ddc245891c89 -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 55733817774ea50c28f90a92eb32ddc245891c89) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) @@ -350,13 +350,13 @@ Assert.AreEqual(32, msgs.Length); const string waveHeightName = "Golfhoogte"; - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "A+->A", msgs, 0); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "A->B", msgs, 8); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "B->C", msgs, 16); - HydraulicBoundaryLocationCalculationActivityTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( hydraulicBoundaryLocation.Name, waveHeightName, "C->D", msgs, 24); });