Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs
===================================================================
diff -u -rde09e649989e2c4f858632345841f7b9971debe3 -r7235aeaea6e256141b54459aa33da203e84f280b
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs (.../HydraulicBoundaryLocation.cs) (revision de09e649989e2c4f858632345841f7b9971debe3)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs (.../HydraulicBoundaryLocation.cs) (revision 7235aeaea6e256141b54459aa33da203e84f280b)
@@ -35,13 +35,11 @@
/// Name of the .
/// X-coordinate of the .
/// Y-coordinate of the .
- /// Design water level of the .
- public HydraulicBoundaryLocation(long id, string name, double x, double y, string designWaterLevel)
+ public HydraulicBoundaryLocation(long id, string name, double x, double y)
{
Id = id;
Name = name;
Location = new Point2D(x, y);
- DesignWaterLevel = designWaterLevel;
}
///
@@ -62,6 +60,6 @@
///
/// Gets the design water level of .
///
- public string DesignWaterLevel { get; private set; }
+ public double DesignWaterLevel { get; set; }
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/PresentationObjects/HydraulicBoundaryLocationProperties.cs
===================================================================
diff -u -rde09e649989e2c4f858632345841f7b9971debe3 -r7235aeaea6e256141b54459aa33da203e84f280b
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/PresentationObjects/HydraulicBoundaryLocationProperties.cs (.../HydraulicBoundaryLocationProperties.cs) (revision de09e649989e2c4f858632345841f7b9971debe3)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/PresentationObjects/HydraulicBoundaryLocationProperties.cs (.../HydraulicBoundaryLocationProperties.cs) (revision 7235aeaea6e256141b54459aa33da203e84f280b)
@@ -89,7 +89,7 @@
///
[PropertyOrder(4)]
[ResourcesDisplayName(typeof(HydraRingResources), "HydraulicBoundaryDatabase_Locations_DesignWaterLevel")]
- public string DesignWaterLevel
+ public double DesignWaterLevel
{
get
{
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundarySqLiteDatabaseReader.cs
===================================================================
diff -u -rb743d495d10779d51c8f75b7cb04b5babb4b226f -r7235aeaea6e256141b54459aa33da203e84f280b
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundarySqLiteDatabaseReader.cs (.../HydraulicBoundarySqLiteDatabaseReader.cs) (revision b743d495d10779d51c8f75b7cb04b5babb4b226f)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundarySqLiteDatabaseReader.cs (.../HydraulicBoundarySqLiteDatabaseReader.cs) (revision 7235aeaea6e256141b54459aa33da203e84f280b)
@@ -156,9 +156,8 @@
var name = Read(HydraulicBoundaryDatabaseColumns.LocationName);
var x = Read(HydraulicBoundaryDatabaseColumns.LocationX);
var y = Read(HydraulicBoundaryDatabaseColumns.LocationY);
- var designWaterLevel = "";
MoveNext();
- return new HydraulicBoundaryLocation(id, name, x, y, designWaterLevel);
+ return new HydraulicBoundaryLocation(id, name, x, y);
}
catch (InvalidCastException exception)
{
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs
===================================================================
diff -u -r91f31671598442c0ea6141f14630a672aa652dac -r7235aeaea6e256141b54459aa33da203e84f280b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision 91f31671598442c0ea6141f14630a672aa652dac)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision 7235aeaea6e256141b54459aa33da203e84f280b)
@@ -40,13 +40,13 @@
hydraRingConfiguration.AddHydraRingCalculation(new HydraRingCalculationData
{
FailureMechanismType = HydraRingFailureMechanismType.QVariant,
- HydraulicBoundaryLocation = new HydraulicBoundaryLocation(700003, "Location 1", 0, 0, "10.0")
+ HydraulicBoundaryLocation = new HydraulicBoundaryLocation(700003, "Location 1", 0, 0)
});
hydraRingConfiguration.AddHydraRingCalculation(new HydraRingCalculationData
{
FailureMechanismType = HydraRingFailureMechanismType.DikesOvertopping,
- HydraulicBoundaryLocation = new HydraulicBoundaryLocation(700004, "Location 2", 1, 1, "12.0")
+ HydraulicBoundaryLocation = new HydraulicBoundaryLocation(700004, "Location 2", 1, 1)
});
var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Data.Test/HydraulicBoundaryDatabaseTest.cs
===================================================================
diff -u -r97357b3b1d601d942410b4ebeff0d2647f753774 -r7235aeaea6e256141b54459aa33da203e84f280b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Data.Test/HydraulicBoundaryDatabaseTest.cs (.../HydraulicBoundaryDatabaseTest.cs) (revision 97357b3b1d601d942410b4ebeff0d2647f753774)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Data.Test/HydraulicBoundaryDatabaseTest.cs (.../HydraulicBoundaryDatabaseTest.cs) (revision 7235aeaea6e256141b54459aa33da203e84f280b)
@@ -45,7 +45,7 @@
// Setup
HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
var location = hydraulicBoundaryDatabase.Locations;
- location.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0, "toetspeil"));
+ location.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0));
// Precondition
CollectionAssert.IsNotEmpty(location);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Data.Test/HydraulicBoundaryLocationTest.cs
===================================================================
diff -u -rde09e649989e2c4f858632345841f7b9971debe3 -r7235aeaea6e256141b54459aa33da203e84f280b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Data.Test/HydraulicBoundaryLocationTest.cs (.../HydraulicBoundaryLocationTest.cs) (revision de09e649989e2c4f858632345841f7b9971debe3)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Data.Test/HydraulicBoundaryLocationTest.cs (.../HydraulicBoundaryLocationTest.cs) (revision 7235aeaea6e256141b54459aa33da203e84f280b)
@@ -38,10 +38,9 @@
long id = 0L;
double x = 1.0;
double y = 1.0;
- string designWaterLevel = "";
// Call
- TestDelegate test = () => new HydraulicBoundaryLocation(id, null, x, y, designWaterLevel);
+ TestDelegate test = () => new HydraulicBoundaryLocation(id, null, x, y);
// Assert
Assert.DoesNotThrow(test);
@@ -55,23 +54,35 @@
string name = "";
double x = 567.0;
double y = 890.0;
- string designWaterLevel = "";
// Call
- HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y, designWaterLevel);
+ HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y);
// Assert
Assert.IsInstanceOf(hydraulicBoundaryLocation);
Assert.AreEqual(id, hydraulicBoundaryLocation.Id);
Assert.AreEqual(name, hydraulicBoundaryLocation.Name);
- Assert.AreEqual(designWaterLevel, hydraulicBoundaryLocation.DesignWaterLevel);
Point2D location = hydraulicBoundaryLocation.Location;
Assert.IsInstanceOf(location);
Assert.AreEqual(x, location.X);
Assert.AreEqual(y, location.Y);
}
[Test]
+ public void Properties_ValidParameters_PropertiesAsExpected()
+ {
+ // Setup
+ double designWaterLevel = 741.0;
+ HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "", 0, 0);
+
+ // Call
+ hydraulicBoundaryLocation.DesignWaterLevel = designWaterLevel;
+
+ // Assert
+ Assert.AreEqual(designWaterLevel, hydraulicBoundaryLocation.DesignWaterLevel);
+ }
+
+ [Test]
public void PropertyAttributes_ReturnExpectedValues()
{
// Setup
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Forms.Test/PresentationObjects/HydraulicBoundaryLocationPropertiesTest.cs
===================================================================
diff -u -rde09e649989e2c4f858632345841f7b9971debe3 -r7235aeaea6e256141b54459aa33da203e84f280b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Forms.Test/PresentationObjects/HydraulicBoundaryLocationPropertiesTest.cs (.../HydraulicBoundaryLocationPropertiesTest.cs) (revision de09e649989e2c4f858632345841f7b9971debe3)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Forms.Test/PresentationObjects/HydraulicBoundaryLocationPropertiesTest.cs (.../HydraulicBoundaryLocationPropertiesTest.cs) (revision 7235aeaea6e256141b54459aa33da203e84f280b)
@@ -42,8 +42,7 @@
0,
"",
0.0,
- 0.0,
- ""
+ 0.0
};
var hydraulicBoundaryLocationMock = mockRepository.StrictMock(hydraulicBoundaryLocationArguments);
mockRepository.ReplayAll();
@@ -65,18 +64,18 @@
double y = 890.0;
Point2D coordinates = new Point2D(x, y);
string name = "";
- string designWaterLevel = "";
+ double designWaterLevel = 741.0;
var mockRepository = new MockRepository();
object[] hydraulicBoundaryLocationArguments =
{
id,
name,
x,
- y,
- designWaterLevel
+ y
};
var hydraulicBoundaryLocationMock = mockRepository.StrictMock(hydraulicBoundaryLocationArguments);
+ hydraulicBoundaryLocationMock.DesignWaterLevel = designWaterLevel;
mockRepository.ReplayAll();
// Call
@@ -106,8 +105,7 @@
id,
name,
x,
- y,
- ""
+ y
};
var hydraulicBoundaryLocationMock = mockRepository.StrictMock(hydraulicBoundaryLocationArguments);
mockRepository.ReplayAll();
@@ -126,7 +124,7 @@
{
// Setup
var mockRepository = new MockRepository();
- var hydraulicBoundaryLocationMock = mockRepository.StrictMock(0, "", 0.0, 0.0, "");
+ var hydraulicBoundaryLocationMock = mockRepository.StrictMock(0, "", 0.0, 0.0);
mockRepository.ReplayAll();
var hydraulicBoundaryLocationProperties = new HydraulicBoundaryLocationProperties(hydraulicBoundaryLocationMock);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs
===================================================================
diff -u -rde09e649989e2c4f858632345841f7b9971debe3 -r7235aeaea6e256141b54459aa33da203e84f280b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision de09e649989e2c4f858632345841f7b9971debe3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision 7235aeaea6e256141b54459aa33da203e84f280b)
@@ -52,7 +52,7 @@
var assessmentSectionBaseMock = mocks.StrictMock();
mocks.ReplayAll();
- HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 1.0, 2.0, "water");
+ HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 1.0, 2.0);
HydraulicBoundaryLocationProperties expectedLocationProperties = new HydraulicBoundaryLocationProperties(hydraulicBoundaryLocation);
HydraulicBoundaryDatabaseContext hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(new HydraulicBoundaryDatabase(), assessmentSectionBaseMock);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -rac4b9f3c4545c1bcb9a688d4613e61635e9ad2a8 -r7235aeaea6e256141b54459aa33da203e84f280b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision ac4b9f3c4545c1bcb9a688d4613e61635e9ad2a8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision 7235aeaea6e256141b54459aa33da203e84f280b)
@@ -57,7 +57,7 @@
object mapObject = view.Controls[0];
Assert.IsInstanceOf(mapObject);
- var map = (BaseMap)mapObject;
+ var map = (BaseMap) mapObject;
Assert.AreEqual(DockStyle.Fill, map.Dock);
Assert.NotNull(view.Map);
}
@@ -67,7 +67,7 @@
{
// Setup
var view = new AssessmentSectionView();
- var map = (BaseMap)view.Controls[0];
+ var map = (BaseMap) view.Controls[0];
// Call
TestDelegate testDelegate = () => view.Data = null;
@@ -82,9 +82,9 @@
{
// Setup
var view = new AssessmentSectionView();
- var map = (BaseMap)view.Controls[0];
+ var map = (BaseMap) view.Controls[0];
var assessmentSectionBase = new AssessmentSectionBaseTestClass();
- assessmentSectionBase.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0, "level"));
+ assessmentSectionBase.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0));
// Call
view.Data = assessmentSectionBase;
@@ -102,4 +102,4 @@
}
}
}
-}
+}
\ No newline at end of file