Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r6dd74d930e79de9219bff87cfe3b77d6e03a164b -rc824c971119bfdb785a6b1641a821fe344f22869
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6dd74d930e79de9219bff87cfe3b77d6e03a164b)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c824c971119bfdb785a6b1641a821fe344f22869)
@@ -118,7 +118,7 @@
}
///
- /// Looks up a localized string similar to d50 [m].
+ /// Looks up a localized string similar to Rekenwaarde d50 [m].
///
internal static string DuneLocation_D50_DisplayName {
get {
@@ -172,7 +172,7 @@
}
///
- /// Looks up a localized string similar to Hs [m].
+ /// Looks up a localized string similar to Rekenwaarde Hs [m].
///
internal static string DuneLocation_WaveHeight_DisplayName {
get {
@@ -190,7 +190,7 @@
}
///
- /// Looks up a localized string similar to Tp [s].
+ /// Looks up a localized string similar to Rekenwaarde Tp [s].
///
internal static string DuneLocation_WavePeriod_DisplayName {
get {
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.resx
===================================================================
diff -u -r6dd74d930e79de9219bff87cfe3b77d6e03a164b -rc824c971119bfdb785a6b1641a821fe344f22869
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6dd74d930e79de9219bff87cfe3b77d6e03a164b)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.resx (.../Resources.resx) (revision c824c971119bfdb785a6b1641a821fe344f22869)
@@ -130,7 +130,7 @@
Rekenwaarde voor de d50 voor het uitvoeren van een sterkteberekening voor het toetsspoor duinen.
- d50 [m]
+ Rekenwaarde d50 [m]
Metrering van de locatie binnen het kustvak waar het onderdeel van uitmaakt.
@@ -148,13 +148,13 @@
Berekende rekenwaarde voor de significante golfhoogte voor het uitvoeren van een sterkteberekening voor het toetsspoor duinen.
- Hs [m]
+ Rekenwaarde Hs [m]
Berekende rekenwaarde voor de piekperiode van de golven voor het uitvoeren van een sterkteberekening voor het toetsspoor duinen.
- Tp [s]
+ Rekenwaarde Tp [s]
Kustvaknummer
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs
===================================================================
diff -u -r5fcfd3d73f28585c211086ad413fc5d177ecd6b2 -rc824c971119bfdb785a6b1641a821fe344f22869
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs (.../DuneLocationPropertiesTest.cs) (revision 5fcfd3d73f28585c211086ad413fc5d177ecd6b2)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs (.../DuneLocationPropertiesTest.cs) (revision c824c971119bfdb785a6b1641a821fe344f22869)
@@ -232,21 +232,21 @@
PropertyDescriptor waveHeightProperty = dynamicProperties[requiredWaveHeightPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waveHeightProperty,
"Resultaat",
- "Hs [m]",
+ "Rekenwaarde Hs [m]",
"Berekende rekenwaarde voor de significante golfhoogte voor het uitvoeren van een sterkteberekening voor het toetsspoor duinen.",
true);
PropertyDescriptor wavePeriodProperty = dynamicProperties[requiredWavePeriodPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(wavePeriodProperty,
"Resultaat",
- "Tp [s]",
+ "Rekenwaarde Tp [s]",
"Berekende rekenwaarde voor de piekperiode van de golven voor het uitvoeren van een sterkteberekening voor het toetsspoor duinen.",
true);
PropertyDescriptor d50Property = dynamicProperties[requiredD50PropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(d50Property,
"Resultaat",
- "d50 [m]",
+ "Rekenwaarde d50 [m]",
"Rekenwaarde voor de d50 voor het uitvoeren van een sterkteberekening voor het toetsspoor duinen.",
true);
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationRowTest.cs
===================================================================
diff -u -r837c7fc8233c07fdd0a0acde3b99ca88273a0487 -rc824c971119bfdb785a6b1641a821fe344f22869
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationRowTest.cs (.../DuneLocationRowTest.cs) (revision 837c7fc8233c07fdd0a0acde3b99ca88273a0487)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationRowTest.cs (.../DuneLocationRowTest.cs) (revision c824c971119bfdb785a6b1641a821fe344f22869)
@@ -95,26 +95,12 @@
public void Constructor_WithoutOutput_ExpectedValues()
{
// Setup
- const double offset = 34.1;
- var location = new DuneLocation(1, "test location", new Point2D(3.3, 4.4), new DuneLocation.ConstructionProperties
- {
- CoastalAreaId = 2,
- Offset = offset,
- D50 = 0.000183
- });
+ var location = new DuneLocation(1, "test location", new Point2D(3.3, 4.4), new DuneLocation.ConstructionProperties());
// Call
var row = new DuneLocationRow(location);
// Assert
- Assert.IsInstanceOf(row);
- Assert.AreSame(location, row.DuneLocation);
- Assert.AreEqual(location.Id, row.Id);
- Assert.AreEqual(location.Name, row.Name);
- Assert.AreSame(location.Location, row.Location);
- Assert.AreEqual(location.CoastalAreaId, row.CoastalAreaId);
- Assert.AreEqual(offset.ToString(CultureInfo.CurrentCulture), row.Offset);
- Assert.AreEqual(location.D50, row.D50);
Assert.IsNaN(row.WaterLevel);
Assert.IsNaN(row.WaveHeight);
Assert.IsNaN(row.WavePeriod);
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationsViewTest.cs
===================================================================
diff -u -r837c7fc8233c07fdd0a0acde3b99ca88273a0487 -rc824c971119bfdb785a6b1641a821fe344f22869
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationsViewTest.cs (.../DuneLocationsViewTest.cs) (revision 837c7fc8233c07fdd0a0acde3b99ca88273a0487)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationsViewTest.cs (.../DuneLocationsViewTest.cs) (revision c824c971119bfdb785a6b1641a821fe344f22869)
@@ -105,13 +105,13 @@
Assert.AreEqual("Rekenwaarde waterstand [m+NAP]", waterLevelColumn.HeaderText);
var waveHeightColumn = (DataGridViewTextBoxColumn)dataGridView.Columns[waveHeightColumnIndex];
- Assert.AreEqual("Hs [m]", waveHeightColumn.HeaderText);
+ Assert.AreEqual("Rekenwaarde Hs [m]", waveHeightColumn.HeaderText);
var wavePeriodColumn = (DataGridViewTextBoxColumn)dataGridView.Columns[wavePeriodColumnIndex];
- Assert.AreEqual("Tp [s]", wavePeriodColumn.HeaderText);
+ Assert.AreEqual("Rekenwaarde Tp [s]", wavePeriodColumn.HeaderText);
var d50Column = (DataGridViewTextBoxColumn)dataGridView.Columns[d50ColumnIndex];
- Assert.AreEqual("d50 [m]", d50Column.HeaderText);
+ Assert.AreEqual("Rekenwaarde d50 [m]", d50Column.HeaderText);
var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
var button = (Button)buttonTester.TheObject;
@@ -183,9 +183,9 @@
Assert.AreEqual("60", cells[coastalAreaIdColumnIndex].FormattedValue);
Assert.AreEqual("230", cells[offsetColumnIndex].FormattedValue);
Assert.AreEqual(0.000123.ToString(CultureInfo.CurrentCulture), cells[d50ColumnIndex].FormattedValue);
- Assert.AreEqual(1.00.ToString(CultureInfo.CurrentCulture), cells[waterLevelColumnIndex].FormattedValue);
- Assert.AreEqual(2.00.ToString(CultureInfo.CurrentCulture), cells[waveHeightColumnIndex].FormattedValue);
- Assert.AreEqual(3.00.ToString(CultureInfo.CurrentCulture), cells[wavePeriodColumnIndex].FormattedValue);
+ Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), cells[waterLevelColumnIndex].FormattedValue);
+ Assert.AreEqual(2.34.ToString(CultureInfo.CurrentCulture), cells[waveHeightColumnIndex].FormattedValue);
+ Assert.AreEqual(3.45.ToString(CultureInfo.CurrentCulture), cells[wavePeriodColumnIndex].FormattedValue);
}
@@ -229,9 +229,9 @@
{
Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
{
- WaterLevel = 1.0,
- WaveHeight = 2.0,
- WavePeriod = 3.0
+ WaterLevel = 1.23,
+ WaveHeight = 2.34,
+ WavePeriod = 3.45
})
}
};