Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PresentationObjects/DuneLocationCalculationsGroupContext.cs =================================================================== diff -u -rb037846a0ba3496f374b0dc28ca4fc28dd2c8275 -r2fa288c2dca73f346a31c54f2ac2c89b67387ca9 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PresentationObjects/DuneLocationCalculationsGroupContext.cs (.../DuneLocationCalculationsGroupContext.cs) (revision b037846a0ba3496f374b0dc28ca4fc28dd2c8275) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PresentationObjects/DuneLocationCalculationsGroupContext.cs (.../DuneLocationCalculationsGroupContext.cs) (revision 2fa288c2dca73f346a31c54f2ac2c89b67387ca9) @@ -36,7 +36,7 @@ /// /// Creates a new instance of . /// - /// The calculations the context belongs to. + /// The calculations wrapped by the context. /// The failure mechanism the context belongs to. /// The the context belongs to. /// Thrown when any parameter is null. Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationsViewBase.Designer.cs =================================================================== diff -u -r60e31a4d64f102398b83b082294299d0ce44a4a8 -r2fa288c2dca73f346a31c54f2ac2c89b67387ca9 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationsViewBase.Designer.cs (.../DuneLocationCalculationsViewBase.Designer.cs) (revision 60e31a4d64f102398b83b082294299d0ce44a4a8) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationsViewBase.Designer.cs (.../DuneLocationCalculationsViewBase.Designer.cs) (revision 2fa288c2dca73f346a31c54f2ac2c89b67387ca9) @@ -106,7 +106,7 @@ this.CalculateForSelectedButtonErrorProvider.Icon = Common.Forms.Properties.Resources.warning; this.CalculateForSelectedButtonErrorProvider.SetIconPadding(CalculateForSelectedButton, 2); // - // LocationsView + // DuneLocationCalculationsViewBase // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismExtensionsTest.cs =================================================================== diff -u -r9ba166eaa60dfffd4eca628cfa8f45a022f7aa52 -r2fa288c2dca73f346a31c54f2ac2c89b67387ca9 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismExtensionsTest.cs (.../DuneErosionFailureMechanismExtensionsTest.cs) (revision 9ba166eaa60dfffd4eca628cfa8f45a022f7aa52) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismExtensionsTest.cs (.../DuneErosionFailureMechanismExtensionsTest.cs) (revision 2fa288c2dca73f346a31c54f2ac2c89b67387ca9) @@ -34,6 +34,8 @@ [TestFixture] public class DuneErosionFailureMechanismExtensionsTest { + private const double failureMechanismSpecificNormFactor = 2.15; + [Test] public void GetNorm_FailureMechanismNull_ThrowArgumentNullException() { @@ -106,7 +108,6 @@ private static IEnumerable GetNormConfigurationPerFailureMechanismCategoryType() { - const double failureMechanismSpecificNormFactor = 2.15; const double signalingNorm = 0.002; const double lowerLimitNorm = 0.005; @@ -163,7 +164,7 @@ private static double GetMechanismSpecificNorm(DuneErosionFailureMechanism failureMechanism, double norm) { - return 2.15 * norm * (failureMechanism.Contribution / 100) / failureMechanism.GeneralInput.N; + return failureMechanismSpecificNormFactor * norm * (failureMechanism.Contribution / 100) / failureMechanism.GeneralInput.N; } } } \ No newline at end of file Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewBaseTest.cs =================================================================== diff -u -r4e7b2d7986296427d9add574d83b1268505d394e -r2fa288c2dca73f346a31c54f2ac2c89b67387ca9 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewBaseTest.cs (.../DuneLocationCalculationsViewBaseTest.cs) (revision 4e7b2d7986296427d9add574d83b1268505d394e) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewBaseTest.cs (.../DuneLocationCalculationsViewBaseTest.cs) (revision 2fa288c2dca73f346a31c54f2ac2c89b67387ca9) @@ -56,7 +56,7 @@ public void DefaultConstructor_DefaultValues() { // Call - using (var view = new TestLocationCalculationsView()) + using (var view = new TestDuneLocationCalculationsView()) { // Assert Assert.IsInstanceOf(view); @@ -71,7 +71,7 @@ public void Constructor_CalculateAllButtonCorrectlyInitialized() { // Setup & Call - TestLocationCalculationsView view = ShowTestCalculatableView(); + TestDuneLocationCalculationsView view = ShowTestCalculatableView(); // Assert var button = (Button) view.Controls.Find("CalculateForSelectedButton", true)[0]; @@ -82,7 +82,7 @@ public void OnLoad_DataGridViewCorrectlyInitialized() { // Setup & Call - TestLocationCalculationsView view = ShowTestCalculatableView(); + TestDuneLocationCalculationsView view = ShowTestCalculatableView(); // Assert var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0]; @@ -100,7 +100,7 @@ public void GivenFullyConfiguredView_WhenSelectingCellInRow_ThenSelectionChangedFired() { // Given - TestLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); + TestDuneLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); var createdSelection = new object(); view.CreateForSelection = createdSelection; @@ -122,7 +122,7 @@ public void Selection_Always_ReturnsCreatedSelectionObject() { // Setup - TestLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); + TestDuneLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); var createdSelection = new object(); view.CreateForSelection = createdSelection; @@ -138,7 +138,7 @@ public void SelectAllButton_SelectAllButtonClicked_AllCalculatableItemsSelected() { // Setup - TestLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); + TestDuneLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0]; DataGridViewRowCollection rows = dataGridView.Rows; @@ -160,7 +160,7 @@ public void DeselectAllButton_AllCalculatableItemsSelectedDeselectAllButtonClicked_AllCalculatableItemsNotSelected() { // Setup - TestLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); + TestDuneLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0]; var button = new ButtonTester("DeselectAllButton", testForm); @@ -187,7 +187,7 @@ public void GivenFullyConfiguredView_WhenNoRowsSelected_ThenCalculateForSelectedButtonDisabledAndErrorMessageProvided() { // Given & When - TestLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); + TestDuneLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); // Then var button = (Button) view.Controls.Find("CalculateForSelectedButton", true)[0]; @@ -200,7 +200,7 @@ public void GivenFullyConfiguredView_WhenRowsSelected_ThenCalculateForSelectedButtonEnabledAndNoErrorMessageProvided() { // Given - TestLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); + TestDuneLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0]; // When @@ -217,7 +217,7 @@ public void CalculateForSelectedButton_OneSelected_CallsCalculateHandleCalculateSelectedObjects() { // Setup - TestLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); + TestDuneLocationCalculationsView view = ShowFullyConfiguredTestCalculatableView(); var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0]; @@ -235,18 +235,18 @@ Assert.AreEqual(expectedObject, view.ObjectsToCalculate.First()); } - private TestLocationCalculationsView ShowTestCalculatableView() + private TestDuneLocationCalculationsView ShowTestCalculatableView() { - var view = new TestLocationCalculationsView(); + var view = new TestDuneLocationCalculationsView(); testForm.Controls.Add(view); testForm.Show(); return view; } - private TestLocationCalculationsView ShowFullyConfiguredTestCalculatableView() + private TestDuneLocationCalculationsView ShowFullyConfiguredTestCalculatableView() { - TestLocationCalculationsView view = ShowTestCalculatableView(); + TestDuneLocationCalculationsView view = ShowTestCalculatableView(); view.Data = new[] { new TestCalculatableObject(), @@ -269,11 +269,11 @@ public bool IsChecked { get; } } - private class TestLocationCalculationsView : DuneLocationCalculationsViewBase + private class TestDuneLocationCalculationsView : DuneLocationCalculationsViewBase { private IEnumerable data; - public TestLocationCalculationsView() + public TestDuneLocationCalculationsView() { ObjectsToCalculate = new List(); } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r96238ba8b5baef941ae8a1ca49a431f1c9e4800d -r2fa288c2dca73f346a31c54f2ac2c89b67387ca9 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision 96238ba8b5baef941ae8a1ca49a431f1c9e4800d) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision 2fa288c2dca73f346a31c54f2ac2c89b67387ca9) @@ -40,6 +40,8 @@ [TestFixture] public class DuneLocationCalculationsGroupContextTreeNodeInfoTest { + private const double failureMechanismSpecificNormFactor = 2.15; + [Test] public void Initialized_Always_ExpectedPropertiesSet() { @@ -148,7 +150,6 @@ // Setup const double signalingNorm = 0.002; const double lowerLimitNorm = 0.005; - const double failureMechanismSpecificNormFactor = 2.15; var assessmentSection = new AssessmentSectionStub(); assessmentSection.FailureMechanismContribution.LowerLimitNorm = lowerLimitNorm; @@ -231,7 +232,7 @@ private static double GetExpectedNorm(DuneErosionFailureMechanism failureMechanism, double norm) { - return 2.15 * norm * (failureMechanism.Contribution / 100) / failureMechanism.GeneralInput.N; + return failureMechanismSpecificNormFactor * norm * (failureMechanism.Contribution / 100) / failureMechanism.GeneralInput.N; } private static TreeNodeInfo GetInfo(DuneErosionPlugin plugin)