Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r5447d74a2dd344fcde21e3e0b54069faa38153bd -red838aab36150b57ef59a2906f645ca13f71ee5f --- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5447d74a2dd344fcde21e3e0b54069faa38153bd) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ed838aab36150b57ef59a2906f645ca13f71ee5f) @@ -82,15 +82,6 @@ } /// - /// Looks up a localized string similar to Berekeningen voor huidige selectie. - /// - public static string Calculations_for_current_Selection_DisplayName { - get { - return ResourceManager.GetString("Calculations_for_current_Selection_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Vakinformatie. /// public static string Categories_FailureMechanismSection { Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -rd0b238feef02149df263b7bb430dca12f0349b97 -red838aab36150b57ef59a2906f645ca13f71ee5f --- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision d0b238feef02149df263b7bb430dca12f0349b97) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision ed838aab36150b57ef59a2906f645ca13f71ee5f) @@ -510,9 +510,6 @@ probabilistisch - - Berekeningen voor huidige selectie - Semi-probabilistisch Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.Designer.cs =================================================================== diff -u -r1c59a385c3655302fd03b278f3947615ac020141 -red838aab36150b57ef59a2906f645ca13f71ee5f --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.Designer.cs (.../PipingScenariosView.Designer.cs) (revision 1c59a385c3655302fd03b278f3947615ac020141) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.Designer.cs (.../PipingScenariosView.Designer.cs) (revision ed838aab36150b57ef59a2906f645ca13f71ee5f) @@ -316,7 +316,7 @@ this.labelCalculations.Name = "labelCalculations"; this.labelCalculations.Size = new System.Drawing.Size(173, 13); this.labelCalculations.TabIndex = 0; - this.labelCalculations.Text = global::Riskeer.Piping.Forms.Properties.Resources.Calculations_for_current_Selection_DisplayName; + this.labelCalculations.Text = global::Riskeer.Common.Forms.Properties.Resources.Calculations_per_FailureMechanismSection_DisplayName; // // dataGridViewControl // Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs =================================================================== diff -u -r1ce7e84a37bbda56c28908106e52c56d3e44a3a0 -red838aab36150b57ef59a2906f645ca13f71ee5f --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision 1ce7e84a37bbda56c28908106e52c56d3e44a3a0) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision ed838aab36150b57ef59a2906f645ca13f71ee5f) @@ -968,9 +968,7 @@ public void GivenPipingScenariosViewWithLengthEffectError_WhenSettingValidValue_ThenErrorClearedAndLengthEffectControlsUpdated() { // Given - var failureMechanism = new PipingFailureMechanism(); - ConfigureFailureMechanism(failureMechanism); - PipingScenariosView view = ShowPipingScenariosView(failureMechanism); + var view = ShowFullyConfiguredPipingScenariosView(); // Precondition var textBoxTester = new TextBoxTester("lengthEffectATextBox"); @@ -999,9 +997,7 @@ public void GivenPipingScenariosViewWithoutLengthEffectError_WhenSettingInvalidValue_ThenErrorSetAndLengthEffectControlsUpdated() { // Given - var failureMechanism = new PipingFailureMechanism(); - ConfigureFailureMechanism(failureMechanism); - PipingScenariosView view = ShowPipingScenariosView(failureMechanism); + PipingScenariosView view = ShowFullyConfiguredPipingScenariosView(); // Precondition var lengthEffectATextBox = (TextBox) new ControlTester("lengthEffectATextBox").TheObject; @@ -1029,9 +1025,7 @@ public void GivenPipingScenariosViewWithLengthEffectError_WhenSelectingDifferentItemInSectionsListBox_ThenErrorCleared() { // Setup - var failureMechanism = new PipingFailureMechanism(); - ConfigureFailureMechanism(failureMechanism); - PipingScenariosView view = ShowPipingScenariosView(failureMechanism); + PipingScenariosView view = ShowFullyConfiguredPipingScenariosView(); var textBoxTester = new TextBoxTester("lengthEffectATextBox"); textBoxTester.Enter("NotADouble"); @@ -1100,10 +1094,8 @@ { // Given var failureMechanism = new PipingFailureMechanism(); - ConfigureFailureMechanism(failureMechanism); + ShowFullyConfiguredPipingScenariosView(failureMechanism); - ShowPipingScenariosView(failureMechanism); - // Precondition var lengthEffectATextBox = (TextBox) new ControlTester("lengthEffectATextBox").TheObject; Assert.IsTrue(lengthEffectATextBox.Enabled); @@ -2040,10 +2032,16 @@ private void ShowFullyConfiguredPipingScenariosView(PipingFailureMechanism failureMechanism) { ConfigureFailureMechanism(failureMechanism); - ShowPipingScenariosView(failureMechanism); } + private PipingScenariosView ShowFullyConfiguredPipingScenariosView() + { + var failureMechanism = new PipingFailureMechanism(); + ConfigureFailureMechanism(failureMechanism); + return ShowPipingScenariosView(failureMechanism); + } + private PipingScenariosView ShowPipingScenariosView(PipingFailureMechanism failureMechanism) { var pipingScenarioView = new PipingScenariosView(failureMechanism.CalculationsGroup, failureMechanism, new AssessmentSectionStub());