Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
@@ -0,0 +1,106 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.Common.Forms.Controls
+{
+ partial class AssemblyResultWithProbabilityControl
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.probabilityPanel = new System.Windows.Forms.TableLayoutPanel();
+ this.ProbabilityLabel = new Ringtoets.Common.Forms.Controls.BorderedLabel();
+ ((System.ComponentModel.ISupportInitialize)(this.ErrorProvider)).BeginInit();
+ this.probabilityPanel.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // probabilityPanel
+ //
+ this.probabilityPanel.ColumnCount = 1;
+ this.probabilityPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.probabilityPanel.Controls.Add(this.ProbabilityLabel, 0, 0);
+ this.probabilityPanel.Dock = System.Windows.Forms.DockStyle.Left;
+ this.probabilityPanel.Location = new System.Drawing.Point(56, 0);
+ this.probabilityPanel.Name = "probabilityPanel";
+ this.probabilityPanel.RowCount = 1;
+ this.probabilityPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.probabilityPanel.Size = new System.Drawing.Size(200, 796);
+ this.probabilityPanel.TabIndex = 1;
+ //
+ // ProbabilityLabel
+ //
+ this.ProbabilityLabel.AutoSize = true;
+ this.ProbabilityLabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.ProbabilityLabel.Dock = System.Windows.Forms.DockStyle.Left;
+ this.ProbabilityLabel.Location = new System.Drawing.Point(3, 3);
+ this.ProbabilityLabel.Margin = new System.Windows.Forms.Padding(3);
+ this.ProbabilityLabel.MinimumSize = new System.Drawing.Size(50, 2);
+ this.ProbabilityLabel.Name = "ProbabilityLabel";
+ this.ProbabilityLabel.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.ProbabilityLabel.Size = new System.Drawing.Size(50, 790);
+ this.ProbabilityLabel.TabIndex = 0;
+ this.ProbabilityLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // FailureMechanismAssemblyControl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.probabilityPanel);
+ this.Name = "FailureMechanismAssemblyControl";
+ this.Size = new System.Drawing.Size(256, 796);
+ this.Controls.SetChildIndex(this.probabilityPanel, 0);
+ ((System.ComponentModel.ISupportInitialize)(this.ErrorProvider)).EndInit();
+ this.probabilityPanel.ResumeLayout(false);
+ this.probabilityPanel.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TableLayoutPanel probabilityPanel;
+ protected BorderedLabel ProbabilityLabel;
+ }
+}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.cs (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.cs (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
@@ -0,0 +1,42 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Ringtoets.Common.Forms.Properties;
+
+namespace Ringtoets.Common.Forms.Controls
+{
+ ///
+ /// Custom control to display an assembly result with probability.
+ ///
+ public abstract partial class AssemblyResultWithProbabilityControl : AssemblyResultControl
+ {
+ protected AssemblyResultWithProbabilityControl()
+ {
+ InitializeComponent();
+ }
+
+ public override void SetError(string error)
+ {
+ base.SetError(error);
+ ProbabilityLabel.Text = Resources.RoundedDouble_No_result_dash;
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.resx
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.resx (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.resx (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
Fisheye: Tag ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/FailureMechanismAssemblyControl.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/FailureMechanismAssemblyControl.cs
===================================================================
diff -u -r96e729865d3978156ee7d869c1f45f51dae51bcd -rce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/FailureMechanismAssemblyControl.cs (.../FailureMechanismAssemblyControl.cs) (revision 96e729865d3978156ee7d869c1f45f51dae51bcd)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/FailureMechanismAssemblyControl.cs (.../FailureMechanismAssemblyControl.cs) (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
@@ -23,21 +23,15 @@
using Core.Common.Util;
using Ringtoets.AssemblyTool.Data;
using Ringtoets.Common.Forms.Helpers;
-using Ringtoets.Common.Forms.Properties;
using Ringtoets.Common.Forms.TypeConverters;
namespace Ringtoets.Common.Forms.Controls
{
///
/// Custom control to display a .
///
- public partial class FailureMechanismAssemblyControl : AssemblyResultControl
+ public class FailureMechanismAssemblyControl : AssemblyResultWithProbabilityControl
{
- public FailureMechanismAssemblyControl()
- {
- InitializeComponent();
- }
-
///
/// Set the values of to the control.
///
@@ -53,13 +47,7 @@
GroupLabel.Text = new EnumDisplayWrapper(assembly.Group).DisplayName;
GroupLabel.BackColor = AssemblyCategoryGroupColorHelper.GetFailureMechanismAssemblyCategoryGroupColor(assembly.Group);
- probabilityLabel.Text = new NoProbabilityValueDoubleConverter().ConvertToString(assembly.Probability);
+ ProbabilityLabel.Text = new NoProbabilityValueDoubleConverter().ConvertToString(assembly.Probability);
}
-
- public override void SetError(string error)
- {
- base.SetError(error);
- probabilityLabel.Text = Resources.RoundedDouble_No_result_dash;
- }
}
}
\ No newline at end of file
Fisheye: Tag ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/FailureMechanismAssemblyControl.resx'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -rbfd888d1102f04ff8d56e2e90c0d4ebea559f2e3 -rce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision bfd888d1102f04ff8d56e2e90c0d4ebea559f2e3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
@@ -33,12 +33,15 @@
AssemblyResultControl.cs
-
+
UserControl
-
- FailureMechanismAssemblyControl.cs
+
+ AssemblyResultWithProbabilityControl.cs
+
+ UserControl
+
UserControl
@@ -247,8 +250,8 @@
AssemblyResultControl.cs
-
- FailureMechanismAssemblyControl.cs
+
+ AssemblyResultWithProbabilityControl.cs
PublicResXFileCodeGenerator
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultWithProbabilityControlTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultWithProbabilityControlTest.cs (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultWithProbabilityControlTest.cs (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
@@ -0,0 +1,117 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using Core.Common.TestUtil;
+using Core.Common.Util.Reflection;
+using NUnit.Framework;
+using Ringtoets.Common.Forms.Controls;
+using Ringtoets.Common.Forms.Properties;
+
+namespace Ringtoets.Common.Forms.Test.Controls
+{
+ [TestFixture]
+ public class AssemblyResultWithProbabilityControlTest
+ {
+ [Test]
+ public void DefaultConstructor_ExpectedValues()
+ {
+ // Call
+ var resultControl = new TestAssemblyResultWithProbabilityControl();
+
+ // Assert
+ Assert.AreEqual(2, resultControl.Controls.Count);
+ Assert.IsInstanceOf(resultControl);
+ Assert.IsTrue(resultControl.AutoSize);
+ Assert.AreEqual(DockStyle.Left, resultControl.Dock);
+
+ TableLayoutPanel groupPanel = GetGroupPanel(resultControl);
+ Assert.AreEqual(1, groupPanel.ColumnCount);
+ Assert.AreEqual(1, groupPanel.RowCount);
+
+ var groupLabel = (BorderedLabel) groupPanel.GetControlFromPosition(0, 0);
+ Assert.IsTrue(groupLabel.AutoSize);
+ Assert.AreEqual(DockStyle.Fill, groupLabel.Dock);
+ Assert.AreEqual(new Padding(5, 0, 5, 0), groupLabel.Padding);
+
+ var errorProvider = TypeUtils.GetField(resultControl, "ErrorProvider");
+ TestHelper.AssertImagesAreEqual(Resources.ErrorIcon.ToBitmap(), errorProvider.Icon.ToBitmap());
+
+ TableLayoutPanel probabilityPanel = GetProbabilityPanel(resultControl);
+ Assert.AreEqual(1, probabilityPanel.ColumnCount);
+ Assert.AreEqual(1, probabilityPanel.RowCount);
+
+ var probabilityLabel = (BorderedLabel) probabilityPanel.GetControlFromPosition(0, 0);
+ Assert.IsTrue(probabilityLabel.AutoSize);
+ Assert.AreEqual(DockStyle.Left, probabilityLabel.Dock);
+ Assert.AreEqual(new Padding(5, 0, 5, 0), probabilityLabel.Padding);
+ }
+
+ [Test]
+ public void SetError_ErrorNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ var resultControl = new TestAssemblyResultWithProbabilityControl();
+
+ // Call
+ TestDelegate test = () => resultControl.SetError(null);
+
+ // Assert
+ var exception = Assert.Throws(test);
+ Assert.AreEqual("error", exception.ParamName);
+ }
+
+ [Test]
+ public void SetError_WithError_SetsErrorOnControl()
+ {
+ // Setup
+ const string error = "random error 123";
+ var resultControl = new TestAssemblyResultWithProbabilityControl();
+
+ // Call
+ resultControl.SetError(error);
+
+ // Assert
+ var errorProvider = TypeUtils.GetField(resultControl, "ErrorProvider");
+ Assert.AreEqual(error, errorProvider.GetError(resultControl));
+
+ Control groupLabel = GetGroupPanel(resultControl).GetControlFromPosition(0, 0);
+ Control probabilityLabel = GetProbabilityPanel(resultControl).GetControlFromPosition(0, 0);
+ Assert.IsEmpty(groupLabel.Text);
+ Assert.AreEqual(Color.White, groupLabel.BackColor);
+ Assert.AreEqual("-", probabilityLabel.Text);
+ }
+
+ private static TableLayoutPanel GetProbabilityPanel(AssemblyResultWithProbabilityControl resultControl)
+ {
+ return TypeUtils.GetField(resultControl, "probabilityPanel");
+ }
+
+ private static TableLayoutPanel GetGroupPanel(AssemblyResultWithProbabilityControl resultControl)
+ {
+ return TypeUtils.GetField(resultControl, "GroupPanel");
+ }
+
+ private class TestAssemblyResultWithProbabilityControl : AssemblyResultWithProbabilityControl {}
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/FailureMechanismAssemblyCategoryGroupControlTest.cs
===================================================================
diff -u -r96e729865d3978156ee7d869c1f45f51dae51bcd -rce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/FailureMechanismAssemblyCategoryGroupControlTest.cs (.../FailureMechanismAssemblyCategoryGroupControlTest.cs) (revision 96e729865d3978156ee7d869c1f45f51dae51bcd)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/FailureMechanismAssemblyCategoryGroupControlTest.cs (.../FailureMechanismAssemblyCategoryGroupControlTest.cs) (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
@@ -57,17 +57,12 @@
resultControl.SetAssemblyResult(assembly);
// Assert
- Control groupLabel = GetGroupPanel(resultControl).GetControlFromPosition(0, 0);
+ Control groupLabel = TypeUtils.GetField(resultControl, "GroupPanel").GetControlFromPosition(0, 0);
Assert.AreEqual(new EnumDisplayWrapper(assembly).DisplayName,
groupLabel.Text);
Assert.AreEqual(AssemblyCategoryGroupColorHelper.GetFailureMechanismAssemblyCategoryGroupColor(assembly),
groupLabel.BackColor);
}
-
- private static TableLayoutPanel GetGroupPanel(FailureMechanismAssemblyCategoryGroupControl resultControl)
- {
- return TypeUtils.GetField(resultControl, "GroupPanel");
- }
}
}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/FailureMechanismAssemblyControlTest.cs
===================================================================
diff -u -r96e729865d3978156ee7d869c1f45f51dae51bcd -rce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/FailureMechanismAssemblyControlTest.cs (.../FailureMechanismAssemblyControlTest.cs) (revision 96e729865d3978156ee7d869c1f45f51dae51bcd)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/FailureMechanismAssemblyControlTest.cs (.../FailureMechanismAssemblyControlTest.cs) (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using System.Drawing;
using System.Windows.Forms;
using Core.Common.TestUtil;
using Core.Common.Util;
@@ -29,7 +28,6 @@
using Ringtoets.AssemblyTool.Data;
using Ringtoets.Common.Forms.Controls;
using Ringtoets.Common.Forms.Helpers;
-using Ringtoets.Common.Forms.Properties;
using Ringtoets.Common.Forms.TypeConverters;
namespace Ringtoets.Common.Forms.Test.Controls
@@ -45,30 +43,7 @@
// Assert
Assert.AreEqual(2, resultControl.Controls.Count);
- Assert.IsInstanceOf(resultControl);
- Assert.IsTrue(resultControl.AutoSize);
- Assert.AreEqual(DockStyle.Left, resultControl.Dock);
-
- TableLayoutPanel groupPanel = GetGroupPanel(resultControl);
- Assert.AreEqual(1, groupPanel.ColumnCount);
- Assert.AreEqual(1, groupPanel.RowCount);
-
- var groupLabel = (BorderedLabel) groupPanel.GetControlFromPosition(0, 0);
- Assert.IsTrue(groupLabel.AutoSize);
- Assert.AreEqual(DockStyle.Fill, groupLabel.Dock);
- Assert.AreEqual(new Padding(5, 0, 5, 0), groupLabel.Padding);
-
- var errorProvider = TypeUtils.GetField(resultControl, "ErrorProvider");
- TestHelper.AssertImagesAreEqual(Resources.ErrorIcon.ToBitmap(), errorProvider.Icon.ToBitmap());
-
- TableLayoutPanel probabilityPanel = GetProbabilityPanel(resultControl);
- Assert.AreEqual(1, probabilityPanel.ColumnCount);
- Assert.AreEqual(1, probabilityPanel.RowCount);
-
- var probabilityLabel = (BorderedLabel) probabilityPanel.GetControlFromPosition(0, 0);
- Assert.IsTrue(probabilityLabel.AutoSize);
- Assert.AreEqual(DockStyle.Left, probabilityLabel.Dock);
- Assert.AreEqual(new Padding(5, 0, 5, 0), probabilityLabel.Padding);
+ Assert.IsInstanceOf(resultControl);
}
[Test]
@@ -98,8 +73,8 @@
resultControl.SetAssemblyResult(assembly);
// Assert
- Control groupLabel = GetGroupPanel(resultControl).GetControlFromPosition(0, 0);
- Control probabilityLabel = GetProbabilityPanel(resultControl).GetControlFromPosition(0, 0);
+ Control groupLabel = TypeUtils.GetField(resultControl, "GroupPanel").GetControlFromPosition(0, 0);
+ Control probabilityLabel = TypeUtils.GetField(resultControl, "probabilityPanel").GetControlFromPosition(0, 0);
Assert.AreEqual(new EnumDisplayWrapper(assembly.Group).DisplayName,
groupLabel.Text);
@@ -109,50 +84,5 @@
Assert.AreEqual(new NoProbabilityValueDoubleConverter().ConvertToString(assembly.Probability),
probabilityLabel.Text);
}
-
- [Test]
- public void SetError_ErrorNull_ThrowsArgumentNullException()
- {
- // Setup
- var resultControl = new FailureMechanismAssemblyControl();
-
- // Call
- TestDelegate test = () => resultControl.SetError(null);
-
- // Assert
- var exception = Assert.Throws(test);
- Assert.AreEqual("error", exception.ParamName);
- }
-
- [Test]
- public void SetError_WithError_SetsErrorOnControl()
- {
- // Setup
- const string error = "random error 123";
- var resultControl = new FailureMechanismAssemblyControl();
-
- // Call
- resultControl.SetError(error);
-
- // Assert
- var errorProvider = TypeUtils.GetField(resultControl, "ErrorProvider");
- Assert.AreEqual(error, errorProvider.GetError(resultControl));
-
- Control groupLabel = GetGroupPanel(resultControl).GetControlFromPosition(0, 0);
- Control probabilityLabel = GetProbabilityPanel(resultControl).GetControlFromPosition(0, 0);
- Assert.IsEmpty(groupLabel.Text);
- Assert.AreEqual(Color.White, groupLabel.BackColor);
- Assert.AreEqual("-", probabilityLabel.Text);
- }
-
- private static TableLayoutPanel GetProbabilityPanel(FailureMechanismAssemblyControl resultControl)
- {
- return TypeUtils.GetField(resultControl, "probabilityPanel");
- }
-
- private static TableLayoutPanel GetGroupPanel(FailureMechanismAssemblyControl resultControl)
- {
- return TypeUtils.GetField(resultControl, "GroupPanel");
- }
}
}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -rbfd888d1102f04ff8d56e2e90c0d4ebea559f2e3 -rce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision bfd888d1102f04ff8d56e2e90c0d4ebea559f2e3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
@@ -51,6 +51,7 @@
+
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTester.cs
===================================================================
diff -u -rbfd888d1102f04ff8d56e2e90c0d4ebea559f2e3 -rce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTester.cs (.../FailureMechanismAssemblyResultWithProbabilityControlTester.cs) (revision bfd888d1102f04ff8d56e2e90c0d4ebea559f2e3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTester.cs (.../FailureMechanismAssemblyResultWithProbabilityControlTester.cs) (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
@@ -207,7 +207,7 @@
private static BorderedLabel GetProbabilityLabelControl()
{
- return (BorderedLabel) new ControlTester("probabilityLabel").TheObject;
+ return (BorderedLabel) new ControlTester("ProbabilityLabel").TheObject;
}
private TView ShowFailureMechanismResultsView(TFailureMechanism failureMechanism)