Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/ScenariosView.Designer.cs =================================================================== diff -u -ra4a29f6cf95600bf7ddf5e5e85485836c5dacec7 -r38fe4005808a683535285ad91b409561aa4a13be --- Riskeer/Common/src/Riskeer.Common.Forms/Views/ScenariosView.Designer.cs (.../ScenariosView.Designer.cs) (revision a4a29f6cf95600bf7ddf5e5e85485836c5dacec7) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/ScenariosView.Designer.cs (.../ScenariosView.Designer.cs) (revision 38fe4005808a683535285ad91b409561aa4a13be) @@ -124,7 +124,6 @@ this.tableLayoutPanelDataGrid.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelDataGrid.Size = new System.Drawing.Size(108, 150); this.tableLayoutPanelDataGrid.TabIndex = 0; - this.labelTotalScenarioContribution.TabIndex = 3; // // labelTotalScenarioContribution // Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/ScenariosViewTest.cs =================================================================== diff -u -r6d0e5dc6753116745c808d027efa0e9677987818 -r38fe4005808a683535285ad91b409561aa4a13be --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/ScenariosViewTest.cs (.../ScenariosViewTest.cs) (revision 6d0e5dc6753116745c808d027efa0e9677987818) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/ScenariosViewTest.cs (.../ScenariosViewTest.cs) (revision 38fe4005808a683535285ad91b409561aa4a13be) @@ -235,7 +235,30 @@ Assert.IsFalse(totalScenarioContributionLabel.Visible); } + [Test] + public void Constructor_WithFailureMechanismSectionsAndWithoutRelevantCalculationScenarios_TotalContributionScenariosLabelCorrectlyInitialized() + { + // Setup + var failureMechanism = new TestCalculatableFailureMechanism(); + FailureMechanismTestHelper.SetSections(failureMechanism, new[] + { + new FailureMechanismSection("Section 1", new[] + { + new Point2D(0.0, 0.0), + new Point2D(5.0, 0.0) + }) + }); + + // Call + ShowScenariosView(new CalculationGroup(), failureMechanism); + + // Assert + var totalScenarioContributionLabel = (Label) new ControlTester("labelTotalScenarioContribution").TheObject; + Assert.IsFalse(totalScenarioContributionLabel.Visible); + } + + [Test] public void ScenariosView_ContributionValueInvalid_ShowsErrorTooltip() { // Setup @@ -528,7 +551,7 @@ [TestCase(100.01)] [TestCase(99.99)] [TestCase(50)] - public void GivenScenariosViewWithTotalContributionsNotValid_WhenEditingScenarioContributionsToValidValue_ThenTotalContributionLabelUpdatedAndErrorShown( + public void GivenScenariosViewWithTotalContributionsValid_WhenEditingScenarioContributionsToInvalidValue_ThenTotalContributionLabelUpdatedAndErrorShown( double newContribution) { // Given