Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -62,7 +62,7 @@
const string testId = "testId";
const string testName = "testName";
const string comments = "Some text";
- const int norm = int.MaxValue;
+ const double norm = 0.05;
int order = new Random(65).Next();
var assessmentSection = new AssessmentSection(assessmentSectionComposition)
{
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -62,7 +62,7 @@
const string testId = "testId";
const string testName = "testName";
const string comments = "Some text";
- const int norm = int.MaxValue;
+ const double norm = 0.05;
var entity = new AssessmentSectionEntity
{
Id = testId,
@@ -1016,7 +1016,7 @@
{
return new AssessmentSectionEntity
{
- Norm = 30000
+ Norm = 1.0/30000
};
}
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs
===================================================================
diff -u -r97018b4e8e9cd81438e8fd0d111d889e20946617 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -66,7 +66,7 @@
public void Read_WithAssessmentSection_ReturnsNewProjectWithAssessmentSections()
{
// Setup
- const int norm = 10000;
+ const double norm = 0.0001;
var entity = new ProjectEntity
{
Description = "testName",
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs
===================================================================
diff -u -recf136a787efcd5d3f171f8aee8930f84a89e80a -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision ecf136a787efcd5d3f171f8aee8930f84a89e80a)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -41,18 +41,20 @@
/// and one item is added with a value of
/// which represents the contribution of any other failure mechanisms.
///
- /// The of on which to base
- /// the .
+ /// The of
+ /// on which to base the .
/// The collective contribution for other failure mechanisms.
/// The norm defined on the assessment section.
/// Thrown when is null.
/// Thrown when:
///
- /// - any of the has a value for not in the interval [0, 100].
+ /// - any of the has a value for
+ /// not in the interval [0, 100].
/// - the value of is not in the interval [0, 100]
///
///
- /// Thrown when is not in the interval (0.0, 1.0) and is not .
+ /// Thrown when
+ /// is not in the interval [0.0, 1.0] or is .
public FailureMechanismContribution(IEnumerable failureMechanisms, double otherContribution, double norm)
{
Norm = norm;
@@ -62,7 +64,8 @@
///
/// Gets or sets the norm which has been defined on the assessment section.
///
- /// Thrown when the new value is lower than or equal to 0.
+ /// Thrown when the new value is not in
+ /// the interval [0.0, 1.0] or is .
public double Norm
{
get
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs
===================================================================
diff -u -recf136a787efcd5d3f171f8aee8930f84a89e80a -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision ecf136a787efcd5d3f171f8aee8930f84a89e80a)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -49,7 +49,7 @@
// Setup
var random = new Random(21);
var contribution = random.Next(1, 100);
- var norm = random.Next(1, int.MaxValue);
+ var norm = random.NextDouble();
// Call
TestDelegate test = () => new FailureMechanismContribution(null, contribution, norm);
@@ -65,7 +65,7 @@
// Setup
var random = new Random(21);
var contribution = random.Next(1, 100);
- var norm = random.Next(1, int.MaxValue);
+ var norm = random.NextDouble();
// Call
TestDelegate test = () => new FailureMechanismContribution(new IFailureMechanism[]
@@ -79,10 +79,8 @@
}
[Test]
- [TestCase(0)]
- [TestCase(-1)]
- [TestCase(-200)]
- public void Constructor_WithInvalidNorm_ThrowsArgumentOutOfRangeException(int norm)
+ public void Constructor_WithInvalidNorm_ThrowsArgumentOutOfRangeException(
+ [Values(-1e-6, -150)] double norm)
{
// Setup
var random = new Random(21);
@@ -105,13 +103,13 @@
{
// Setup
var random = new Random(21);
- var norm = random.Next(1, int.MaxValue);
+ var norm = random.NextDouble();
// Call
TestDelegate test = () => new FailureMechanismContribution(Enumerable.Empty(), contribution, norm);
// Assert
- var expectedMessage = Resources.Contribution_Value_should_be_in_interval_0_100;
+ const string expectedMessage = "De waarde voor de toegestane bijdrage aan de faalkans moet in het bereik [0, 100] liggen.";
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage);
}
@@ -123,7 +121,7 @@
{
// Setup
var random = new Random(21);
- var norm = random.Next(1, int.MaxValue);
+ var norm = random.NextDouble();
// Call
var result = new FailureMechanismContribution(Enumerable.Empty(), contribution, norm);
@@ -149,7 +147,7 @@
// Setup
var random = new Random(21);
var otherContribution = random.Next(1, 100);
- var norm = random.Next(1, int.MaxValue);
+ var norm = random.NextDouble();
var failureMechanismNames = new Collection();
var failureMechanismContributions = new Collection();
@@ -199,7 +197,7 @@
// Setup
IEnumerable failureMechanisms = Enumerable.Empty();
- const int norm = 30000;
+ const double norm = 1.0/30000;
var failureMechanismContribution = new FailureMechanismContribution(failureMechanisms, 12.34, norm);
// Call
@@ -244,7 +242,7 @@
failureMechanism2
};
- const int norm = 30000;
+ const double norm = 1.0/30000;
const double otherContribution = 12.34;
var failureMechanismContribution = new FailureMechanismContribution(failureMechanisms, otherContribution, norm);
@@ -303,7 +301,7 @@
var random = new Random(21);
var otherContribution = random.Next(1, 100);
const double norm = 1.0/20000;
- const double newNorm = 1.0 / 30000;
+ const double newNorm = 1.0/30000;
var failureMechanism = mockRepository.Stub();
@@ -322,7 +320,7 @@
mockRepository.VerifyAll();
}
- private static void AssertFailureProbabilitySpace(double newOtherContribution, int norm, double probabilitySpace)
+ private static void AssertFailureProbabilitySpace(double newOtherContribution, double norm, double probabilitySpace)
{
double expectedProbabilitySpace = (1.0/norm/newOtherContribution)*100.0;
Assert.AreEqual(expectedProbabilitySpace, probabilitySpace);
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs
===================================================================
diff -u -r1d64c85fa6d013812d3f38fa09ae4e7ec82480fe -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs (.../AssessmentSectionHelperTest.cs) (revision 1d64c85fa6d013812d3f38fa09ae4e7ec82480fe)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs (.../AssessmentSectionHelperTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -52,6 +52,11 @@
Assert.AreEqual(1300001, hydraulicBoundaryLocation.Id);
Assert.AreEqual(string.Empty, hydraulicBoundaryLocation.Name);
Assert.AreEqual(new Point2D(0, 0), hydraulicBoundaryLocation.Location);
+ CollectionAssert.AreEqual(new[]
+ {
+ failureMechanism
+ }, assessmentSectionStub.GetFailureMechanisms());
+ Assert.AreEqual(0.5, assessmentSectionStub.FailureMechanismContribution.Norm);
mocks.VerifyAll();
}
@@ -78,6 +83,11 @@
Assert.AreEqual(1300001, hydraulicBoundaryLocation.Id);
Assert.AreEqual(string.Empty, hydraulicBoundaryLocation.Name);
Assert.AreEqual(new Point2D(0, 0), hydraulicBoundaryLocation.Location);
+ CollectionAssert.AreEqual(new[]
+ {
+ failureMechanism
+ }, assessmentSectionStub.GetFailureMechanisms());
+ Assert.AreEqual(0.5, assessmentSectionStub.FailureMechanismContribution.Norm);
mocks.VerifyAll();
}
@@ -95,7 +105,30 @@
Assert.IsNotNull(assessmentSectionStub);
Assert.AreEqual("21", assessmentSectionStub.Id);
Assert.IsNull(assessmentSectionStub.HydraulicBoundaryDatabase);
+ CollectionAssert.AreEqual(new[]
+ {
+ failureMechanism
+ }, assessmentSectionStub.GetFailureMechanisms());
+ Assert.AreEqual(0.5, assessmentSectionStub.FailureMechanismContribution.Norm);
mocks.VerifyAll();
}
+
+ [Test]
+ public void CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms_ReturnsStubbedAssessmentSectionWithoutHRDOrFailureMechanisms()
+ {
+ var mocks = new MockRepository();
+
+ // Call
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(mocks);
+ mocks.ReplayAll();
+
+ // Assert
+ Assert.IsNotNull(assessmentSectionStub);
+ Assert.AreEqual("21", assessmentSectionStub.Id);
+ Assert.IsNull(assessmentSectionStub.HydraulicBoundaryDatabase);
+ CollectionAssert.IsEmpty(assessmentSectionStub.GetFailureMechanisms());
+ Assert.AreEqual(0.5, assessmentSectionStub.FailureMechanismContribution.Norm);
+ mocks.VerifyAll();
+ }
}
}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs
===================================================================
diff -u -r1d64c85fa6d013812d3f38fa09ae4e7ec82480fe -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs (.../AssessmentSectionHelper.cs) (revision 1d64c85fa6d013812d3f38fa09ae4e7ec82480fe)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs (.../AssessmentSectionHelper.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -19,6 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System.Linq;
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Contribution;
@@ -33,6 +34,17 @@
public static class AssessmentSectionHelper
{
///
+ /// Creates a stub of without
+ /// or set.
+ ///
+ /// The mock repository to create the stub with.
+ /// A stubbed .
+ public static IAssessmentSection CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(MockRepository mockRepository)
+ {
+ return CreateAssessmentSectionStub(null, mockRepository, false, null);
+ }
+
+ ///
/// Creates a stub of without the set.
///
/// The failure mechanism to set the contribution for.
@@ -63,12 +75,18 @@
bool addBoundaryDatabase,
string filePath)
{
+ var failureMechanisms = failureMechanism == null
+ ? Enumerable.Empty().ToArray()
+ : new[]
+ {
+ failureMechanism
+ };
+
var assessmentSectionStub = mockRepository.Stub();
assessmentSectionStub.Stub(a => a.Id).Return("21");
- assessmentSectionStub.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(new[]
- {
- failureMechanism
- }, 1, 2));
+ assessmentSectionStub.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(
+ failureMechanisms, 1, 0.5));
+ assessmentSectionStub.Stub(a => a.GetFailureMechanisms()).Return(failureMechanisms);
if (addBoundaryDatabase)
{
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs
===================================================================
diff -u -r18a3f0bab0ce260604820928c136e66abca7daab -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs (.../FailureMechanismContributionContextTest.cs) (revision 18a3f0bab0ce260604820928c136e66abca7daab)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs (.../FailureMechanismContributionContextTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -35,15 +35,15 @@
public class FailureMechanismContributionContextTest
{
[Test]
- public void Contructor_ExpectedValues()
+ public void Constructor_ExpectedValues()
{
// Setup
var mocks = new MockRepository();
var assessmentSectionMock = mocks.StrictMock();
mocks.ReplayAll();
var failureMechanisms = Enumerable.Empty();
- var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 30000);
+ var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 1.0/30000);
// Call
var context = new FailureMechanismContributionContext(contribution, assessmentSectionMock);
@@ -56,11 +56,11 @@
}
[Test]
- public void Contructor_AssessmentSectionIsNull_ThrowArgumentNullException()
+ public void Constructor_AssessmentSectionIsNull_ThrowArgumentNullException()
{
// Setup
var failureMechanisms = Enumerable.Empty();
- var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 30000);
+ var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 1.0/30000);
// Call
TestDelegate call = () => new FailureMechanismContributionContext(contribution, null);
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs
===================================================================
diff -u -r230a4c55f64ec075d4685b046d7e95e4b3e84e25 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision 230a4c55f64ec075d4685b046d7e95e4b3e84e25)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -74,7 +74,7 @@
throw new ArgumentException(Resources.GrassCoverErosionOutwardsFailureMechanismExtensions_GetMechanismSpecificNorm_Contribution_is_zero);
}
- return assessmentSection.FailureMechanismContribution.Norm/
+ return 1.0/assessmentSection.FailureMechanismContribution.Norm/
(failureMechanism.Contribution/100)*
failureMechanism.GeneralInput.N;
}
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs
===================================================================
diff -u -r230a4c55f64ec075d4685b046d7e95e4b3e84e25 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision 230a4c55f64ec075d4685b046d7e95e4b3e84e25)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -118,7 +118,7 @@
assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(new[]
{
failureMechanism
- }, 1, 300));
+ }, 1, 1.0/300));
mocks.ReplayAll();
// Call
@@ -146,7 +146,7 @@
assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(new[]
{
failureMechanism
- }, 1, 300));
+ }, 1, 1.0/300));
mocks.ReplayAll();
// Call
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -37,8 +37,6 @@
using NUnit.Framework;
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Contribution;
-using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.TestUtil;
using Ringtoets.GrassCoverErosionOutwards.Data;
using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
@@ -47,6 +45,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.HydraRing.Data;
+using Ringtoets.HydraRing.Data.TestUtil;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
@@ -331,32 +330,17 @@
string filePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite");
var guiMock = mockRepository.DynamicMock();
- var location = new HydraulicBoundaryLocation(1, "HydraulicBoundaryLocation", 1.1, 2.2);
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
{
Contribution = 1
};
- var assessmentSectionMock = mockRepository.Stub();
- assessmentSectionMock.Stub(a => a.Id).Return("Id");
- assessmentSectionMock.Stub(a => a.GetFailureMechanisms()).Return(new[]
- {
- failureMechanism
- });
- assessmentSectionMock.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 1, 300));
- assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = filePath,
- Locations =
- {
- location
- }
- };
- var grassCoverErosionOutwardsHydraulicBoundaryLocation = location;
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, filePath);
+ HydraulicBoundaryLocation grassCoverErosionOutwardsHydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First();
var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(new ObservableList
{
grassCoverErosionOutwardsHydraulicBoundaryLocation
- }, assessmentSectionMock, failureMechanism);
+ }, assessmentSectionStub, failureMechanism);
var observer = mockRepository.StrictMock();
context.Attach(observer);
@@ -387,10 +371,10 @@
var designWaterLevelCalculationInput = testDesignWaterLevelCalculator.ReceivedInputs.First();
Assert.AreEqual(testDataPath, testDesignWaterLevelCalculator.HydraulicBoundaryDatabaseDirectory);
- Assert.AreEqual(assessmentSectionMock.Id, testDesignWaterLevelCalculator.RingId);
+ Assert.AreEqual(assessmentSectionStub.Id, testDesignWaterLevelCalculator.RingId);
Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, designWaterLevelCalculationInput.HydraulicBoundaryLocationId);
- var expectedReturnPeriod = assessmentSectionMock.FailureMechanismContribution.Norm/
+ var expectedReturnPeriod = 1.0/assessmentSectionStub.FailureMechanismContribution.Norm/
(failureMechanism.Contribution/100)*
failureMechanism.GeneralInput.N;
Assert.AreEqual(StatisticsConverter.ReturnPeriodToReliability(expectedReturnPeriod), designWaterLevelCalculationInput.Beta);
@@ -407,37 +391,28 @@
// Given
var guiMock = mockRepository.DynamicMock();
RoundedDouble designWaterLevel = (RoundedDouble) 4.2;
+ string filePath = "D:/nonExistingDirectory/nonExistingFile";
- var hydraulicBoundaryLocation1 = new HydraulicBoundaryLocation(100001, "", 1.1, 2.2);
- var hydraulicBoundaryLocation2 = new HydraulicBoundaryLocation(100002, "", 3.3, 4.4);
- var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = "D:/nonExistingDirectory/nonExistingFile"
- };
-
- var assessmentSectionMock = mockRepository.Stub();
- assessmentSectionMock.Expect(a => a.Id).Return("Id");
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
{
Contribution = 1
};
- assessmentSectionMock
- .Expect(a => a.FailureMechanismContribution)
- .Return(new FailureMechanismContribution(Enumerable.Empty(), 1, 5));
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mockRepository, filePath);
- assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
- var grassCoverErosionOutwardsHydraulicBoundaryLocation1 = hydraulicBoundaryLocation1;
- var grassCoverErosionOutwardsHydraulicBoundaryLocation2 = hydraulicBoundaryLocation2;
- grassCoverErosionOutwardsHydraulicBoundaryLocation2.DesignWaterLevel = designWaterLevel;
+ HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSectionStub.HydraulicBoundaryDatabase;
+ hydraulicBoundaryDatabase.Locations.Add(new TestHydraulicBoundaryLocation(designWaterLevel));
+ var grassCoverErosionOutwardsHydraulicBoundaryLocation1 = hydraulicBoundaryDatabase.Locations[0];
+ var grassCoverErosionOutwardsHydraulicBoundaryLocation2 = hydraulicBoundaryDatabase.Locations[1];
var grassCoverErosionOutwardsHydraulicBoundaryLocations = new ObservableList
{
grassCoverErosionOutwardsHydraulicBoundaryLocation1,
grassCoverErosionOutwardsHydraulicBoundaryLocation2
};
var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(
grassCoverErosionOutwardsHydraulicBoundaryLocations,
- assessmentSectionMock,
+ assessmentSectionStub,
failureMechanism);
using (var treeViewControl = new TreeViewControl())
@@ -459,7 +434,7 @@
// Then
string message = string.Format("Berekeningen konden niet worden gestart. Fout bij het lezen van bestand '{0}': het bestand bestaat niet.",
- hydraulicBoundaryDatabase.FilePath);
+ filePath);
TestHelper.AssertLogMessageWithLevelIsGenerated(action, new Tuple(message, LogLevelConstant.Error));
Assert.IsNaN(grassCoverErosionOutwardsHydraulicBoundaryLocation1.DesignWaterLevel); // No result set
@@ -479,28 +454,18 @@
{
// Given
var guiMock = mockRepository.DynamicMock();
- var location = new HydraulicBoundaryLocation(1, "HydraulicBoundaryLocation", 1.1, 2.2);
- var assessmentSectionMock = mockRepository.Stub();
- assessmentSectionMock.Expect(a => a.Id).Return("Id");
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
{
Contribution = 1
};
- assessmentSectionMock.Expect(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 1, 300));
- assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"),
- Locations =
- {
- location
- }
- };
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mockRepository, Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"));
- var grassCoverErosionOutwardsHydraulicBoundaryLocation = location;
+ var hydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations[0];
var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(new ObservableList
{
- grassCoverErosionOutwardsHydraulicBoundaryLocation
- }, assessmentSectionMock, failureMechanism);
+ hydraulicBoundaryLocation
+ }, assessmentSectionStub, failureMechanism);
using (var treeViewControl = new TreeViewControl())
{
@@ -525,16 +490,24 @@
{
var msgs = messages.ToArray();
Assert.AreEqual(7, msgs.Length);
- StringAssert.StartsWith(string.Format("Validatie van 'Waterstand bij doorsnede-eis voor locatie '{0}'' gestart om: ", location.Name), msgs[0]);
- StringAssert.StartsWith(string.Format("Validatie van 'Waterstand bij doorsnede-eis voor locatie '{0}'' beëindigd om: ", location.Name), msgs[1]);
- StringAssert.StartsWith(string.Format("Berekening van 'Waterstand bij doorsnede-eis voor locatie '{0}'' gestart om: ", location.Name), msgs[2]);
- Assert.AreEqual(string.Format("Waterstand bij doorsnede-eis berekening voor locatie '{0}' is niet geconvergeerd.", location.Name), msgs[3]);
- StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie", msgs[4]);
- StringAssert.StartsWith(string.Format("Berekening van 'Waterstand bij doorsnede-eis voor locatie '{0}'' beëindigd om: ", location.Name), msgs[5]);
- StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is gelukt.", location.Name), msgs[6]);
+ StringAssert.StartsWith(string.Format("Validatie van 'Waterstand bij doorsnede-eis voor locatie '{0}'' gestart om: ",
+ hydraulicBoundaryLocation.Name), msgs[0]);
+ StringAssert.StartsWith(string.Format("Validatie van 'Waterstand bij doorsnede-eis voor locatie '{0}'' beëindigd om: ",
+ hydraulicBoundaryLocation.Name), msgs[1]);
+ StringAssert.StartsWith(string.Format("Berekening van 'Waterstand bij doorsnede-eis voor locatie '{0}'' gestart om: ",
+ hydraulicBoundaryLocation.Name), msgs[2]);
+ Assert.AreEqual(string.Format("Waterstand bij doorsnede-eis berekening voor locatie '{0}' is niet geconvergeerd.",
+ hydraulicBoundaryLocation.Name), msgs[3]);
+ StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie",
+ msgs[4]);
+ StringAssert.StartsWith(string.Format("Berekening van 'Waterstand bij doorsnede-eis voor locatie '{0}'' beëindigd om: ",
+ hydraulicBoundaryLocation.Name), msgs[5]);
+ StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is gelukt.",
+ hydraulicBoundaryLocation.Name), msgs[6]);
});
- Assert.AreEqual(0, grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevel, grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevel.GetAccuracy());
- Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence);
+ Assert.AreEqual(0, hydraulicBoundaryLocation.DesignWaterLevel,
+ hydraulicBoundaryLocation.DesignWaterLevel.GetAccuracy());
+ Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence);
}
}
}
@@ -545,30 +518,19 @@
public void CalculateDesignWaterLevelsFromContextMenu_ContributionZero_DoesNotCalculateAndLog()
{
// Setup
- string filePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite");
-
var guiMock = mockRepository.DynamicMock();
- var location = new HydraulicBoundaryLocation(1, "HydraulicBoundaryLocation", 1.1, 2.2);
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
{
Contribution = 0
};
- var assessmentSectionMock = mockRepository.Stub();
- assessmentSectionMock.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 1, 300));
- assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = filePath,
- Locations =
- {
- location
- }
- };
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mockRepository, Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"));
- var grassCoverErosionOutwardsHydraulicBoundaryLocation = location;
+ var grassCoverErosionOutwardsHydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations[0];
var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(new ObservableList
{
grassCoverErosionOutwardsHydraulicBoundaryLocation
- }, assessmentSectionMock, failureMechanism);
+ }, assessmentSectionStub, failureMechanism);
var contextObserverMock = mockRepository.StrictMock();
context.Attach(contextObserverMock);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -38,9 +38,7 @@
using Rhino.Mocks;
using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Contribution;
using Ringtoets.Common.Data.DikeProfiles;
-using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.TestUtil;
using Ringtoets.GrassCoverErosionOutwards.Data;
using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
@@ -627,14 +625,8 @@
Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite"));
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = validHydroDatabasePath
- };
- assessmentSection.Stub(a => a.Id).Return("someId");
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 100, 20));
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, validHydroDatabasePath);
var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
{
@@ -657,7 +649,7 @@
var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
using (var treeViewControl = new TreeViewControl())
{
@@ -830,20 +822,14 @@
{
Contribution = 10
};
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = validHydroDatabasePath
- };
- assessmentSection.Stub(a => a.Id).Return("someId");
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 100, 20));
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, validHydroDatabasePath);
var calculation = GetValidCalculation();
calculation.Name = "A";
var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
DialogBoxHandler = (name, wnd) =>
{
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r54fd939cf2a3d8f718dad28faa24373334d4cc2e -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 54fd939cf2a3d8f718dad28faa24373334d4cc2e)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -38,8 +38,6 @@
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.Contribution;
-using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.TestUtil;
using Ringtoets.GrassCoverErosionOutwards.Data;
using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
@@ -648,14 +646,6 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
-
var calculationA = new GrassCoverErosionOutwardsWaveConditionsCalculation
{
Name = "A",
@@ -697,12 +687,16 @@
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
+
var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -740,15 +734,6 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
-
var observerA = mocks.StrictMock();
observerA.Expect(o => o.UpdateObserver());
var observerB = mocks.StrictMock();
@@ -767,12 +752,16 @@
Contribution = 10
};
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
+
var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -823,25 +812,19 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
-
- var group = new CalculationGroup();
-
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
+ var group = new CalculationGroup();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
+
var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -875,15 +858,6 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
-
var group = new CalculationGroup();
var calculationA = GetValidCalculation();
var calculationB = GetValidCalculation();
@@ -892,12 +866,16 @@
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
+
var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -933,15 +911,6 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
-
var observerA = mocks.StrictMock();
var observerB = mocks.StrictMock();
if (confirm)
@@ -962,12 +931,16 @@
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
+
var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -36,8 +36,7 @@
using NUnit.Framework;
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Contribution;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.GrassCoverErosionOutwards.Data;
using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
using Ringtoets.GrassCoverErosionOutwards.Forms.Properties;
@@ -312,31 +311,18 @@
{
// Given
var guiMock = mockRepository.DynamicMock();
- var location = new HydraulicBoundaryLocation(1, "HydraulicBoundaryLocation", 1.1, 2.2);
- var assessmentSectionMock = mockRepository.Stub();
- assessmentSectionMock.Expect(a => a.Id).Return("Id");
- assessmentSectionMock.Expect(a => a.GetFailureMechanisms()).Return(new[]
+ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
{
- new GrassCoverErosionOutwardsFailureMechanism
- {
- Contribution = 1
- }
- });
- assessmentSectionMock.Expect(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 1, 300));
- assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"),
- Locations =
- {
- location
- }
+ Contribution = 1
};
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mockRepository, Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"));
- var grassCoverErosionOutwardsHydraulicBoundaryLocation = location;
+ var grassCoverErosionOutwardsHydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations[0];
var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(new ObservableList
{
grassCoverErosionOutwardsHydraulicBoundaryLocation
- }, assessmentSectionMock, new GrassCoverErosionOutwardsFailureMechanism());
+ }, assessmentSectionStub, new GrassCoverErosionOutwardsFailureMechanism());
using (var treeViewControl = new TreeViewControl())
{
@@ -371,35 +357,19 @@
public void CalculateWaveHeightsFromContextMenu_Always_SendsRightInputToCalculationService()
{
// Setup
- string filePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite");
-
var guiMock = mockRepository.DynamicMock();
- var location = new HydraulicBoundaryLocation(1, "HydraulicBoundaryLocation", 1.1, 2.2);
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
{
Contribution = 1
};
- var assessmentSectionMock = mockRepository.Stub();
- assessmentSectionMock.Stub(a => a.Id).Return("Id");
- assessmentSectionMock.Stub(a => a.GetFailureMechanisms()).Return(new[]
- {
- failureMechanism
- });
- assessmentSectionMock.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 1, 300));
- assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = filePath,
- Locations =
- {
- location
- }
- };
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mockRepository, Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"));
- var grassCoverErosionOutwardsHydraulicBoundaryLocation = location;
+ var grassCoverErosionOutwardsHydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations[0];
var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(new ObservableList
{
grassCoverErosionOutwardsHydraulicBoundaryLocation
- }, assessmentSectionMock, new GrassCoverErosionOutwardsFailureMechanism());
+ }, assessmentSectionStub, new GrassCoverErosionOutwardsFailureMechanism());
var observer = mockRepository.StrictMock();
context.Attach(observer);
@@ -430,10 +400,10 @@
var waveHeightCalculationInput = testWaveHeightCalculator.ReceivedInputs.First();
Assert.AreEqual(testDataPath, testWaveHeightCalculator.HydraulicBoundaryDatabaseDirectory);
- Assert.AreEqual(assessmentSectionMock.Id, testWaveHeightCalculator.RingId);
+ Assert.AreEqual(assessmentSectionStub.Id, testWaveHeightCalculator.RingId);
Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, waveHeightCalculationInput.HydraulicBoundaryLocationId);
- var expectedReturnPeriod = assessmentSectionMock.FailureMechanismContribution.Norm/
+ var expectedReturnPeriod = 1.0/assessmentSectionStub.FailureMechanismContribution.Norm/
(failureMechanism.Contribution/100)*
failureMechanism.GeneralInput.N;
Assert.AreEqual(StatisticsConverter.ReturnPeriodToReliability(expectedReturnPeriod), waveHeightCalculationInput.Beta);
@@ -447,34 +417,19 @@
public void CalculateWaveHeightsFromContextMenu_ContributionZero_DoesNotCalculateAndLog()
{
// Setup
- string filePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite");
-
var guiMock = mockRepository.DynamicMock();
- var location = new HydraulicBoundaryLocation(1, "HydraulicBoundaryLocation", 1.1, 2.2);
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
{
Contribution = 0
};
- var assessmentSectionMock = mockRepository.Stub();
- assessmentSectionMock.Stub(a => a.GetFailureMechanisms()).Return(new[]
- {
- failureMechanism
- });
- assessmentSectionMock.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 1, 300));
- assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = filePath,
- Locations =
- {
- location
- }
- };
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mockRepository, Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"));
- var grassCoverErosionOutwardsHydraulicBoundaryLocation = location;
+ var grassCoverErosionOutwardsHydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations[0];
var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(new ObservableList
{
grassCoverErosionOutwardsHydraulicBoundaryLocation
- }, assessmentSectionMock, new GrassCoverErosionOutwardsFailureMechanism());
+ }, assessmentSectionStub, new GrassCoverErosionOutwardsFailureMechanism());
var contextObserverMock = mockRepository.StrictMock();
context.Attach(contextObserverMock);
@@ -499,7 +454,7 @@
// Assert
TestHelper.AssertLogMessageIsGenerated(action, "De bijdrage van dit toetsspoor is nul. Daardoor is de doorsnede-eis onbepaald en kunnen de berekeningen niet worden uitgevoerd.");
- Assert.IsNaN(location.WaveHeight);
+ Assert.IsNaN(grassCoverErosionOutwardsHydraulicBoundaryLocation.WaveHeight);
}
}
}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs
===================================================================
diff -u -r74d6d66cabf1b53c7b1d485efb53a940752eb070 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs (.../AssessmentSectionFromFileCommandHandler.cs) (revision 74d6d66cabf1b53c7b1d485efb53a940752eb070)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs (.../AssessmentSectionFromFileCommandHandler.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -192,17 +192,20 @@
assessmentSection.ReferenceLine = selectedItem.ReferenceLine;
}
- if (norm.HasValue)
+ if (!norm.HasValue || norm.Value == 0)
{
- try
- {
- assessmentSection.FailureMechanismContribution.Norm = norm.Value;
- }
- catch (ArgumentOutOfRangeException exception)
- {
- log.Warn(string.Format(Resources.AssessmentSectionFromFileCommandHandler_CreateAssessmentSection_Unable_to_set_Value_0, norm.Value), exception);
- }
+ log.Warn(string.Format(Resources.AssessmentSectionFromFileCommandHandler_CreateAssessmentSection_Unable_to_set_Value_0, 0));
+ return assessmentSection;
}
+
+ try
+ {
+ assessmentSection.FailureMechanismContribution.Norm = 1.0/norm.Value;
+ }
+ catch (ArgumentOutOfRangeException exception)
+ {
+ log.Warn(string.Format(Resources.AssessmentSectionFromFileCommandHandler_CreateAssessmentSection_Unable_to_set_Value_0, norm.Value), exception);
+ }
return assessmentSection;
}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -recf136a787efcd5d3f171f8aee8930f84a89e80a -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs (.../FailureMechanismContributionView.cs) (revision ecf136a787efcd5d3f171f8aee8930f84a89e80a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs (.../FailureMechanismContributionView.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -419,8 +419,8 @@
private void NormNumericUpDown_Validating(object sender, CancelEventArgs e)
{
- var returnPeriod = 1.0/assessmentSection.FailureMechanismContribution.Norm;
- if (Convert.ToInt32(normInput.Value) != Convert.ToInt32(returnPeriod))
+ int returnPeriod = Convert.ToInt32(normInput.Value);
+ if (returnPeriod != 0 && assessmentSection.FailureMechanismContribution.Norm.CompareTo(1.0/returnPeriod) != 0)
{
if (!changeHandler.ConfirmNormChange())
{
@@ -432,7 +432,7 @@
private void NormNumericUpDown_Validated(object sender, EventArgs e)
{
- int newNormValue = Convert.ToInt32(normInput.Value);
+ double newNormValue = 1.0/Convert.ToInt32(normInput.Value);
IEnumerable changedObjects = changeHandler.ChangeNorm(assessmentSection, newNormValue);
foreach (IObservable changedObject in changedObjects)
{
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/IFailureMechanismContributionNormChangeHandler.cs
===================================================================
diff -u -r1ecce87531e75e9bf509ad7fb8bfbe05c627570d -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/IFailureMechanismContributionNormChangeHandler.cs (.../IFailureMechanismContributionNormChangeHandler.cs) (revision 1ecce87531e75e9bf509ad7fb8bfbe05c627570d)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/IFailureMechanismContributionNormChangeHandler.cs (.../IFailureMechanismContributionNormChangeHandler.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -52,6 +52,6 @@
/// is null.
/// Thrown when
/// is an invalid norm value.
- IEnumerable ChangeNorm(IAssessmentSection assessmentSection, int newNormValue);
+ IEnumerable ChangeNorm(IAssessmentSection assessmentSection, double newNormValue);
}
}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs
===================================================================
diff -u -recf136a787efcd5d3f171f8aee8930f84a89e80a -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision ecf136a787efcd5d3f171f8aee8930f84a89e80a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -52,20 +52,17 @@
return result == DialogResult.OK;
}
- public IEnumerable ChangeNorm(IAssessmentSection assessmentSection, int newNormValue)
+ public IEnumerable ChangeNorm(IAssessmentSection assessmentSection, double newNormValue)
{
if (assessmentSection == null)
{
throw new ArgumentNullException("assessmentSection");
}
var changedObjects = new List();
- var returnPeriod = Convert.ToInt32(1/assessmentSection.FailureMechanismContribution.Norm);
- if (returnPeriod != newNormValue)
+ if (assessmentSection.FailureMechanismContribution.Norm.CompareTo(newNormValue) != 0)
{
- assessmentSection.FailureMechanismContribution.Norm = newNormValue == 0
- ? newNormValue
- : 1.0/newNormValue;
+ assessmentSection.FailureMechanismContribution.Norm = newNormValue;
changedObjects.AddRange(ClearAllNormDependentCalculationOutput(assessmentSection));
changedObjects.Add(assessmentSection.FailureMechanismContribution);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs
===================================================================
diff -u -r0be8a14b7c545ae5a07d1da6a0fa70829323b0f2 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs (.../AssessmentSectionFromFileCommandHandlerTest.cs) (revision 0be8a14b7c545ae5a07d1da6a0fa70829323b0f2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs (.../AssessmentSectionFromFileCommandHandlerTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -529,7 +529,7 @@
Name = "Traject 1-2",
FailureMechanismContribution =
{
- Norm = (useSignalingValue) ? 3000 : 1000
+ Norm = (useSignalingValue) ? 1.0/3000 : 1.0/1000
}
};
assessmentSection.GrassCoverErosionInwards.GeneralInput.N = 2;
@@ -560,7 +560,7 @@
Name = "Traject 2-1",
FailureMechanismContribution =
{
- Norm = 300
+ Norm = 1.0/300
},
ReferenceLine = referenceLine,
GrassCoverErosionInwards =
@@ -597,7 +597,7 @@
Name = "Traject 3-3",
FailureMechanismContribution =
{
- Norm = 300
+ Norm = 1.0/300
}
};
assessmentSection.ReferenceLine = new ReferenceLine();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs
===================================================================
diff -u -recf136a787efcd5d3f171f8aee8930f84a89e80a -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs (.../FailureMechanismContributionViewIntegrationTest.cs) (revision ecf136a787efcd5d3f171f8aee8930f84a89e80a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs (.../FailureMechanismContributionViewIntegrationTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -193,7 +193,7 @@
Assert.AreEqual(string.Format(messageCalculationsremoved, numberOfCalculations), messages[0]);
Assert.AreEqual(messageAllHydraulicBoundaryLocationOutputCleared, messages[1]);
});
- Assert.AreEqual(normValue, Convert.ToInt32(1.0/failureMechanismContribution.Norm));
+ Assert.AreEqual(1.0/normValue, failureMechanismContribution.Norm);
Assert.IsNaN(hydraulicBoundaryLocation.WaveHeight);
Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel);
Assert.IsNaN(grassCoverErosionOutwardsHydraulicBoundaryLocation.WaveHeight);
@@ -285,7 +285,7 @@
// Assert
TestHelper.AssertLogMessageIsGenerated(call, messageAllHydraulicBoundaryLocationOutputCleared, 1);
- Assert.AreEqual(normValue, Convert.ToInt32(1.0/failureMechanismContribution.Norm));
+ Assert.AreEqual(1.0/normValue, failureMechanismContribution.Norm);
Assert.IsNaN(hydraulicBoundaryLocation.WaveHeight);
Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel);
}
@@ -397,7 +397,7 @@
numberOfCalculations);
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
- Assert.AreEqual(normValue, Convert.ToInt32(1.0/failureMechanismContribution.Norm));
+ Assert.AreEqual(1.0/normValue, failureMechanismContribution.Norm);
Assert.IsNull(pipingCalculation.Output);
Assert.IsNull(pipingCalculation.SemiProbabilisticOutput);
Assert.IsNull(grassCoverErosionInwardsCalculation.Output);
@@ -503,7 +503,7 @@
numberOfCalculations);
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
- Assert.AreEqual(normValue, Convert.ToInt32(1.0/failureMechanismContribution.Norm));
+ Assert.AreEqual(1.0/normValue, failureMechanismContribution.Norm);
Assert.IsNull(pipingCalculation.Output);
Assert.IsNull(pipingCalculation.SemiProbabilisticOutput);
Assert.IsNull(grassCoverErosionInwardsCalculation.Output);
@@ -578,7 +578,7 @@
// Assert
TestHelper.AssertLogMessagesCount(call, 0);
- Assert.AreEqual(normValue, Convert.ToInt32(1.0/failureMechanismContribution.Norm));
+ Assert.AreEqual(1.0/normValue, failureMechanismContribution.Norm);
}
mockRepository.VerifyAll(); // No update observer expected.
}
@@ -641,7 +641,7 @@
// Assert
TestHelper.AssertLogMessagesCount(call, 0);
- Assert.AreEqual(normValue, Convert.ToInt32(1.0/failureMechanismContribution.Norm));
+ Assert.AreEqual(1.0/normValue, failureMechanismContribution.Norm);
}
mockRepository.VerifyAll(); // No update observer expected.
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs (.../FailureMechanismContributionContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs (.../FailureMechanismContributionContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -31,8 +31,6 @@
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Forms.PresentationObjects;
using Ringtoets.Integration.Plugin;
-using RingtoetsIntegrationFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
-using RingtoetsIntegrationDataResources = Ringtoets.Integration.Data.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.Integration.Forms.Test.TreeNodeInfos
@@ -92,7 +90,7 @@
var text = info.Text(null);
// Assert
- Assert.AreEqual(RingtoetsIntegrationDataResources.FailureMechanismContribution_DisplayName, text);
+ Assert.AreEqual("Faalkansbegroting", text);
}
mocks.VerifyAll();
}
@@ -120,7 +118,7 @@
public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
{
// Setup
- var contribution = new FailureMechanismContribution(Enumerable.Empty(), 100.0, 150000);
+ var contribution = new FailureMechanismContribution(Enumerable.Empty(), 100.0, 1.0/150000);
var assessmentSection = mocks.Stub();
var context = new FailureMechanismContributionContext(contribution, assessmentSection);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -351,7 +351,7 @@
{
public TestAssessmentSection()
{
- FailureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty(), 0, 300000);
+ FailureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty(), 0, 1.0/300000);
}
public Comment Comments { get; private set; }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs
===================================================================
diff -u -recf136a787efcd5d3f171f8aee8930f84a89e80a -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision ecf136a787efcd5d3f171f8aee8930f84a89e80a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -137,6 +137,7 @@
{
// Setup
const int returnPeriod = 200;
+ const double norm = 1.0/returnPeriod;
AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
FailureMechanismContribution failureMechanismContribution = assessmentSection.FailureMechanismContribution;
@@ -150,7 +151,7 @@
var handler = mockRepository.StrictMock();
handler.Expect(h => h.ConfirmNormChange()).Return(true);
- handler.Expect(h => h.ChangeNorm(assessmentSection, returnPeriod))
+ handler.Expect(h => h.ChangeNorm(assessmentSection, norm))
.Return(new[]
{
observable1,
@@ -276,7 +277,7 @@
var initialContribution = new FailureMechanismContribution(new[]
{
someMechanism
- }, otherContribution, 100);
+ }, otherContribution, 0.01);
using (var distributionView = new FailureMechanismContributionView(handler)
{
@@ -956,7 +957,8 @@
public void GivenView_WhenEnterAfterEnteringDifferentNormNotCommitted_CommitValueAndChangeData()
{
// Given
- const int normValue = 200;
+ const int returnPeriod = 200;
+ const double norm = 1.0/returnPeriod;
AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
FailureMechanismContribution failureMechanismContribution = assessmentSection.FailureMechanismContribution;
@@ -965,7 +967,7 @@
var handler = mocks.StrictMock();
handler.Expect(h => h.ConfirmNormChange())
.Return(true);
- handler.Expect(h => h.ChangeNorm(assessmentSection, normValue))
+ handler.Expect(h => h.ChangeNorm(assessmentSection, norm))
.Return(Enumerable.Empty());
mocks.ReplayAll();
@@ -981,15 +983,15 @@
// When
var normInput = (NumericUpDown) normTester.TheObject;
view.ActiveControl = normInput;
- normInput.Value = normValue;
+ normInput.Value = returnPeriod;
var keyEventArgs = new KeyEventArgs(Keys.Enter);
EventHelper.RaiseEvent(normInput.Controls.OfType().First(), "KeyDown", keyEventArgs);
// Then
Assert.IsTrue(keyEventArgs.Handled);
Assert.IsTrue(keyEventArgs.SuppressKeyPress);
- Assert.AreEqual(normValue, normInput.Value);
+ Assert.AreEqual(returnPeriod, normInput.Value);
Assert.AreNotSame(normInput, view.ActiveControl);
}
mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -321,7 +321,7 @@
{
public TestAssessmentSection()
{
- FailureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty(), 0, 300000);
+ FailureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty(), 0, 1.0/300000);
}
public Comment Comments { get; private set; }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs
===================================================================
diff -u -r4c62d119265f49057a8e34d4419e671b27c53190 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 4c62d119265f49057a8e34d4419e671b27c53190)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -68,7 +68,8 @@
// Assert
Assert.AreEqual("Bevestigen", title);
- string expectedMessage = "Na het aanpassen van de norm zullen alle rekenresultaten van hydraulische randvoorwaarden en faalmechanismen verwijderd worden." + Environment.NewLine
+ string expectedMessage = "Na het aanpassen van de norm zullen alle rekenresultaten van hydraulische randvoorwaarden en faalmechanismen verwijderd worden."
+ + Environment.NewLine
+ Environment.NewLine +
"Wilt u doorgaan?";
Assert.AreEqual(expectedMessage, message);
@@ -117,9 +118,10 @@
{
// Setup
var handler = new FailureMechanismContributionNormChangeHandler();
+ const double norm = 1.0/1000;
// Call
- TestDelegate call = () => handler.ChangeNorm(null, 1000);
+ TestDelegate call = () => handler.ChangeNorm(null, norm);
// Assert
string paramName = Assert.Throws(call).ParamName;
@@ -128,7 +130,6 @@
[Test]
[TestCase(-123456)]
- [TestCase(0)]
public void ChangeNorm_InvalidNorm_ThrowArgumentOutOfRangeException(int invalidNorm)
{
// Setup
@@ -155,9 +156,10 @@
var handler = new FailureMechanismContributionNormChangeHandler();
IEnumerable affectedObjects = null;
+ const double norm = 1.0/1000;
// Call
- Action call = () => affectedObjects = handler.ChangeNorm(section, 1000);
+ Action call = () => affectedObjects = handler.ChangeNorm(section, norm);
// Assert
var expectedMessages = new[]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs
===================================================================
diff -u -r3df4971064b76a8e789bed245e8851fea72ba085 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs (.../FailureMechanismContributionViewInfoTest.cs) (revision 3df4971064b76a8e789bed245e8851fea72ba085)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs (.../FailureMechanismContributionViewInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -28,7 +28,7 @@
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Contribution;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Common.Forms.PresentationObjects;
using Ringtoets.Integration.Forms.Views;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -61,14 +61,13 @@
{
// Setup
var handler = mocks.Stub();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(mocks);
mocks.ReplayAll();
var view = new FailureMechanismContributionView(handler);
- var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty(), 30, 1000);
-
// Call
- var viewName = info.GetViewName(view, failureMechanismContribution);
+ var viewName = info.GetViewName(view, assessmentSectionStub.FailureMechanismContribution);
// Assert
Assert.AreEqual("Faalkansbegroting", viewName);
@@ -119,17 +118,16 @@
public void GetViewData_Always_Returns_FailureMechanismContribution()
{
// Setup
- var contribution = new FailureMechanismContribution(Enumerable.Empty(), 100.0, 123456);
- var assessmentSection = mocks.StrictMock();
- var context = new FailureMechanismContributionContext(contribution, assessmentSection);
-
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(mocks);
mocks.ReplayAll();
+ var context = new FailureMechanismContributionContext(assessmentSectionStub.FailureMechanismContribution, assessmentSectionStub);
+
// Call
var viewData = info.GetViewData(context);
// Assert
- Assert.AreSame(viewData, contribution);
+ Assert.AreSame(viewData, assessmentSectionStub.FailureMechanismContribution);
mocks.VerifyAll();
}
@@ -138,27 +136,20 @@
{
// Setup
var handler = mocks.Stub();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(mocks);
+ assessmentSectionStub.Stub(section => section.Composition)
+ .Return(AssessmentSectionComposition.Dike);
- var contribution = new FailureMechanismContribution(Enumerable.Empty(), 100.0, 123456);
-
- var assessmentSection = mocks.Stub();
- assessmentSection.Stub(section => section.GetFailureMechanisms())
- .Return(Enumerable.Empty());
- assessmentSection.Stub(section => section.Composition)
- .Return(AssessmentSectionComposition.Dike);
- assessmentSection.Stub(section => section.FailureMechanismContribution)
- .Return(contribution);
-
mocks.ReplayAll();
using (var view = new FailureMechanismContributionView(handler)
{
- Data = contribution,
- AssessmentSection = assessmentSection
+ Data = assessmentSectionStub.FailureMechanismContribution,
+ AssessmentSection = assessmentSectionStub
})
{
// Call
- var closeForData = info.CloseForData(view, assessmentSection);
+ var closeForData = info.CloseForData(view, assessmentSectionStub);
// Assert
Assert.IsTrue(closeForData);
@@ -172,29 +163,18 @@
// Setup
var handler = mocks.Stub();
- var contribution1 = new FailureMechanismContribution(Enumerable.Empty(), 100.0, 123456);
- var contribution2 = new FailureMechanismContribution(Enumerable.Empty(), 100.0, 789123);
-
- var assessmentSection1 = mocks.Stub();
- assessmentSection1.Stub(section => section.FailureMechanismContribution)
- .Return(contribution1);
+ IAssessmentSection assessmentSection1 = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(mocks);
assessmentSection1.Stub(section => section.Composition)
.Return(AssessmentSectionComposition.DikeAndDune);
- assessmentSection1.Stub(section => section.GetFailureMechanisms())
- .Return(Enumerable.Empty());
- var assessmentSection2 = mocks.Stub();
- assessmentSection2.Stub(section => section.FailureMechanismContribution)
- .Return(contribution2);
+ IAssessmentSection assessmentSection2 = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(mocks);
assessmentSection2.Stub(section => section.Composition)
.Return(AssessmentSectionComposition.DikeAndDune);
- assessmentSection2.Stub(section => section.GetFailureMechanisms())
- .Return(Enumerable.Empty());
mocks.ReplayAll();
using (var view = new FailureMechanismContributionView(handler)
{
- Data = contribution1,
+ Data = assessmentSection1.FailureMechanismContribution,
AssessmentSection = assessmentSection1
})
{
@@ -214,17 +194,13 @@
// Setup
var handler = mocks.Stub();
- var contribution = new FailureMechanismContribution(Enumerable.Empty(), 100.0, 789123);
-
- var assessmentSection = mocks.Stub();
- assessmentSection.Stub(section => section.FailureMechanismContribution)
- .Return(contribution);
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(mocks);
mocks.ReplayAll();
using (var view = new FailureMechanismContributionView(handler))
{
// Call
- var closeForData = info.CloseForData(view, assessmentSection);
+ var closeForData = info.CloseForData(view, assessmentSectionStub);
// Assert
Assert.IsFalse(closeForData);
@@ -238,24 +214,17 @@
// Setup
var handler = mocks.Stub();
- var contribution = new FailureMechanismContribution(Enumerable.Empty(), 100.0, 789123);
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(mocks);
+ assessmentSectionStub.Stub(section => section.Composition).Return(AssessmentSectionComposition.Dike);
- var assessmentSection = mocks.Stub();
- assessmentSection.Stub(section => section.GetFailureMechanisms())
- .Return(Enumerable.Empty());
- assessmentSection.Stub(section => section.Composition)
- .Return(AssessmentSectionComposition.Dike);
- assessmentSection.Stub(section => section.FailureMechanismContribution)
- .Return(contribution);
-
IGui guiStub = mocks.Stub();
guiStub.Stub(g => g.ProjectOpened += null).IgnoreArguments();
guiStub.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
guiStub.Stub(g => g.ViewCommands).Return(mocks.Stub());
mocks.ReplayAll();
- var context = new FailureMechanismContributionContext(contribution, assessmentSection);
+ var context = new FailureMechanismContributionContext(assessmentSectionStub.FailureMechanismContribution, assessmentSectionStub);
using (var view = new FailureMechanismContributionView(handler))
using (var ringtoetsPlugin = new RingtoetsPlugin())
@@ -267,7 +236,7 @@
info.AfterCreate(view, context);
// Assert
- Assert.AreSame(view.AssessmentSection, assessmentSection);
+ Assert.AreSame(view.AssessmentSection, assessmentSectionStub);
}
mocks.VerifyAll();
}
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -r92577a6b118858bdcfd7d46693dbd03933181837 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision 92577a6b118858bdcfd7d46693dbd03933181837)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -26,8 +26,7 @@
using NUnit.Framework;
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Contribution;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Forms.PresentationObjects;
using Ringtoets.Piping.Forms.PropertyClasses;
@@ -55,13 +54,12 @@
var properties = new PipingFailureMechanismContextProperties();
var mockRepository = new MockRepository();
- var assessmentSection = mockRepository.StrictMock();
- var norm = 300;
- assessmentSection.Stub(sec => sec.FailureMechanismContribution).Return(new FailureMechanismContribution(new IFailureMechanism[0], 100, norm));
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(
+ failureMechanism, mockRepository);
mockRepository.ReplayAll();
// Call
- properties.Data = new PipingFailureMechanismContext(failureMechanism, assessmentSection);
+ properties.Data = new PipingFailureMechanismContext(failureMechanism, assessmentSectionStub);
// Assert
Assert.AreEqual(failureMechanism.Name, properties.Name);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -re82f04fb50a7b5a6f9c45289258c00c94aa8c64c -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision e82f04fb50a7b5a6f9c45289258c00c94aa8c64c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -38,8 +38,8 @@
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.Contribution;
using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Data.TestUtil;
using Ringtoets.Piping.Forms.PresentationObjects;
@@ -769,21 +769,20 @@
new Point2D(0, 0)
}));
- var assessmentSectionMock = mocks.StrictMock();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(
+ pipingFailureMechanism, mocks);
var nodeData = new PipingCalculationGroupContext(group,
Enumerable.Empty(),
Enumerable.Empty(),
pipingFailureMechanism,
- assessmentSectionMock);
+ assessmentSectionStub);
var parentNodeData = new PipingCalculationGroupContext(parentGroup,
Enumerable.Empty(),
Enumerable.Empty(),
pipingFailureMechanism,
- assessmentSectionMock);
+ assessmentSectionStub);
- assessmentSectionMock.Stub(s => s.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 30, 20000));
-
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
var gui = mocks.StrictMock();
@@ -847,18 +846,19 @@
group.Children.Add(calculation2);
var pipingFailureMechanism = new PipingFailureMechanism();
- var assessmentSectionMock = mocks.StrictMock();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(
+ pipingFailureMechanism, mocks);
var nodeData = new PipingCalculationGroupContext(group,
Enumerable.Empty(),
Enumerable.Empty(),
pipingFailureMechanism,
- assessmentSectionMock);
+ assessmentSectionStub);
var parentNodeData = new PipingCalculationGroupContext(parentGroup,
Enumerable.Empty(),
Enumerable.Empty(),
pipingFailureMechanism,
- assessmentSectionMock);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4302e55ab13274a7dc3519f6e93f1b0b6a0c3b49 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 4302e55ab13274a7dc3519f6e93f1b0b6a0c3b49)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -37,8 +37,8 @@
using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.Contribution;
using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Data.TestUtil;
using Ringtoets.Piping.Forms.PresentationObjects;
@@ -126,7 +126,7 @@
// Assert
Assert.AreEqual(3, children.Length);
- var comment = (Comment)children[0];
+ var comment = (Comment) children[0];
Assert.AreSame(pipingCalculationContext.WrappedData.Comments, comment);
var pipingInputContext = (PipingInputContext) children[1];
@@ -158,7 +158,7 @@
// Assert
Assert.AreEqual(3, children.Length);
- var comment = (Comment)children[0];
+ var comment = (Comment) children[0];
Assert.AreSame(pipingCalculationContext.WrappedData.Comments, comment);
var pipingInputContext = (PipingInputContext) children[1];
@@ -402,14 +402,13 @@
{
new Point2D(0, 0)
}));
- var assessmentSectionMock = mocks.StrictMock();
- assessmentSectionMock.Stub(s => s.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 30, 20000));
-
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(
+ pipingFailureMechanism, mocks);
var pipingCalculationContext = new PipingCalculationScenarioContext(calculation,
Enumerable.Empty(),
Enumerable.Empty(),
pipingFailureMechanism,
- assessmentSectionMock);
+ assessmentSectionStub);
var mainWindow = mocks.DynamicMock();
@@ -513,14 +512,14 @@
{
new Point2D(0, 0)
}));
- var assessmentSectionMock = mocks.StrictMock();
- assessmentSectionMock.Stub(s => s.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 30, 20000));
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(
+ pipingFailureMechanism, mocks);
var pipingCalculationContext = new PipingCalculationScenarioContext(calculation,
Enumerable.Empty(),
Enumerable.Empty(),
pipingFailureMechanism,
- assessmentSectionMock);
+ assessmentSectionStub);
var mainWindow = mocks.DynamicMock();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -37,8 +37,8 @@
using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.Contribution;
using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Common.Forms.PresentationObjects;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Data.TestUtil;
@@ -623,9 +623,9 @@
failureMechanism.CalculationsGroup.Children.Add(validCalculation);
failureMechanism.CalculationsGroup.Children.Add(invalidCalculation);
- var assessmentSection = mocks.Stub();
- assessmentSection.Stub(s => s.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 30, 20000));
- var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection);
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(
+ failureMechanism, mocks);
+ var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSectionStub);
var mainWindow = mocks.Stub();
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -38,9 +38,7 @@
using Rhino.Mocks;
using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Contribution;
using Ringtoets.Common.Data.DikeProfiles;
-using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.TestUtil;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.HydraRing.Data;
@@ -667,14 +665,8 @@
Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite"));
var failureMechanism = new StabilityStoneCoverFailureMechanism();
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = validHydroDatabasePath
- };
- assessmentSection.Stub(a => a.Id).Return("someId");
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 100, 20));
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, validHydroDatabasePath);
var calculation = new StabilityStoneCoverWaveConditionsCalculation
{
@@ -697,7 +689,7 @@
var context = new StabilityStoneCoverWaveConditionsCalculationContext(calculation,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
using (var treeViewControl = new TreeViewControl())
{
@@ -867,20 +859,14 @@
Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite"));
var failureMechanism = new StabilityStoneCoverFailureMechanism();
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = validHydroDatabasePath
- };
- assessmentSection.Stub(a => a.Id).Return("someId");
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 100, 20));
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, validHydroDatabasePath);
var calculation = GetValidCalculation();
calculation.Name = "A";
var context = new StabilityStoneCoverWaveConditionsCalculationContext(calculation,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
DialogBoxHandler = (name, wnd) =>
{
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r54fd939cf2a3d8f718dad28faa24373334d4cc2e -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 54fd939cf2a3d8f718dad28faa24373334d4cc2e)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -39,8 +39,6 @@
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.Contribution;
-using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Common.Forms;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
@@ -645,13 +643,9 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
+ var failureMechanism = new StabilityStoneCoverFailureMechanism();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
var calculationA = new StabilityStoneCoverWaveConditionsCalculation
{
@@ -693,14 +687,13 @@
group.Children.Add(calculationA);
group.Children.Add(calculationB);
- var failureMechanism = new StabilityStoneCoverFailureMechanism();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
var nodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -738,14 +731,9 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
+ var failureMechanism = new StabilityStoneCoverFailureMechanism();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
var observerA = mocks.StrictMock();
observerA.Expect(o => o.UpdateObserver());
@@ -760,14 +748,13 @@
group.Children.Add(calculationA);
group.Children.Add(calculationB);
- var failureMechanism = new StabilityStoneCoverFailureMechanism();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
var nodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -820,25 +807,19 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
-
- var group = new CalculationGroup();
-
var failureMechanism = new StabilityStoneCoverFailureMechanism();
+ var group = new CalculationGroup();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
+
var nodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -872,29 +853,24 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
+ var failureMechanism = new StabilityStoneCoverFailureMechanism();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
+
var group = new CalculationGroup();
var calculationA = GetValidCalculation();
var calculationB = GetValidCalculation();
group.Children.Add(calculationA);
group.Children.Add(calculationB);
- var failureMechanism = new StabilityStoneCoverFailureMechanism();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
var nodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -923,21 +899,16 @@
}
[Test]
- [TestCase(true, TestName = "Menu_TwoCalculationsAndOuputClickClearAllOutput_ClearAllOutputAfterConfirmation(true)")]
- [TestCase(false, TestName = "Menu_TwoCalculationsAndOuputClickClearAllOutput_ClearAllOutputAfterConfirmation(false)")]
+ [TestCase(true, TestName = "Menu_TwoCalculationsAndOutputClickClearAllOutput_ClearAllOutputAfterConfirmation(true)")]
+ [TestCase(false, TestName = "Menu_TwoCalculationsAndOutputClickClearAllOutput_ClearAllOutputAfterConfirmation(false)")]
public void ContextMenuStrip_TwoCalculationsWithOutputClickOnClearAllOutput_OutputRemovedForCalculationsAfterConfirmation(bool confirm)
{
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
+ var failureMechanism = new StabilityStoneCoverFailureMechanism();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
var observerA = mocks.StrictMock();
var observerB = mocks.StrictMock();
@@ -961,15 +932,13 @@
calculationA.Attach(observerA);
calculationB.Attach(observerB);
- var failureMechanism = new StabilityStoneCoverFailureMechanism();
-
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
var nodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6 -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -38,7 +38,6 @@
using Rhino.Mocks;
using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Contribution;
using Ringtoets.Common.Data.DikeProfiles;
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.TestUtil;
@@ -56,9 +55,7 @@
public class WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest : NUnitFormTest
{
private const int validateMenuItemIndex = 2;
-
private const int clearOutputMenuItemIndex = 4;
-
private const int calculateMenuItemIndex = 3;
private MockRepository mocks;
private WaveImpactAsphaltCoverPlugin plugin;
@@ -633,14 +630,8 @@
new Point2D(0, 0),
new Point2D(1, 1)
}));
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = validHydroDatabasePath
- };
- assessmentSection.Stub(a => a.Id).Return("someId");
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 100, 20));
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, validHydroDatabasePath);
var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation
{
@@ -663,7 +654,7 @@
var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(calculation,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
using (var treeViewControl = new TreeViewControl())
{
@@ -838,20 +829,14 @@
new Point2D(0, 0),
new Point2D(1, 1)
}));
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = validHydroDatabasePath
- };
- assessmentSection.Stub(a => a.Id).Return("someId");
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 100, 20));
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, validHydroDatabasePath);
var calculation = GetValidCalculation();
calculation.Name = "A";
var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(calculation,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
DialogBoxHandler = (name, wnd) =>
{
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r54fd939cf2a3d8f718dad28faa24373334d4cc2e -r753480c9461b7b5bb10eb7abe78224f24160a536
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 54fd939cf2a3d8f718dad28faa24373334d4cc2e)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 753480c9461b7b5bb10eb7abe78224f24160a536)
@@ -39,8 +39,6 @@
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.Contribution;
-using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Common.Forms;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
@@ -646,13 +644,9 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
+ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
var calculationA = new WaveImpactAsphaltCoverWaveConditionsCalculation()
{
@@ -694,14 +688,13 @@
group.Children.Add(calculationA);
group.Children.Add(calculationB);
- var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -739,14 +732,9 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
+ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
var observerA = mocks.StrictMock();
observerA.Expect(o => o.UpdateObserver());
@@ -761,14 +749,13 @@
group.Children.Add(calculationA);
group.Children.Add(calculationB);
- var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -819,25 +806,19 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
+ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
var group = new CalculationGroup();
- var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -871,29 +852,23 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
+ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
var group = new CalculationGroup();
var calculationA = GetValidCalculation();
var calculationB = GetValidCalculation();
group.Children.Add(calculationA);
group.Children.Add(calculationB);
- var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -929,14 +904,9 @@
// Setup
string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
- var assessmentSection = mocks.Stub();
- assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
- {
- FilePath = Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")
- };
- assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
- new FailureMechanismContribution(Enumerable.Empty(), 30, 2));
- assessmentSection.Stub(a => a.Id).Return("someId");
+ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
+ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(
+ failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite"));
var observerA = mocks.StrictMock();
var observerB = mocks.StrictMock();
@@ -956,14 +926,13 @@
calculationA.Attach(observerA);
calculationB.Attach(observerB);
- var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
failureMechanism,
- assessmentSection);
+ assessmentSectionStub);
var menuBuilder = new CustomItemsOnlyContextMenuBuilder();