Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationContextTest.cs =================================================================== diff -u -rb1a215180352084c8f320439c1893c639917f338 -r33efdf255d012f47a045c7f3181487e0453cf5e2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationContextTest.cs (.../GrassCoverErosionInwardsCalculationContextTest.cs) (revision b1a215180352084c8f320439c1893c639917f338) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationContextTest.cs (.../GrassCoverErosionInwardsCalculationContextTest.cs) (revision 33efdf255d012f47a045c7f3181487e0453cf5e2) @@ -23,6 +23,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Calculation; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; @@ -43,7 +44,8 @@ public void ConstructorWithData_Always_ExpectedPropertiesSet() { // Setup - var calculationMock = mocksRepository.StrictMock(new GeneralGrassCoverErosionInwardsInput()); + var calculationMock = mocksRepository.StrictMock(new GeneralGrassCoverErosionInwardsInput(), + new GeneralNormProbabilityInput()); var failureMechanismMock = mocksRepository.StrictMock(); var assessmentSectionMock = mocksRepository.StrictMock(); mocksRepository.ReplayAll(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs =================================================================== diff -u -r2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c -r33efdf255d012f47a045c7f3181487e0453cf5e2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs (.../BreakWaterPropertiesTest.cs) (revision 2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs (.../BreakWaterPropertiesTest.cs) (revision 33efdf255d012f47a045c7f3181487e0453cf5e2) @@ -26,6 +26,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Calculation; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionInwards.Forms.Properties; @@ -63,7 +64,7 @@ var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var calculationMock = mockRepository.StrictMock(generalInput); + var calculationMock = mockRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()); var inputMock = mockRepository.StrictMock(generalInput); mockRepository.ReplayAll(); @@ -89,7 +90,7 @@ var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var calculationMock = mockRepository.StrictMock(generalInput); + var calculationMock = mockRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()); mockRepository.ReplayAll(); var input = new GrassCoverErosionInwardsInput(generalInput); @@ -121,7 +122,7 @@ var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var calculationMock = mockRepository.StrictMock(generalInput); + var calculationMock = mockRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()); var inputMock = mockRepository.StrictMock(generalInput); mockRepository.ReplayAll(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs =================================================================== diff -u -r2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c -r33efdf255d012f47a045c7f3181487e0453cf5e2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs (.../DikeGeometryPropertiesTest.cs) (revision 2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs (.../DikeGeometryPropertiesTest.cs) (revision 33efdf255d012f47a045c7f3181487e0453cf5e2) @@ -24,6 +24,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Calculation; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionInwards.Forms.Properties; @@ -61,7 +62,7 @@ var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var calculationMock = mockRepository.StrictMock(generalInput); + var calculationMock = mockRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()); mockRepository.ReplayAll(); var input = new GrassCoverErosionInwardsInput(generalInput); @@ -83,7 +84,7 @@ var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var calculationMock = mockRepository.StrictMock(generalInput); + var calculationMock = mockRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()); mockRepository.ReplayAll(); var input = new GrassCoverErosionInwardsInput(generalInput); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs =================================================================== diff -u -r2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c -r33efdf255d012f47a045c7f3181487e0453cf5e2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs (.../ForeshorePropertiesTest.cs) (revision 2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs (.../ForeshorePropertiesTest.cs) (revision 33efdf255d012f47a045c7f3181487e0453cf5e2) @@ -25,6 +25,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Calculation; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionInwards.Forms.Properties; @@ -62,7 +63,7 @@ var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var calculationMock = mockRepository.StrictMock(generalInput); + var calculationMock = mockRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()); var inputMock = mockRepository.StrictMock(generalInput); mockRepository.ReplayAll(); @@ -87,7 +88,7 @@ var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var calculationMock = mockRepository.StrictMock(generalInput); + var calculationMock = mockRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()); mockRepository.ReplayAll(); var input = new GrassCoverErosionInwardsInput(generalInput); @@ -112,7 +113,7 @@ var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var calculationMock = mockRepository.StrictMock(generalInput); + var calculationMock = mockRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()); mockRepository.ReplayAll(); var input = new GrassCoverErosionInwardsInput(generalInput); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationContextPropertiesTest.cs =================================================================== diff -u -rd2f9b4f26f69988ea1c55caaa58af0831152458f -r33efdf255d012f47a045c7f3181487e0453cf5e2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationContextPropertiesTest.cs (.../GrassCoverErosionInwardsCalculationContextPropertiesTest.cs) (revision d2f9b4f26f69988ea1c55caaa58af0831152458f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationContextPropertiesTest.cs (.../GrassCoverErosionInwardsCalculationContextPropertiesTest.cs) (revision 33efdf255d012f47a045c7f3181487e0453cf5e2) @@ -59,7 +59,7 @@ // Setup var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); - var calculationMock = mockRepository.StrictMock(new GeneralGrassCoverErosionInwardsInput()); + var calculationMock = mockRepository.StrictMock(new GeneralGrassCoverErosionInwardsInput(), new GeneralNormProbabilityInput()); mockRepository.ReplayAll(); var properties = new GrassCoverErosionInwardsCalculationContextProperties(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs =================================================================== diff -u -r4539b4546747c257739b1695b9ebc9c29e393ffe -r33efdf255d012f47a045c7f3181487e0453cf5e2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 4539b4546747c257739b1695b9ebc9c29e393ffe) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 33efdf255d012f47a045c7f3181487e0453cf5e2) @@ -27,6 +27,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Calculation; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses; @@ -63,7 +64,7 @@ var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var calculationMock = mockRepository.StrictMock(generalInput); + var calculationMock = mockRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()); mockRepository.ReplayAll(); var input = new GrassCoverErosionInwardsInput(generalInput); @@ -121,7 +122,7 @@ var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var calculationMock = mockRepository.StrictMock(generalInput); + var calculationMock = mockRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()); mockRepository.ReplayAll(); var input = new GrassCoverErosionInwardsInput(generalInput); @@ -153,7 +154,7 @@ var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var calculationMock = mockRepository.StrictMock(generalInput); + var calculationMock = mockRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()); var inputMock = mockRepository.StrictMock(generalInput); mockRepository.ReplayAll(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj =================================================================== diff -u -r07efb7c80815d1747386437cf8dcd6db25b9160a -r33efdf255d012f47a045c7f3181487e0453cf5e2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj) (revision 07efb7c80815d1747386437cf8dcd6db25b9160a) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj) (revision 33efdf255d012f47a045c7f3181487e0453cf5e2) @@ -142,6 +142,10 @@ {70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2} Ringtoets.HydraRing.Data + + {11F1F874-45AF-43E4-8AE5-15A5C9593E28} + Ringtoets.Integration.Data + {90DE728E-48EF-4665-AB38-3D88E41D9F4D} Ringtoets.GrassCoverErosionInwards.Data Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rd2f9b4f26f69988ea1c55caaa58af0831152458f -r33efdf255d012f47a045c7f3181487e0453cf5e2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision d2f9b4f26f69988ea1c55caaa58af0831152458f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 33efdf255d012f47a045c7f3181487e0453cf5e2) @@ -44,6 +44,7 @@ using Ringtoets.GrassCoverErosionInwards.Plugin; using Ringtoets.GrassCoverErosionInwards.Plugin.Properties; using Ringtoets.HydraRing.Data; +using Ringtoets.Integration.Data; using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -348,8 +349,8 @@ }; hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation); - var assessmentSectionMock = mocks.StrictMock(); - assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); + assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new GeneralNormProbabilityInput()) { @@ -360,7 +361,7 @@ } }; - var calculationContext = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock); + var calculationContext = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSection); gui.Expect(g => g.Get(calculationContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Expect(g => g.MainWindow).Return(mainWindow); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rd2f9b4f26f69988ea1c55caaa58af0831152458f -r33efdf255d012f47a045c7f3181487e0453cf5e2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision d2f9b4f26f69988ea1c55caaa58af0831152458f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 33efdf255d012f47a045c7f3181487e0453cf5e2) @@ -45,6 +45,7 @@ using Ringtoets.GrassCoverErosionInwards.Plugin; using Ringtoets.GrassCoverErosionInwards.Plugin.Properties; using Ringtoets.HydraRing.Data; +using Ringtoets.Integration.Data; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources; using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources; @@ -395,7 +396,7 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocksRepository.Stub(); + var assessmentSection = new AssessmentSection( AssessmentSectionComposition.Dike ); var hydraulicBoundaryDatabase = mocksRepository.Stub(); hydraulicBoundaryDatabase.FilePath = validFilePath; assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -reaa8b3e276e1a0a6a4d0a2f96016879d8d12d394 -r33efdf255d012f47a045c7f3181487e0453cf5e2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs) (revision eaa8b3e276e1a0a6a4d0a2f96016879d8d12d394) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs) (revision 33efdf255d012f47a045c7f3181487e0453cf5e2) @@ -27,6 +27,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Calculation; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionInwards.Plugin; @@ -79,7 +80,7 @@ var assessmentSection = mocksRepository.StrictMock(); var grassCoverErosionInwardsInputContext = new GrassCoverErosionInwardsInputContext( mocksRepository.StrictMock(generalInput), - mocksRepository.StrictMock(generalInput), + mocksRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()), new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); mocksRepository.ReplayAll(); @@ -100,7 +101,7 @@ var assessmentSection = mocksRepository.StrictMock(); var grassCoverErosionInwardsInputContext = new GrassCoverErosionInwardsInputContext( mocksRepository.StrictMock(generalInput), - mocksRepository.StrictMock(generalInput), + mocksRepository.StrictMock(generalInput, new GeneralNormProbabilityInput()), new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); mocksRepository.ReplayAll();