Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Ringtoets.DuneErosion.Plugin.Test.csproj
===================================================================
diff -u -ra248242529e2d1283b616d751ab5d90b387f70e1 -re63b47a8282dfc596cc2dbe89bd8ffb501b0b326
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Ringtoets.DuneErosion.Plugin.Test.csproj (.../Ringtoets.DuneErosion.Plugin.Test.csproj) (revision a248242529e2d1283b616d751ab5d90b387f70e1)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Ringtoets.DuneErosion.Plugin.Test.csproj (.../Ringtoets.DuneErosion.Plugin.Test.csproj) (revision e63b47a8282dfc596cc2dbe89bd8ffb501b0b326)
@@ -116,10 +116,6 @@
{74CBA865-9338-447F-BAD9-28312446AE84}
Ringtoets.HydraRing.Calculation.TestUtil
-
- {11F1F874-45AF-43E4-8AE5-15A5C9593E28}
- Ringtoets.Integration.Data
-
{D1068432-C172-4AA6-847B-D9DEB4C6DE26}
Ringtoets.DuneErosion.Data
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2adc344eb575ec0e768e102ab9574b4a7faa01cb -re63b47a8282dfc596cc2dbe89bd8ffb501b0b326
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision 2adc344eb575ec0e768e102ab9574b4a7faa01cb)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision e63b47a8282dfc596cc2dbe89bd8ffb501b0b326)
@@ -46,7 +46,6 @@
using Ringtoets.DuneErosion.Forms.PresentationObjects;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
-using Ringtoets.Integration.Data;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.DuneErosion.Plugin.Test.TreeNodeInfos
@@ -410,7 +409,7 @@
// Setup
var duneLocation = new TestDuneLocation("Test");
var failureMechanism = new DuneErosionFailureMechanism();
- var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dune);
+ var assessmentSection = new AssessmentSectionStub();
failureMechanism.SetDuneLocations(new[]
{
@@ -419,15 +418,13 @@
var failureMechanismContext = new DuneErosionFailureMechanismContext(failureMechanism, assessmentSection);
- var mocks = new MockRepository();
-
using (var treeViewControl = new TreeViewControl())
{
- var gui = mocks.Stub();
+ var gui = mocksRepository.Stub();
gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
gui.Stub(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
- mocks.ReplayAll();
+ mocksRepository.ReplayAll();
plugin.Gui = gui;
@@ -443,15 +440,13 @@
Assert.IsFalse(contextMenuItem.Enabled);
}
}
-
- mocks.VerifyAll();
}
[Test]
public void GivenValidCalculations_WhenCalculatingAllFromContextMenu_ThenAllCalculationsScheduled()
{
// Given
- var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dune)
+ var assessmentSection = new AssessmentSectionStub
{
HydraulicBoundaryDatabase =
{
@@ -472,25 +467,23 @@
var failureMechanismContext = new DuneErosionFailureMechanismContext(failureMechanism, assessmentSection);
- var mocks = new MockRepository();
-
using (var treeViewControl = new TreeViewControl())
{
- var gui = mocks.Stub();
- gui.Stub(g => g.MainWindow).Return(mocks.Stub());
+ var gui = mocksRepository.Stub();
+ gui.Stub(g => g.MainWindow).Return(mocksRepository.Stub());
gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
gui.Stub(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
- gui.Stub(g => g.DocumentViewController).Return(mocks.Stub());
+ gui.Stub(g => g.DocumentViewController).Return(mocksRepository.Stub());
- var calculatorFactory = mocks.Stub();
+ var calculatorFactory = mocksRepository.Stub();
var dunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator
{
Converged = false
};
calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(testDataPath, string.Empty)).Return(dunesBoundaryConditionsCalculator).Repeat.Times(5);
- mocks.ReplayAll();
+ mocksRepository.ReplayAll();
plugin.Gui = gui;
plugin.Activate();
@@ -521,8 +514,6 @@
});
}
}
-
- mocks.VerifyAll();
}
}
}
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2adc344eb575ec0e768e102ab9574b4a7faa01cb -re63b47a8282dfc596cc2dbe89bd8ffb501b0b326
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision 2adc344eb575ec0e768e102ab9574b4a7faa01cb)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision e63b47a8282dfc596cc2dbe89bd8ffb501b0b326)
@@ -42,7 +42,6 @@
using Ringtoets.DuneErosion.Forms.PresentationObjects;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
-using Ringtoets.Integration.Data;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.DuneErosion.Plugin.Test.TreeNodeInfos
@@ -354,11 +353,11 @@
{
// Setup
var failureMechanism = new DuneErosionFailureMechanism();
- var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dune)
+ var assessmentSection = new AssessmentSectionStub
{
HydraulicBoundaryDatabase =
{
- FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite")
+ FilePath = validFilePath
}
};
@@ -402,7 +401,7 @@
public void GivenValidCalculations_WhenCalculatingAllFromContextMenu_ThenAllCalculationsScheduled()
{
// Given
- var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dune)
+ var assessmentSection = new AssessmentSectionStub
{
HydraulicBoundaryDatabase =
{
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj
===================================================================
diff -u -rdf515d3faf8f4db7a4b3358ad9d69092e5e9a8e3 -re63b47a8282dfc596cc2dbe89bd8ffb501b0b326
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj) (revision df515d3faf8f4db7a4b3358ad9d69092e5e9a8e3)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj) (revision e63b47a8282dfc596cc2dbe89bd8ffb501b0b326)
@@ -149,10 +149,6 @@
{74CBA865-9338-447F-BAD9-28312446AE84}
Ringtoets.HydraRing.Calculation.TestUtil
-
- {11F1F874-45AF-43E4-8AE5-15A5C9593E28}
- Ringtoets.Integration.Data
-
{90DE728E-48EF-4665-AB38-3D88E41D9F4D}
Ringtoets.GrassCoverErosionInwards.Data
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs
===================================================================
diff -u -rd337718251f4330d447d555eb1c70df226dd9823 -re63b47a8282dfc596cc2dbe89bd8ffb501b0b326
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs (.../GrassCoverErosionInwardsOutputViewInfoTestBase.cs) (revision d337718251f4330d447d555eb1c70df226dd9823)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs (.../GrassCoverErosionInwardsOutputViewInfoTestBase.cs) (revision e63b47a8282dfc596cc2dbe89bd8ffb501b0b326)
@@ -25,15 +25,14 @@
using Core.Common.Gui.Plugin;
using Core.Common.TestUtil;
using NUnit.Framework;
-using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Common.Forms.PresentationObjects;
using Ringtoets.Common.Forms.Properties;
using Ringtoets.Common.Plugin.TestUtil;
using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
-using Ringtoets.Integration.Data;
namespace Ringtoets.GrassCoverErosionInwards.Plugin.Test.ViewInfos
{
@@ -132,7 +131,7 @@
return new GrassCoverErosionInwardsCalculationContext(new GrassCoverErosionInwardsCalculation(),
new CalculationGroup(),
new GrassCoverErosionInwardsFailureMechanism(),
- new AssessmentSection(AssessmentSectionComposition.Dike));
+ new AssessmentSectionStub());
}
protected override ICalculationContext GetCalculationGroupContextWithCalculation()
@@ -147,7 +146,7 @@
},
null,
new GrassCoverErosionInwardsFailureMechanism(),
- new AssessmentSection(AssessmentSectionComposition.Dike));
+ new AssessmentSectionStub());
}
protected override IFailureMechanismContext GetFailureMechanismContextWithCalculation()
@@ -163,7 +162,7 @@
}
}
},
- new AssessmentSection(AssessmentSectionComposition.Dike));
+ new AssessmentSectionStub());
}
}
}
\ No newline at end of file