Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs =================================================================== diff -u -r40ab5f9e9cdd69b66f67b1f2fdd1b503aecc24e8 -r4bd863e75942710beedfe1ea7c2c5a097b46497f --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 40ab5f9e9cdd69b66f67b1f2fdd1b503aecc24e8) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 4bd863e75942710beedfe1ea7c2c5a097b46497f) @@ -95,7 +95,6 @@ if (affectedObjects.Any()) { log.Info(Resources.FailureMechanismContributionNormChangeHandler_Waveheight_and_design_water_level_results_cleared); - return affectedObjects; } return Enumerable.Empty(); Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -rb41f4c465f094e91312ffd90174e765417b28ba9 -r4bd863e75942710beedfe1ea7c2c5a097b46497f --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b41f4c465f094e91312ffd90174e765417b28ba9) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4bd863e75942710beedfe1ea7c2c5a097b46497f) @@ -82,9 +82,9 @@ } /// - /// Looks up a localized string similar to Na het aanpassen van het trajecttype zullen alle rekenresultaten van alle toetssporen gewist worden. + /// Looks up a localized string similar to Als u het trajecttype aanpast, dan worden alle rekenresultaten van alle relevante toetssporen verwijderd. /// - ///Wilt u doorgaan?. + ///Weet u zeker dat u wilt doorgaan?. /// public static string AssessmentSectionCompositionChangeHandler_Confirm_change_composition_and_clear_dependent_data { get { @@ -140,9 +140,9 @@ } /// - /// Looks up a localized string similar to Na het aanpassen van de norm zullen alle rekenresultaten van hydraulische randvoorwaarden en faalmechanismen verwijderd worden. + /// Looks up a localized string similar to Als u de norm aanpast, dan worden alle rekenresultaten van alle hydraulische randvoorwaarden en toetssporen verwijderd. /// - ///Wilt u doorgaan?. + ///Weet u zeker dat u wilt doorgaan?. /// public static string FailureMechanismContributionNormChangeHandler_Confirm_change_norm_and_clear_dependent_data { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -rb41f4c465f094e91312ffd90174e765417b28ba9 -r4bd863e75942710beedfe1ea7c2c5a097b46497f --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision b41f4c465f094e91312ffd90174e765417b28ba9) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 4bd863e75942710beedfe1ea7c2c5a097b46497f) @@ -154,19 +154,19 @@ Alle berekende resultaten voor alle hydraulische randvoorwaardenlocaties zijn verwijderd. - Na het aanpassen van de norm zullen alle rekenresultaten van hydraulische randvoorwaarden en faalmechanismen verwijderd worden. + Als u de norm aanpast, dan worden alle rekenresultaten van alle hydraulische randvoorwaarden en toetssporen verwijderd. -Wilt u doorgaan? +Weet u zeker dat u wilt doorgaan? - - Na het aanpassen van het trajecttype zullen alle rekenresultaten van alle toetssporen gewist worden. - -Wilt u doorgaan? - Achtergrondkaart Alle berekende hydraulische randvoorwaarden van de relevante toetssporen zijn verwijderd. + + Als u het trajecttype aanpast, dan worden alle rekenresultaten van alle relevante toetssporen verwijderd. + +Weet u zeker dat u wilt doorgaan? + \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs =================================================================== diff -u -r125050b9366dde4c7ddf104fb38e1993eb8143c5 -r4bd863e75942710beedfe1ea7c2c5a097b46497f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision 125050b9366dde4c7ddf104fb38e1993eb8143c5) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision 4bd863e75942710beedfe1ea7c2c5a097b46497f) @@ -71,9 +71,10 @@ // Assert Assert.AreEqual("Bevestigen", title); - string expectedMessage = "Na het aanpassen van het trajecttype zullen alle rekenresultaten van alle toetssporen gewist worden." + Environment.NewLine + - Environment.NewLine + - "Wilt u doorgaan?"; + string expectedMessage = "Als u het trajecttype aanpast, dan worden alle rekenresultaten van alle relevante toetssporen verwijderd." + + Environment.NewLine + + Environment.NewLine + + "Weet u zeker dat u wilt doorgaan?"; Assert.AreEqual(expectedMessage, message); } @@ -213,8 +214,6 @@ TestHelper.AssertLogMessagesAreGenerated(call, expectedMessage, 2); Assert.AreEqual(newComposition, assessmentSection.Composition); - - // Assert AssertCorrectOutputClearedWhenCompositionDune(unaffectedObjects, assessmentSection); CollectionAssert.AreEquivalent(expectedAffectedObjects, affectedObjects); @@ -235,7 +234,7 @@ [TestCase(AssessmentSectionComposition.Dune, AssessmentSectionComposition.Dike, TestName = "ChangeComposition_ChangeToNonDuneComposition_ChangeCompositionClearRelevantOutputReturnsAllAffectedObjects(Dune,Dike)")] [TestCase(AssessmentSectionComposition.Dune, AssessmentSectionComposition.DikeAndDune, TestName = "ChangeComposition_ChangeToNonDuneComposition_ChangeCompositionClearRelevantOutputReturnsAllAffectedObjects(Dune,DikeDune)")] public void ChangeComposition_ChangeToNonDuneComposition_ChangeCompositionAndClearAllLocationOutputAndReturnsAllAffectedObjects(AssessmentSectionComposition oldComposition, - AssessmentSectionComposition newComposition) + AssessmentSectionComposition newComposition) { // Setup AssessmentSection assessmentSection = TestDataGenerator.GetFullyConfiguredAssessmentSection(oldComposition); @@ -264,11 +263,8 @@ Action call = () => affectedObjects = handler.ChangeComposition(assessmentSection, newComposition); // Assert - string[] expectedMessage = - { - "Alle berekende hydraulische randvoorwaarden van de relevante toetssporen zijn verwijderd." - }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedMessage, 1); + string expectedMessage = "Alle berekende hydraulische randvoorwaarden van de relevante toetssporen zijn verwijderd."; + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.AreEqual(newComposition, assessmentSection.Composition); @@ -363,12 +359,12 @@ .First(); IEnumerable expectedAffectedObjects = duneErosionFailureMechanism.DuneLocations - .Concat(new IObservable[] - { + .Concat(new IObservable[] + { assessmentSection, duneErosionFailureMechanism.DuneLocations - }) - .ToList(); + }) + .ToList(); var handler = new AssessmentSectionCompositionChangeHandler(); @@ -429,7 +425,6 @@ // Assert TestHelper.AssertLogMessageIsGenerated(call, "De resultaten van 24 berekeningen zijn verwijderd.", 1); - Assert.AreEqual(newComposition, assessmentSection.Composition); // Assert @@ -459,7 +454,7 @@ .Where(calc => calc.HasOutput) .ToList(); - IObservable[] expectedAffectedObjects = + IObservable[] expectedAffectedObjects = { assessmentSection }; Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs =================================================================== diff -u -r40ab5f9e9cdd69b66f67b1f2fdd1b503aecc24e8 -r4bd863e75942710beedfe1ea7c2c5a097b46497f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 40ab5f9e9cdd69b66f67b1f2fdd1b503aecc24e8) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 4bd863e75942710beedfe1ea7c2c5a097b46497f) @@ -27,7 +27,6 @@ using NUnit.Extensions.Forms; using NUnit.Framework; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.DuneErosion.Data; using Ringtoets.Integration.Data; @@ -72,10 +71,10 @@ // Assert Assert.AreEqual("Bevestigen", title); - string expectedMessage = "Na het aanpassen van de norm zullen alle rekenresultaten van hydraulische randvoorwaarden en faalmechanismen verwijderd worden." + string expectedMessage = "Als u de norm aanpast, dan worden alle rekenresultaten van alle hydraulische randvoorwaarden en toetssporen verwijderd." + Environment.NewLine + Environment.NewLine + - "Wilt u doorgaan?"; + "Weet u zeker dat u wilt doorgaan?"; Assert.AreEqual(expectedMessage, message); } Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs =================================================================== diff -u -r125050b9366dde4c7ddf104fb38e1993eb8143c5 -r4bd863e75942710beedfe1ea7c2c5a097b46497f --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 125050b9366dde4c7ddf104fb38e1993eb8143c5) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 4bd863e75942710beedfe1ea7c2c5a097b46497f) @@ -297,15 +297,15 @@ failureMechanism.CalculationsGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation); failureMechanism.CalculationsGroup.Children.Add(calculationWithHydraulicBoundaryLocation); failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup - { - Children = - { - subCalculation, - subCalculationWithOutput, - subCalculationWithOutputAndHydraulicBoundaryLocation, - subCalculationWithHydraulicBoundaryLocation - } - }); + { + Children = + { + subCalculation, + subCalculationWithOutput, + subCalculationWithOutputAndHydraulicBoundaryLocation, + subCalculationWithHydraulicBoundaryLocation + } + }); var section1 = new FailureMechanismSection("1", new[] @@ -501,15 +501,15 @@ failureMechanism.CalculationsGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation); failureMechanism.CalculationsGroup.Children.Add(calculationWithHydraulicBoundaryLocation); failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup - { - Children = - { - subCalculation, - subCalculationWithOutput, - subCalculationWithOutputAndHydraulicBoundaryLocation, - subCalculationWithHydraulicBoundaryLocation - } - }); + { + Children = + { + subCalculation, + subCalculationWithOutput, + subCalculationWithOutputAndHydraulicBoundaryLocation, + subCalculationWithHydraulicBoundaryLocation + } + }); } private static void SetFullyConfiguredFailureMechanism(StabilityStoneCoverFailureMechanism failureMechanism, @@ -615,15 +615,15 @@ failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation); failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithHydraulicBoundaryLocation); failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup - { - Children = - { - subCalculation, - subCalculationWithOutput, - subCalculationWithOutputAndHydraulicBoundaryLocation, - subCalculationWithHydraulicBoundaryLocation - } - }); + { + Children = + { + subCalculation, + subCalculationWithOutput, + subCalculationWithOutputAndHydraulicBoundaryLocation, + subCalculationWithHydraulicBoundaryLocation + } + }); } private static void SetFullyConfiguredFailureMechanism(WaveImpactAsphaltCoverFailureMechanism failureMechanism, @@ -725,15 +725,15 @@ failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation); failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithHydraulicBoundaryLocation); failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup - { - Children = - { - subCalculation, - subCalculationWithOutput, - subCalculationWithOutputAndHydraulicBoundaryLocation, - subCalculationWithHydraulicBoundaryLocation - } - }); + { + Children = + { + subCalculation, + subCalculationWithOutput, + subCalculationWithOutputAndHydraulicBoundaryLocation, + subCalculationWithHydraulicBoundaryLocation + } + }); } private static void SetFullyConfiguredFailureMechanism(GrassCoverErosionOutwardsFailureMechanism failureMechanism, @@ -848,15 +848,15 @@ failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation); failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithHydraulicBoundaryLocation); failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup - { - Children = - { - subCalculation, - subCalculationWithOutput, - subCalculationWithOutputAndHydraulicBoundaryLocation, - subCalculationWithHydraulicBoundaryLocation - } - }); + { + Children = + { + subCalculation, + subCalculationWithOutput, + subCalculationWithOutputAndHydraulicBoundaryLocation, + subCalculationWithHydraulicBoundaryLocation + } + }); } private static void SetFullyConfiguredFailureMechanism(DuneErosionFailureMechanism failureMechanism, @@ -874,11 +874,11 @@ }) { Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties - { - WaterLevel = hydraulicBoundaryLocation.DesignWaterLevel + 0.2, - WaveHeight = hydraulicBoundaryLocation.WaveHeight + 0.3, - WavePeriod = 10 - }) + { + WaterLevel = hydraulicBoundaryLocation.DesignWaterLevel + 0.2, + WaveHeight = hydraulicBoundaryLocation.WaveHeight + 0.3, + WavePeriod = 10 + }) }; failureMechanism.DuneLocations.Add(duneLocation);