Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs
===================================================================
diff -u -re5d2b62a6626e9d34433859f6dccfcf5a1eff783 -r9ecab680237a9e35a1c87fc4bf43cc8ee5070784
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision e5d2b62a6626e9d34433859f6dccfcf5a1eff783)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision 9ecab680237a9e35a1c87fc4bf43cc8ee5070784)
@@ -43,7 +43,7 @@
/// section result. May be null if the section result does not have a calculation set.
/// Thrown when is null.
public static void SetDetailedAssessmentError(DataGridViewCell dataGridViewCell,
- SimpleAssessmentResultType simpleAssessmentResult,
+ SimpleAssessmentResultType simpleAssessmentResult,
double detailedAssessmentProbability,
ICalculation normativeCalculation)
{
@@ -72,7 +72,7 @@
/// section result. May be null if the section result does not have a calculation set.
/// Thrown when is null.
public static void SetDetailedAssessmentError(DataGridViewCell dataGridViewCell,
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult,
+ SimpleAssessmentResultValidityOnlyType simpleAssessmentResult,
double detailedAssessmentProbability,
ICalculation normativeCalculation)
{
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj
===================================================================
diff -u -rfb1c36c5f324d0b72015d813d8ce50e8145b3621 -r9ecab680237a9e35a1c87fc4bf43cc8ee5070784
--- Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj (.../Ringtoets.Common.Service.csproj) (revision fb1c36c5f324d0b72015d813d8ce50e8145b3621)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj (.../Ringtoets.Common.Service.csproj) (revision 9ecab680237a9e35a1c87fc4bf43cc8ee5070784)
@@ -67,16 +67,6 @@
Core.Common.Util
False
-
- {420ed9c3-0c33-47ea-b893-121a9c0db4f1}
- Ringtoets.AssemblyTool.Data
- False
-
-
- {358b6da2-a1df-477f-b6ac-c30204265cb0}
- Ringtoets.AssemblyTool.KernelWrapper
- False
-
{888D4097-8BC2-4703-9FB1-8744C94D525E}
Ringtoets.HydraRing.Calculation
@@ -92,11 +82,6 @@
Ringtoets.Common.IO
False
-
- {6A074D65-A81C-4C1C-8E24-F36C916E4ED7}
- Ringtoets.Common.Util
- False
-
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -r0db96e46f04618fc4535b6992b084652663545fd -r9ecab680237a9e35a1c87fc4bf43cc8ee5070784
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 0db96e46f04618fc4535b6992b084652663545fd)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 9ecab680237a9e35a1c87fc4bf43cc8ee5070784)
@@ -119,6 +119,31 @@
}
}
+ [Test]
+ public void GivenFailureMechanismResultView_WhenSingleFailureMechanismSectionResultNotifiesObservers_ThenCellFormattingEventFired()
+ {
+ // Given
+ TestFailureMechanismSectionResult sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult();
+
+ var sectionResults = new ObservableList
+ {
+ sectionResult
+ };
+
+ using (ShowFailureMechanismResultsView(sectionResults))
+ {
+ var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+ var cellFormattingEventFired = false;
+ dataGridView.CellFormatting += (sender, args) => cellFormattingEventFired = true;
+
+ // When
+ sectionResult.NotifyObservers();
+
+ // Then
+ Assert.IsTrue(cellFormattingEventFired);
+ }
+ }
+
private TestFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable sectionResults)
{
var failureMechanismResultView = new TestFailureMechanismResultView(sectionResults, new TestFailureMechanism());
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj
===================================================================
diff -u -rfb1c36c5f324d0b72015d813d8ce50e8145b3621 -r9ecab680237a9e35a1c87fc4bf43cc8ee5070784
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj (.../Ringtoets.Common.Service.Test.csproj) (revision fb1c36c5f324d0b72015d813d8ce50e8145b3621)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj (.../Ringtoets.Common.Service.Test.csproj) (revision 9ecab680237a9e35a1c87fc4bf43cc8ee5070784)
@@ -79,18 +79,6 @@
{D749EE4C-CE50-4C17-BF01-9A953028C126}
Core.Common.TestUtil
-
- {420ed9c3-0c33-47ea-b893-121a9c0db4f1}
- Ringtoets.AssemblyTool.Data
-
-
- {358b6da2-a1df-477f-b6ac-c30204265cb0}
- Ringtoets.AssemblyTool.KernelWrapper
-
-
- {0ab432bb-e2cc-42ea-a72c-7afef7536b38}
- Ringtoets.AssemblyTool.KernelWrapper.TestUtil
-
{888D4097-8BC2-4703-9FB1-8744C94D525E}
Ringtoets.HydraRing.Calculation
Index: Ringtoets/Common/test/Ringtoets.Common.Util.Test/StructuresHelperTest.cs
===================================================================
diff -u -r9a637f9e1783f766a92c32ae45ebce60710e4c05 -r9ecab680237a9e35a1c87fc4bf43cc8ee5070784
--- Ringtoets/Common/test/Ringtoets.Common.Util.Test/StructuresHelperTest.cs (.../StructuresHelperTest.cs) (revision 9a637f9e1783f766a92c32ae45ebce60710e4c05)
+++ Ringtoets/Common/test/Ringtoets.Common.Util.Test/StructuresHelperTest.cs (.../StructuresHelperTest.cs) (revision 9ecab680237a9e35a1c87fc4bf43cc8ee5070784)
@@ -59,7 +59,7 @@
{
InputParameters =
{
- Structure = new TestStructure("anId", "aName", new Point2D(1.1, 2.2))
+ Structure = new TestStructure()
}
};