Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r3d2194c3a340866e57c66e873601cbf4cc35f5c5 -raeb1cd4411d0b141176963c03d05bab56df2b794
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3d2194c3a340866e57c66e873601cbf4cc35f5c5)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision aeb1cd4411d0b141176963c03d05bab56df2b794)
@@ -336,7 +336,9 @@
}
///
- /// Looks up a localized string similar to Bijdrage aan scenario [%].
+ /// Looks up a localized string similar to Bijdrage aan
+ ///scenario
+ ///[%].
///
public static string PipingCalculationsView_InitializeDataGridView_Contribution {
get {
@@ -968,7 +970,9 @@
}
///
- /// Looks up a localized string similar to Kans op heave [1/jaar].
+ /// Looks up a localized string similar to Kans op
+ ///heave
+ ///[1/jaar].
///
public static string PipingScenarioView_PipingScenarioRow_FailureProbabilityHeave {
get {
@@ -977,7 +981,8 @@
}
///
- /// Looks up a localized string similar to Faalkans [1/jaar].
+ /// Looks up a localized string similar to Faalkans
+ ///[1/jaar].
///
public static string PipingScenarioView_PipingScenarioRow_FailureProbabilityPiping {
get {
@@ -986,7 +991,9 @@
}
///
- /// Looks up a localized string similar to Kans op terugschrijdende erosie [1/jaar].
+ /// Looks up a localized string similar to Kans op
+ ///terugschrijdende erosie
+ ///[1/jaar].
///
public static string PipingScenarioView_PipingScenarioRow_FailureProbabilitySellmeijer {
get {
@@ -995,7 +1002,9 @@
}
///
- /// Looks up a localized string similar to Kans op opbarsten [1/jaar].
+ /// Looks up a localized string similar to Kans op
+ ///opbarsten
+ ///[1/jaar].
///
public static string PipingScenarioView_PipingScenarioRow_FailureProbabilityUplift {
get {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -r3d2194c3a340866e57c66e873601cbf4cc35f5c5 -raeb1cd4411d0b141176963c03d05bab56df2b794
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3d2194c3a340866e57c66e873601cbf4cc35f5c5)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision aeb1cd4411d0b141176963c03d05bab56df2b794)
@@ -389,22 +389,31 @@
In oordeel
- Bijdrage aan scenario [%]
+ Bijdrage aan
+scenario
+[%]
Aandeel van schematisatie in het stochastische ondergrondmodel [%]
- Kans op heave [1/jaar]
+ Kans op
+heave
+[1/jaar]
- Faalkans [1/jaar]
+ Faalkans
+[1/jaar]
- Kans op terugschrijdende erosie [1/jaar]
+ Kans op
+terugschrijdende erosie
+[1/jaar]
- Kans op opbarsten [1/jaar]
+ Kans op
+opbarsten
+[1/jaar]
Selecteer profielschematisaties
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs
===================================================================
diff -u -r0d301f769dc84d57979a55d902c498afe5d93e19 -raeb1cd4411d0b141176963c03d05bab56df2b794
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision 0d301f769dc84d57979a55d902c498afe5d93e19)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision aeb1cd4411d0b141176963c03d05bab56df2b794)
@@ -26,6 +26,7 @@
using Core.Common.Base;
using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
+using Core.Common.Controls.DataGrid;
using Core.Common.Controls.Views;
using NUnit.Extensions.Forms;
using NUnit.Framework;
@@ -106,6 +107,35 @@
}
[Test]
+ public void Constructor_DataGridViewControlColumnHeadersCorrectlyInitialized_()
+ {
+ // Setup
+ using (ShowPipingScenarioView())
+ {
+ // Call
+ var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl").TheObject;
+
+ // Assert
+ DataGridViewColumn isRelevantColumn = dataGridViewControl.GetColumnFromIndex(isRelevantColumnIndex);
+ Assert.AreEqual("In oordeel", isRelevantColumn.HeaderText);
+ DataGridViewColumn contributionColumn = dataGridViewControl.GetColumnFromIndex(contributionColumnIndex);
+ Assert.AreEqual("Bijdrage aan\r\nscenario\r\n[%]", contributionColumn.HeaderText);
+ DataGridViewColumn nameColumn = dataGridViewControl.GetColumnFromIndex(nameColumnIndex);
+ Assert.AreEqual("Naam", nameColumn.HeaderText);
+ DataGridViewColumn failureProbabilityPipingColumn = dataGridViewControl.GetColumnFromIndex(failureProbabilityPipingColumnIndex);
+ Assert.AreEqual("Faalkans\r\n[1/jaar]", failureProbabilityPipingColumn.HeaderText);
+ DataGridViewColumn failureProbabilityUpliftColumn = dataGridViewControl.GetColumnFromIndex(failureProbabilityUpliftColumnIndex);
+ Assert.AreEqual("Kans op\r\nopbarsten\r\n[1/jaar]", failureProbabilityUpliftColumn.HeaderText);
+ DataGridViewColumn failureProbabilityHeaveColumn = dataGridViewControl.GetColumnFromIndex(failureProbabilityHeaveColumnIndex);
+ Assert.AreEqual("Kans op\r\nheave\r\n[1/jaar]", failureProbabilityHeaveColumn.HeaderText);
+ DataGridViewColumn failureProbabilitySellmeijerColumn = dataGridViewControl.GetColumnFromIndex(failureProbabilitySellmeijerColumnIndex);
+ Assert.AreEqual("Kans op\r\nterugschrijdende erosie\r\n[1/jaar]", failureProbabilitySellmeijerColumn.HeaderText);
+
+ Assert.Throws(() => dataGridViewControl.GetColumnFromIndex(failureProbabilitySellmeijerColumnIndex + 1));
+ }
+ }
+
+ [Test]
public void Constructor_ListBoxCorrectlyInitialized()
{
// Setup & Call