Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailureMechanismProperties.cs =================================================================== diff -u -r013749240d7261d436b3b7a4424d4831a5441e55 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailureMechanismProperties.cs (.../ClosingStructuresFailureMechanismProperties.cs) (revision 013749240d7261d436b3b7a4424d4831a5441e55) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailureMechanismProperties.cs (.../ClosingStructuresFailureMechanismProperties.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -89,7 +89,7 @@ private static void NotifyAffectedObjects(IEnumerable affectedObjects) { - foreach (var affectedObject in affectedObjects) + foreach (IObservable affectedObject in affectedObjects) { affectedObject.NotifyObservers(); } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresFailureMechanismPropertiesTest.cs =================================================================== diff -u -raa79af94ee849144912d89ac3a6dc4742351646d -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresFailureMechanismPropertiesTest.cs (.../ClosingStructuresFailureMechanismPropertiesTest.cs) (revision aa79af94ee849144912d89ac3a6dc4742351646d) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresFailureMechanismPropertiesTest.cs (.../ClosingStructuresFailureMechanismPropertiesTest.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -331,7 +331,9 @@ } [Test] - public void DynamicVisibleValidationMethod_ForRelevantFailureMechanism_ReturnExpectedVisibility() + [TestCase(true)] + [TestCase(false)] + public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant) { // Setup var mocks = new MockRepository(); @@ -341,56 +343,24 @@ var properties = new ClosingStructuresFailureMechanismProperties( new ClosingStructuresFailureMechanism { - IsRelevant = true + IsRelevant = isRelevant }, changeHandler); // Call & Assert - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.C))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.N2A))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.GravitationalAcceleration))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorOvertoppingFlow))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorSubCriticalFlow))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorInflowVolume))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.C))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.N2A))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.GravitationalAcceleration))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorOvertoppingFlow))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorSubCriticalFlow))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorInflowVolume))); - mocks.VerifyAll(); - } - - [Test] - public void DynamicVisibleValidationMethod_ForIrrelevantFailureMechanism_ReturnExpectedVisibility() - { - // Setup - var mocks = new MockRepository(); - var changeHandler = mocks.Stub>(); - mocks.ReplayAll(); - - var properties = new ClosingStructuresFailureMechanismProperties( - new ClosingStructuresFailureMechanism - { - IsRelevant = false - }, - changeHandler); - - // Call & Assert - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.C))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.N2A))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.GravitationalAcceleration))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorOvertoppingFlow))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorSubCriticalFlow))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorInflowVolume))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); mocks.VerifyAll(); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs =================================================================== diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs (.../UseBreakWaterProperties.cs) (revision f861839e975251253e2ffd7bc3f0a1839b85534e) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs (.../UseBreakWaterProperties.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -144,7 +144,7 @@ private static void NotifyAffectedObjects(IEnumerable affectedObjects) { - foreach (var affectedObject in affectedObjects) + foreach (IObservable affectedObject in affectedObjects) { affectedObject.NotifyObservers(); } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseForeshoreProperties.cs =================================================================== diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseForeshoreProperties.cs (.../UseForeshoreProperties.cs) (revision f861839e975251253e2ffd7bc3f0a1839b85534e) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseForeshoreProperties.cs (.../UseForeshoreProperties.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -107,7 +107,7 @@ private static void NotifyAffectedObjects(IEnumerable affectedObjects) { - foreach (var affectedObject in affectedObjects) + foreach (IObservable affectedObject in affectedObjects) { affectedObject.NotifyObservers(); } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs =================================================================== diff -u -r58294671cbbde72fff978212cf62d3ce528169bd -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs (.../RingtoetsContextMenuBuilderTest.cs) (revision 58294671cbbde72fff978212cf62d3ce528169bd) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs (.../RingtoetsContextMenuBuilderTest.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -76,8 +76,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, - RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, + "&Map toevoegen", + "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.", RingtoetsFormsResources.AddFolderIcon); } mocks.VerifyAll(); @@ -118,8 +118,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.CalculationGroup_Add_Calculation, - RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip, + "Berekening &toevoegen", + "Voeg een nieuwe berekening toe aan deze berekeningsmap.", RingtoetsFormsResources.FailureMechanismIcon); } mocks.VerifyAll(); @@ -166,8 +166,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Clear_all_output, - RingtoetsFormsResources.CalculationGroup_ClearOutput_ToolTip, + "&Wis alle uitvoer...", + "Wis de uitvoer van alle berekeningen binnen deze berekeningsmap.", RingtoetsFormsResources.ClearIcon); } mocks.VerifyAll(); @@ -207,8 +207,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Clear_all_output, - RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, + "&Wis alle uitvoer...", + "Er zijn geen berekeningen met uitvoer om te wissen.", RingtoetsFormsResources.ClearIcon, false); } @@ -253,8 +253,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Clear_all_output, - RingtoetsFormsResources.Clear_all_output_ToolTip, + "&Wis alle uitvoer...", + "Wis de uitvoer van alle berekeningen binnen dit toetsspoor.", RingtoetsFormsResources.ClearIcon); } mocks.VerifyAll(); @@ -294,8 +294,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Clear_all_output, - RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, + "&Wis alle uitvoer...", + "Er zijn geen berekeningen met uitvoer om te wissen.", RingtoetsFormsResources.ClearIcon, false); } @@ -339,8 +339,8 @@ Assert.AreEqual(1, result.Items.Count); var checkboxIcon = isRelevant ? RingtoetsFormsResources.Checkbox_ticked : RingtoetsFormsResources.Checkbox_empty; TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant, - RingtoetsFormsResources.FailureMechanism_IsRelevant_Description, + "I&s relevant", + "Geeft aan of dit toetsspoor relevant is of niet.", checkboxIcon); } mocks.VerifyAll(); @@ -381,8 +381,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Clear_output, - RingtoetsFormsResources.Clear_output_ToolTip, + "&Wis uitvoer...", + "Wis de uitvoer van deze berekening.", RingtoetsFormsResources.ClearIcon); } mocks.VerifyAll(); @@ -423,8 +423,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Clear_output, - RingtoetsFormsResources.ClearOutput_No_output_to_clear, + "&Wis uitvoer...", + "Deze berekening heeft geen uitvoer om te wissen.", RingtoetsFormsResources.ClearIcon, false); } @@ -690,8 +690,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Calculate, - RingtoetsFormsResources.Calculate_ToolTip, + "Be&rekenen", + "Voer deze berekening uit.", RingtoetsFormsResources.CalculateIcon); } mocks.VerifyAll(); @@ -725,7 +725,7 @@ treeViewControl); var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder); - var errorMessage = "No valid data"; + const string errorMessage = "No valid data"; // Call ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformCalculationItem(calculation, calculationContext, null, context => errorMessage).Build(); @@ -735,7 +735,7 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Calculate, + "Be&rekenen", errorMessage, RingtoetsFormsResources.CalculateIcon, false); @@ -783,8 +783,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Validate, - RingtoetsFormsResources.Validate_ToolTip, + "&Valideren", + "Valideer de invoer voor deze berekening.", RingtoetsFormsResources.ValidateIcon); } mocks.VerifyAll(); @@ -818,7 +818,7 @@ treeViewControl); var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder); - var errorMessage = "No valid data"; + const string errorMessage = "No valid data"; // Call ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateCalculationItem(calculationContext, null, c => errorMessage).Build(); @@ -828,7 +828,7 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Validate, + "&Valideren", errorMessage, RingtoetsFormsResources.ValidateIcon, false); @@ -887,8 +887,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip, + "Alles be&rekenen", + "Voer alle berekeningen binnen deze berekeningsmap uit.", RingtoetsFormsResources.CalculateAllIcon); } mocks.VerifyAll(); @@ -930,8 +930,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, + "Alles be&rekenen", + "Er zijn geen berekeningen om uit te voeren.", RingtoetsFormsResources.CalculateAllIcon, false); } @@ -977,7 +977,7 @@ treeViewControl); var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder); - var errorMessage = "Additional validation failed."; + const string errorMessage = "Additional validation failed."; // Call ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build(); @@ -987,7 +987,7 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Calculate_all, + "Alles be&rekenen", errorMessage, RingtoetsFormsResources.CalculateAllIcon, false); @@ -1023,7 +1023,7 @@ treeViewControl); var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder); - var errorMessage = "Additional validation failed."; + const string errorMessage = "Additional validation failed."; // Call ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build(); @@ -1033,8 +1033,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, + "Alles be&rekenen", + "Er zijn geen berekeningen om uit te voeren.", RingtoetsFormsResources.CalculateAllIcon, false); } @@ -1092,8 +1092,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Validate_all, - RingtoetsFormsResources.CalculationGroup_Validate_all_ToolTip, + "Alles &valideren", + "Valideer alle berekeningen binnen deze berekeningsmap.", RingtoetsFormsResources.ValidateAllIcon); } mocks.VerifyAll(); @@ -1135,8 +1135,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Validate_all, - RingtoetsFormsResources.ValidateAll_No_calculations_to_validate, + "Alles &valideren", + "Er zijn geen berekeningen om te valideren.", RingtoetsFormsResources.ValidateAllIcon, false); } @@ -1182,7 +1182,7 @@ treeViewControl); var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder); - var errorMessage = "Additional validation failed."; + const string errorMessage = "Additional validation failed."; // Call ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInGroupItem(calculationGroupContext, null, context => errorMessage).Build(); @@ -1192,7 +1192,7 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Validate_all, + "Alles &valideren", errorMessage, RingtoetsFormsResources.ValidateAllIcon, false); @@ -1228,7 +1228,7 @@ treeViewControl); var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder); - var errorMessage = "Additional validation failed."; + const string errorMessage = "Additional validation failed."; // Call ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInGroupItem(calculationGroupContext, null, context => errorMessage).Build(); @@ -1238,8 +1238,8 @@ Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Validate_all, - RingtoetsFormsResources.ValidateAll_No_calculations_to_validate, + "Alles &valideren", + "Er zijn geen berekeningen om te valideren.", RingtoetsFormsResources.ValidateAllIcon, false); } @@ -1288,8 +1288,8 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.Calculate_all_ToolTip, + "Alles be&rekenen", + "Voer alle berekeningen binnen dit toetsspoor uit.", RingtoetsFormsResources.CalculateAllIcon); } mocks.VerifyAll(); @@ -1330,8 +1330,8 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, + "Alles be&rekenen", + "Er zijn geen berekeningen om uit te voeren.", RingtoetsFormsResources.CalculateAllIcon, false); } @@ -1369,7 +1369,7 @@ treeViewControl); var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder); - var errorMessage = "Additional validation failed."; + const string errorMessage = "Additional validation failed."; // Call ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => errorMessage).Build(); @@ -1378,7 +1378,7 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Calculate_all, + "Alles be&rekenen", errorMessage, RingtoetsFormsResources.CalculateAllIcon, false); @@ -1414,7 +1414,7 @@ treeViewControl); var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder); - var errorMessage = "Additional validation failed."; + const string errorMessage = "Additional validation failed."; // Call ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => errorMessage).Build(); @@ -1423,8 +1423,8 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, + "Alles be&rekenen", + "Er zijn geen berekeningen om uit te voeren.", RingtoetsFormsResources.CalculateAllIcon, false); } @@ -1473,8 +1473,8 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Validate_all, - RingtoetsFormsResources.FailureMechanism_Validate_all_ToolTip, + "Alles &valideren", + "Valideer alle berekeningen binnen dit toetsspoor.", RingtoetsFormsResources.ValidateAllIcon); } mocks.VerifyAll(); @@ -1515,8 +1515,8 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Validate_all, - RingtoetsFormsResources.ValidateAll_No_calculations_to_validate, + "Alles &valideren", + "Er zijn geen berekeningen om te valideren.", RingtoetsFormsResources.ValidateAllIcon, false); } @@ -1554,7 +1554,7 @@ treeViewControl); var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder); - var errorMessage = "Additional validation failed."; + const string errorMessage = "Additional validation failed."; // Call ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInFailureMechanismItem( @@ -1566,7 +1566,7 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Validate_all, + "Alles &valideren", errorMessage, RingtoetsFormsResources.ValidateAllIcon, false); @@ -1602,7 +1602,7 @@ treeViewControl); var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder); - var errorMessage = "Additional validation failed."; + const string errorMessage = "Additional validation failed."; // Call ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInFailureMechanismItem( @@ -1614,8 +1614,8 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); TestHelper.AssertContextMenuStripContainsItem(result, 0, - RingtoetsFormsResources.Validate_all, - RingtoetsFormsResources.ValidateAll_No_calculations_to_validate, + "Alles &valideren", + "Er zijn geen berekeningen om te valideren.", RingtoetsFormsResources.ValidateAllIcon, false); } @@ -1640,9 +1640,9 @@ FailureMechanism = failureMechanism; } - public CalculationGroup WrappedData { get; private set; } + public CalculationGroup WrappedData { get; } - public IFailureMechanism FailureMechanism { get; private set; } + public IFailureMechanism FailureMechanism { get; } } private class TestCalculationContext : Observable, ICalculationContext @@ -1653,9 +1653,9 @@ FailureMechanism = failureMechanism; } - public TestCalculation WrappedData { get; private set; } + public TestCalculation WrappedData { get; } - public IFailureMechanism FailureMechanism { get; private set; } + public IFailureMechanism FailureMechanism { get; } } private class TestCalculation : Observable, ICalculation Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneErosionFailureMechanismProperties.cs =================================================================== diff -u -r013749240d7261d436b3b7a4424d4831a5441e55 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneErosionFailureMechanismProperties.cs (.../DuneErosionFailureMechanismProperties.cs) (revision 013749240d7261d436b3b7a4424d4831a5441e55) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneErosionFailureMechanismProperties.cs (.../DuneErosionFailureMechanismProperties.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -103,7 +103,7 @@ private static void NotifyAffectedObjects(IEnumerable affectedObjects) { - foreach (var affectedObject in affectedObjects) + foreach (IObservable affectedObject in affectedObjects) { affectedObject.NotifyObservers(); } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs =================================================================== diff -u -r5364d9cba57e4d0eb5adeeef11648499fcc72f01 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs (.../DuneErosionFailureMechanismPropertiesTest.cs) (revision 5364d9cba57e4d0eb5adeeef11648499fcc72f01) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs (.../DuneErosionFailureMechanismPropertiesTest.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -290,7 +290,9 @@ } [Test] - public void DynamicVisibleValidationMethod_ForRelevantFailureMechanism_ReturnExpectedVisibility() + [TestCase(true)] + [TestCase(false)] + public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant) { // Setup var mocks = new MockRepository(); @@ -300,42 +302,17 @@ var properties = new DuneErosionFailureMechanismProperties( new DuneErosionFailureMechanism { - IsRelevant = true + IsRelevant = isRelevant }, changeHandler); // Call & Assert - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); - mocks.VerifyAll(); - } - - [Test] - public void DynamicVisibleValidationMethod_ForIrrelevantFailureMechanism_ReturnExpectedVisibility() - { - // Setup - var mocks = new MockRepository(); - var changeHandler = mocks.Stub>(); - mocks.ReplayAll(); - - var properties = new DuneErosionFailureMechanismProperties( - new DuneErosionFailureMechanism - { - IsRelevant = false - }, - changeHandler); - - // Call & Assert - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); mocks.VerifyAll(); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs =================================================================== diff -u -ra0500683a36518c9b3cd5bb74fee36b858dda96d -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs (.../GrassCoverErosionInwardsFailureMechanismContextProperties.cs) (revision a0500683a36518c9b3cd5bb74fee36b858dda96d) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs (.../GrassCoverErosionInwardsFailureMechanismContextProperties.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -109,7 +109,7 @@ private static void NotifyAffectedObjects(IEnumerable affectedObjects) { - foreach (var affectedObject in affectedObjects) + foreach (IObservable affectedObject in affectedObjects) { affectedObject.NotifyObservers(); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -r5364d9cba57e4d0eb5adeeef11648499fcc72f01 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs) (revision 5364d9cba57e4d0eb5adeeef11648499fcc72f01) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -333,7 +333,9 @@ } [Test] - public void DynamicVisibleValidationMethod_ForRelevantFailureMechanism_ReturnExpectedVisibility() + [TestCase(true)] + [TestCase(false)] + public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant) { // Setup var mocks = new MockRepository(); @@ -343,54 +345,23 @@ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism { - IsRelevant = true + IsRelevant = isRelevant }; var context = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties(context, changeHandler); // Call & Assert - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.FrunupModelFactor))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.FbFactor))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.FnFactor))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.FshallowModelFactor))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.FrunupModelFactor))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.FbFactor))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.FnFactor))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.FshallowModelFactor))); - mocks.VerifyAll(); - } - - [Test] - public void DynamicVisibleValidationMethod_ForIrrelevantFailureMechanism_ReturnExpectedVisibility() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - var changeHandler = mocks.Stub>(); - mocks.ReplayAll(); - - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism - { - IsRelevant = false - }; - var context = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); - - var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties(context, changeHandler); - - // Call & Assert - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.FrunupModelFactor))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.FbFactor))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.FnFactor))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.FshallowModelFactor))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); mocks.VerifyAll(); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs =================================================================== diff -u -ra322a3fd977d26be5370bacd52db52c7c5f70614 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs (.../GrassCoverErosionOutwardsFailureMechanismProperties.cs) (revision a322a3fd977d26be5370bacd52db52c7c5f70614) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs (.../GrassCoverErosionOutwardsFailureMechanismProperties.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -101,7 +101,7 @@ private static void NotifyAffectedObjects(IEnumerable affectedObjects) { - foreach (var affectedObject in affectedObjects) + foreach (IObservable affectedObject in affectedObjects) { affectedObject.NotifyObservers(); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs =================================================================== diff -u -r5364d9cba57e4d0eb5adeeef11648499fcc72f01 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision 5364d9cba57e4d0eb5adeeef11648499fcc72f01) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -285,7 +285,9 @@ } [Test] - public void DynamicVisibleValidationMethod_ForRelevantFailureMechanism_ReturnExpectedVisibility() + [TestCase(true)] + [TestCase(false)] + public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant) { // Setup var mocks = new MockRepository(); @@ -295,48 +297,20 @@ var properties = new GrassCoverErosionOutwardsFailureMechanismProperties( new GrassCoverErosionOutwardsFailureMechanism { - IsRelevant = true + IsRelevant = isRelevant }, changeHandler); // Call & Assert - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.A))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.B))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.C))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.A))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.B))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.C))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); - mocks.VerifyAll(); - } - - [Test] - public void DynamicVisibleValidationMethod_ForIrrelevantFailureMechanism_ReturnExpectedVisibility() - { - // Setup - var mocks = new MockRepository(); - var changeHandler = mocks.Stub>(); - mocks.ReplayAll(); - - var properties = new GrassCoverErosionOutwardsFailureMechanismProperties( - new GrassCoverErosionOutwardsFailureMechanism - { - IsRelevant = false - }, - changeHandler); - - // Call & Assert - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.A))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.B))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.C))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); mocks.VerifyAll(); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismProperties.cs =================================================================== diff -u -rdcf1ab6a4dc050223986ee003577d22c36fb6bc4 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismProperties.cs (.../HeightStructuresFailureMechanismProperties.cs) (revision dcf1ab6a4dc050223986ee003577d22c36fb6bc4) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismProperties.cs (.../HeightStructuresFailureMechanismProperties.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -183,7 +183,7 @@ private static void NotifyAffectedObjects(IEnumerable affectedObjects) { - foreach (var affectedObject in affectedObjects) + foreach (IObservable affectedObject in affectedObjects) { affectedObject.NotifyObservers(); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismPropertiesTest.cs =================================================================== diff -u -raa79af94ee849144912d89ac3a6dc4742351646d -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismPropertiesTest.cs (.../HeightStructuresFailureMechanismPropertiesTest.cs) (revision aa79af94ee849144912d89ac3a6dc4742351646d) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismPropertiesTest.cs (.../HeightStructuresFailureMechanismPropertiesTest.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -301,7 +301,9 @@ } [Test] - public void DynamicVisibleValidationMethod_ForRelevantFailureMechanism_ReturnExpectedVisibility() + [TestCase(true)] + [TestCase(false)] + public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant) { // Setup var mocks = new MockRepository(); @@ -311,48 +313,20 @@ var properties = new HeightStructuresFailureMechanismProperties( new HeightStructuresFailureMechanism { - IsRelevant = true + IsRelevant = isRelevant }, changeHandler); // Call & Assert - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.GravitationalAcceleration))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorOvertoppingFlow))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.GravitationalAcceleration))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorOvertoppingFlow))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume))); - mocks.VerifyAll(); - } - - [Test] - public void DynamicVisibleValidationMethod_ForIrrelevantFailureMechanism_ReturnExpectedVisibility() - { - // Setup - var mocks = new MockRepository(); - var changeHandler = mocks.Stub>(); - mocks.ReplayAll(); - - var properties = new HeightStructuresFailureMechanismProperties( - new HeightStructuresFailureMechanism - { - IsRelevant = false - }, - changeHandler); - - // Call & Assert - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.GravitationalAcceleration))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorOvertoppingFlow))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); mocks.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -r5364d9cba57e4d0eb5adeeef11648499fcc72f01 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs (.../StandAloneFailureMechanismContextPropertiesTest.cs) (revision 5364d9cba57e4d0eb5adeeef11648499fcc72f01) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs (.../StandAloneFailureMechanismContextPropertiesTest.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -74,7 +74,7 @@ [Test] [TestCase(true)] [TestCase(false)] - public void Constructor_IsRelevantTrue_PropertiesHaveExpectedAttributesValues(bool isRelevant) + public void Constructor_Always_PropertiesHaveExpectedAttributesValues(bool isRelevant) { // Setup var mockRepository = new MockRepository(); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs =================================================================== diff -u -r386bafbe025b31f2b1351a7aa67161119c9c9d76 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs (.../PipingFailureMechanismContextProperties.cs) (revision 386bafbe025b31f2b1351a7aa67161119c9c9d76) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs (.../PipingFailureMechanismContextProperties.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -104,7 +104,7 @@ private static void NotifyAffectedObjects(IEnumerable affectedObjects) { - foreach (var affectedObject in affectedObjects) + foreach (IObservable affectedObject in affectedObjects) { affectedObject.NotifyObservers(); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -r5364d9cba57e4d0eb5adeeef11648499fcc72f01 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision 5364d9cba57e4d0eb5adeeef11648499fcc72f01) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -478,7 +478,9 @@ } [Test] - public void DynamicVisibleValidationMethod_ForRelevantFailureMechanism_ReturnExpectedVisibility() + [TestCase(true)] + [TestCase(false)] + public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant) { // Setup var mocks = new MockRepository(); @@ -488,70 +490,31 @@ var pipingFailureMechanism = new PipingFailureMechanism { - IsRelevant = true + IsRelevant = isRelevant }; var properties = new PipingFailureMechanismContextProperties( new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection), changeHandler); // Call & Assert - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.CriticalHeaveGradient))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.WaterVolumetricWeight))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.A))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.B))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.SandParticlesVolumicWeight))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.WhitesDragCoefficient))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.BeddingAngle))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.WaterKinematicViscosity))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Gravity))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.MeanDiameter70))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.SellmeijerReductionFactor))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.UpliftModelFactor))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.SellmeijerModelFactor))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.CriticalHeaveGradient))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.WaterVolumetricWeight))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.A))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.B))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.SandParticlesVolumicWeight))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.WhitesDragCoefficient))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.BeddingAngle))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.WaterKinematicViscosity))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.Gravity))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.MeanDiameter70))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.SellmeijerReductionFactor))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.UpliftModelFactor))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.SellmeijerModelFactor))); - mocks.VerifyAll(); - } - - [Test] - public void DynamicVisibleValidationMethod_ForIrrelevantFailureMechanism_ReturnExpectedVisibility() - { - // Setup - var mocks = new MockRepository(); - var changeHandler = mocks.Stub>(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var pipingFailureMechanism = new PipingFailureMechanism - { - IsRelevant = false - }; - var properties = new PipingFailureMechanismContextProperties( - new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection), - changeHandler); - - // Call & Assert - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.CriticalHeaveGradient))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.WaterVolumetricWeight))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.A))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.B))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.SandParticlesVolumicWeight))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.WhitesDragCoefficient))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.BeddingAngle))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.WaterKinematicViscosity))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.Gravity))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.MeanDiameter70))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.SellmeijerReductionFactor))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.UpliftModelFactor))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.SellmeijerModelFactor))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); mocks.VerifyAll(); Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs =================================================================== diff -u -r29b6e326e4a729daa7f88c6a54b2fcd7c5e2af83 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision 29b6e326e4a729daa7f88c6a54b2fcd7c5e2af83) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -111,7 +111,7 @@ private static void NotifyAffectedObjects(IEnumerable affectedObjects) { - foreach (var affectedObject in affectedObjects) + foreach (IObservable affectedObject in affectedObjects) { affectedObject.NotifyObservers(); } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs =================================================================== diff -u -r5364d9cba57e4d0eb5adeeef11648499fcc72f01 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision 5364d9cba57e4d0eb5adeeef11648499fcc72f01) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -319,7 +319,9 @@ } [Test] - public void DynamicVisibleValidationMethod_ForRelevantFailureMechanism_ReturnExpectedVisibility() + [TestCase(true)] + [TestCase(false)] + public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant) { // Setup var mocks = new MockRepository(); @@ -329,52 +331,22 @@ var properties = new StabilityPointStructuresFailureMechanismProperties( new StabilityPointStructuresFailureMechanism { - IsRelevant = true + IsRelevant = isRelevant }, changeHandler); // Call & Assert - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.GravitationalAcceleration))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorSubCriticalFlow))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorCollisionLoad))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorLoadEffect))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.GravitationalAcceleration))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorSubCriticalFlow))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorCollisionLoad))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorLoadEffect))); - mocks.VerifyAll(); - } - - [Test] - public void DynamicVisibleValidationMethod_ForIrrelevantFailureMechanism_ReturnExpectedVisibility() - { - // Setup - var mocks = new MockRepository(); - var changeHandler = mocks.Stub>(); - mocks.ReplayAll(); - - var properties = new StabilityPointStructuresFailureMechanismProperties( - new StabilityPointStructuresFailureMechanism - { - IsRelevant = false - }, - changeHandler); - - // Call & Assert - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.LengthEffect))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.GravitationalAcceleration))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorSubCriticalFlow))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorCollisionLoad))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorLoadEffect))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); mocks.VerifyAll(); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverFailureMechanismPropertiesTest.cs =================================================================== diff -u -r5364d9cba57e4d0eb5adeeef11648499fcc72f01 -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverFailureMechanismPropertiesTest.cs (.../StabilityStoneCoverFailureMechanismPropertiesTest.cs) (revision 5364d9cba57e4d0eb5adeeef11648499fcc72f01) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverFailureMechanismPropertiesTest.cs (.../StabilityStoneCoverFailureMechanismPropertiesTest.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -162,46 +162,27 @@ } [Test] - public void DynamicVisibleValidationMethod_ForRelevantFailureMechanism_ReturnExpectedVisibility() + [TestCase(true)] + [TestCase(false)] + public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant) { // Setup var properties = new StabilityStoneCoverFailureMechanismProperties { Data = new StabilityStoneCoverFailureMechanism { - IsRelevant = true + IsRelevant = isRelevant } }; // Call & Assert Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Blocks))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Columns))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); - } + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.Blocks))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.Columns))); - [Test] - public void DynamicVisibleValidationMethod_ForIrrelevantFailureMechanism_ReturnExpectedVisibility() - { - // Setup - var properties = new StabilityStoneCoverFailureMechanismProperties - { - Data = new StabilityStoneCoverFailureMechanism - { - IsRelevant = false - } - }; - - // Call & Assert - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.Blocks))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.Columns))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); } } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs =================================================================== diff -u -r8cfcc81cd26cdeefad5d8bd12ea638f0419748ee -r6fe1ec68fba200ca6e292393329035f4bebe9a88 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs (.../WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs) (revision 8cfcc81cd26cdeefad5d8bd12ea638f0419748ee) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs (.../WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs) (revision 6fe1ec68fba200ca6e292393329035f4bebe9a88) @@ -168,48 +168,28 @@ } [Test] - public void DynamicVisibleValidationMethod_ForRelevantFailureMechanism_ReturnExpectedVisibility() + [TestCase(true)] + [TestCase(false)] + public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant) { // Setup var properties = new WaveImpactAsphaltCoverFailureMechanismProperties { Data = new WaveImpactAsphaltCoverFailureMechanism { - IsRelevant = true + IsRelevant = isRelevant } }; // Call & Assert - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.A))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.B))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.C))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); - } + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.A))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.B))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.C))); - [Test] - public void DynamicVisibleValidationMethod_ForIrrelevantFailureMechanism_ReturnExpectedVisibility() - { - // Setup - var properties = new WaveImpactAsphaltCoverFailureMechanismProperties - { - Data = new WaveImpactAsphaltCoverFailureMechanism - { - IsRelevant = false - } - }; - - // Call & Assert - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.A))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.B))); - Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(properties.C))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); } }