Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs =================================================================== diff -u -r13aca975c179d9609126daac3b96d59c3183be34 -r4cfa6c0d3a6fe6513859087316ec1ed312e96e1c --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs (.../GrassCoverErosionOutwardsFailureMechanism.cs) (revision 13aca975c179d9609126daac3b96d59c3183be34) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs (.../GrassCoverErosionOutwardsFailureMechanism.cs) (revision 4cfa6c0d3a6fe6513859087316ec1ed312e96e1c) @@ -62,14 +62,6 @@ ForeshoreProfiles = new ForeshoreProfileCollection(); } - public override IEnumerable Calculations - { - get - { - return WaveConditionsCalculationGroup.GetCalculations().OfType(); - } - } - /// /// Gets the general grass cover erosion outwards calculation input parameters that apply to each calculation. /// @@ -151,6 +143,14 @@ } } + public override IEnumerable Calculations + { + get + { + return WaveConditionsCalculationGroup.GetCalculations().OfType(); + } + } + public IObservableEnumerable SectionResults { get Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsContext.cs =================================================================== diff -u -r214689c6312a97d85ca686e218c63ed11736b3c0 -r4cfa6c0d3a6fe6513859087316ec1ed312e96e1c --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsContext.cs (.../GrassCoverErosionOutwardsContext.cs) (revision 214689c6312a97d85ca686e218c63ed11736b3c0) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsContext.cs (.../GrassCoverErosionOutwardsContext.cs) (revision 4cfa6c0d3a6fe6513859087316ec1ed312e96e1c) @@ -53,6 +53,7 @@ { throw new ArgumentNullException(nameof(failureMechanism)); } + if (assessmentSection == null) { throw new ArgumentNullException(nameof(assessmentSection)); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy.cs =================================================================== diff -u -rc3d939772601830fd0a15ee54b80d22be25d32f2 -r4cfa6c0d3a6fe6513859087316ec1ed312e96e1c --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy.cs) (revision 4cfa6c0d3a6fe6513859087316ec1ed312e96e1c) @@ -29,7 +29,7 @@ /// An update strategy that can be used to update a instance with data /// from an old instance. /// - public class GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy + public class GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy : IFailureMechanismSectionResultUpdateStrategy { public void UpdateSectionResult(GrassCoverErosionOutwardsFailureMechanismSectionResult origin, GrassCoverErosionOutwardsFailureMechanismSectionResult target) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs =================================================================== diff -u -r4b9148359793969630d803f2477e765fba4e206f -r4cfa6c0d3a6fe6513859087316ec1ed312e96e1c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs (.../GrassCoverErosionOutwardsFailureMechanismTest.cs) (revision 4b9148359793969630d803f2477e765fba4e206f) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs (.../GrassCoverErosionOutwardsFailureMechanismTest.cs) (revision 4cfa6c0d3a6fe6513859087316ec1ed312e96e1c) @@ -191,7 +191,7 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var hydraulicBoundaryLocation1 = new TestHydraulicBoundaryLocation(); var hydraulicBoundaryLocation2 = new TestHydraulicBoundaryLocation(); - var hydraulicBoundaryLocations = new[] + TestHydraulicBoundaryLocation[] hydraulicBoundaryLocations = { hydraulicBoundaryLocation1, hydraulicBoundaryLocation2 Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs =================================================================== diff -u -r6737694cbe74ef5f6c2811e19a4dd49b528a50d4 -r4cfa6c0d3a6fe6513859087316ec1ed312e96e1c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs) (revision 6737694cbe74ef5f6c2811e19a4dd49b528a50d4) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs) (revision 4cfa6c0d3a6fe6513859087316ec1ed312e96e1c) @@ -67,6 +67,7 @@ AssertHydraulicBoundaryCalculations(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, locations, setCalculationOutput); AssertHydraulicBoundaryCalculations(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, locations, setCalculationOutput); } + [Test] [TestCase(true)] [TestCase(false)] @@ -149,7 +150,7 @@ GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(failureMechanism); // Assert - var expectedCalculations = new[] + HydraulicBoundaryLocationCalculation[] expectedCalculations = { calculation1, calculation2, Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r4cfa6c0d3a6fe6513859087316ec1ed312e96e1c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision 4cfa6c0d3a6fe6513859087316ec1ed312e96e1c) @@ -174,6 +174,7 @@ }; grassCoverErosionOutwardsWaveConditionsOutput = new GrassCoverErosionOutwardsWaveConditionsOutput(output); } + calculationGroup.Children.Add( new CalculationGroup { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs =================================================================== diff -u -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba -r4cfa6c0d3a6fe6513859087316ec1ed312e96e1c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs) (revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs) (revision 4cfa6c0d3a6fe6513859087316ec1ed312e96e1c) @@ -71,6 +71,7 @@ Assert.IsInstanceOf(objectProperties); Assert.AreSame(failureMechanism, objectProperties.Data); } + mocks.VerifyAll(); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3 -r4cfa6c0d3a6fe6513859087316ec1ed312e96e1c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision 4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision 4cfa6c0d3a6fe6513859087316ec1ed312e96e1c) @@ -281,7 +281,6 @@ () => 1.0, "A"); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, importCommandHandler, exportCommandHandler, Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -r25a2b53bdf734865d0bcb8479ad301d9e397d02a -r4cfa6c0d3a6fe6513859087316ec1ed312e96e1c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 25a2b53bdf734865d0bcb8479ad301d9e397d02a) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 4cfa6c0d3a6fe6513859087316ec1ed312e96e1c) @@ -177,7 +177,7 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => + TestDelegate test = () => GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivitiesWithoutAssessmentSectionCalculations(null, assessmentSection); // Assert @@ -190,7 +190,7 @@ public void CreateCalculationActivitiesWithoutAssessmentSectionCalculations_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => + TestDelegate test = () => GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivitiesWithoutAssessmentSectionCalculations(new GrassCoverErosionOutwardsFailureMechanism(), null); // Assert