Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs =================================================================== diff -u -r357925a9ba2aebce58a9e03e620c6d470323672f -r0b02d2f718cbc5c039f130a0243fe12eb5674a31 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision 357925a9ba2aebce58a9e03e620c6d470323672f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision 0b02d2f718cbc5c039f130a0243fe12eb5674a31) @@ -137,8 +137,7 @@ var returnPeriodLabel = new ControlTester(returnPeriodLabelName); int returnPeriod = Convert.ToInt32(1.0 / failureMechanismContribution.Norm); - string expectedReturnPeriodLabel = string.Format("Norm: 1 / {0}", - returnPeriod.ToString(CultureInfo.CurrentCulture)); + string expectedReturnPeriodLabel = $"Norm: 1 / {returnPeriod.ToString(CultureInfo.CurrentCulture)}"; Assert.AreEqual(expectedReturnPeriodLabel, returnPeriodLabel.Properties.Text); } mocks.VerifyAll(); @@ -202,7 +201,7 @@ var initialContribution = new FailureMechanismContribution(new[] { someMechanism - }, otherContribution, 0.01); + }, otherContribution); using (var distributionView = new FailureMechanismContributionView(viewCommands) { @@ -250,11 +249,18 @@ var initialContribution = new FailureMechanismContribution(new[] { someMechanism - }, random.Next(0, 100), 1.0 / initialReturnPeriod); + }, random.Next(0, 100)) + { + Norm = 1.0 / initialReturnPeriod + }; + var newContribution = new FailureMechanismContribution(new[] { someMechanism - }, random.Next(0, 100), 1.0 / newReturnPeriod); + }, random.Next(0, 100)) + { + Norm = 1.0 / newReturnPeriod + }; using (var distributionView = new FailureMechanismContributionView(viewCommands) { @@ -266,17 +272,15 @@ var returnPeriodLabel = new ControlTester(returnPeriodLabelName); // Precondition - string initialReturnPeriodLabelText = string.Format("Norm: 1 / {0}", - initialReturnPeriod.ToString(CultureInfo.CurrentCulture)); + string initialReturnPeriodLabelText = $"Norm: 1 / {initialReturnPeriod.ToString(CultureInfo.CurrentCulture)}"; Assert.AreEqual(initialReturnPeriodLabelText, returnPeriodLabel.Properties.Text); // Call distributionView.Data = newContribution; distributionView.AssessmentSection = assessmentSection2; // Assert - string newReturnPeriodLabelText = string.Format("Norm: 1 / {0}", - newReturnPeriod.ToString(CultureInfo.CurrentCulture)); + string newReturnPeriodLabelText = $"Norm: 1 / {newReturnPeriod.ToString(CultureInfo.CurrentCulture)}"; Assert.AreEqual(newReturnPeriodLabelText, returnPeriodLabel.Properties.Text); } @@ -301,7 +305,10 @@ var contribution = new FailureMechanismContribution(new[] { someMechanism - }, random.Next(0, 100), 1.0 / initialReturnPeriod); + }, random.Next(0, 100)) + { + Norm = 1.0 / initialReturnPeriod + }; using (var distributionView = new FailureMechanismContributionView(viewCommands) { @@ -313,17 +320,15 @@ var returnPeriodLabel = new ControlTester(returnPeriodLabelName); // Precondition - string initialReturnPeriodLabelText = string.Format("Norm: 1 / {0}", - initialReturnPeriod.ToString(CultureInfo.CurrentCulture)); + string initialReturnPeriodLabelText = $"Norm: 1 / {initialReturnPeriod.ToString(CultureInfo.CurrentCulture)}"; Assert.AreEqual(initialReturnPeriodLabelText, returnPeriodLabel.Properties.Text); // Call contribution.Norm = 1.0 / newReturnPeriod; contribution.NotifyObservers(); // Assert - string newReturnPeriodLabelText = string.Format("Norm: 1 / {0}", - newReturnPeriod.ToString(CultureInfo.CurrentCulture)); + string newReturnPeriodLabelText = $"Norm: 1 / {newReturnPeriod.ToString(CultureInfo.CurrentCulture)}"; Assert.AreEqual(newReturnPeriodLabelText, returnPeriodLabel.Properties.Text); } @@ -353,7 +358,7 @@ var contributionData = new FailureMechanismContribution(new[] { failureMechanismStub - }, 100, 1.0 / 500); + }, 100); view.Data = contributionData; view.AssessmentSection = assessmentSection; @@ -389,7 +394,7 @@ var contributionData = new FailureMechanismContribution(new[] { failureMechanismStub - }, 100, 1.0 / 500); + }, 100); view.Data = contributionData; view.AssessmentSection = assessmentSection; @@ -428,7 +433,10 @@ var contributionData = new FailureMechanismContribution(new[] { failureMechanismStub - }, 100.0 - contribution, norm); + }, 100.0 - contribution) + { + Norm = norm + }; view.Data = contributionData; view.AssessmentSection = assessmentSection; @@ -472,7 +480,7 @@ var compositionLabel = (Label) new ControlTester(assessmentSectionConfigurationLabelName).TheObject; // Assert - string expectedLabelValue = string.Format("Trajecttype: {0}", expectedDisplayText); + string expectedLabelValue = $"Trajecttype: {expectedDisplayText}"; Assert.AreEqual(expectedLabelValue, compositionLabel.Text); } mocks.VerifyAll(); @@ -515,7 +523,7 @@ var compositionLabel = (Label) new ControlTester(assessmentSectionConfigurationLabelName).TheObject; string compositionDisplayName = new EnumDisplayWrapper(newComposition).DisplayName; - string newCompositionValue = string.Format("Trajecttype: {0}", compositionDisplayName); + string newCompositionValue = $"Trajecttype: {compositionDisplayName}"; Assert.AreEqual(newCompositionValue, compositionLabel.Text); } mocks.VerifyAll(); @@ -540,7 +548,7 @@ failureMechanism }; - var contribution = new FailureMechanismContribution(failureMechanisms, 50.0, 1.0 / 30000); + var contribution = new FailureMechanismContribution(failureMechanisms, 50.0); // When view.Data = contribution; @@ -582,7 +590,7 @@ failureMechanism }; - var contribution = new FailureMechanismContribution(failureMechanisms, 50.0, 1.0 / 30000); + var contribution = new FailureMechanismContribution(failureMechanisms, 50.0); // When view.Data = contribution; @@ -641,7 +649,7 @@ { ShowFormWithView(view); - var contribution = new FailureMechanismContribution(failureMechanisms, 50.0, 1.0 / 30000); + var contribution = new FailureMechanismContribution(failureMechanisms, 50.0); view.Data = contribution; view.AssessmentSection = assessmentSection; @@ -707,7 +715,7 @@ { failureMechanism }; - var contribution = new FailureMechanismContribution(failureMechanisms, 50.0, 1.0 / 30000); + var contribution = new FailureMechanismContribution(failureMechanisms, 50.0); using (var view = new FailureMechanismContributionView(viewCommands)) { @@ -740,7 +748,7 @@ ShowFormWithView(view); IEnumerable failureMechanisms = Enumerable.Empty(); - var contribution = new FailureMechanismContribution(failureMechanisms, 50.0, 1.0 / 30000); + var contribution = new FailureMechanismContribution(failureMechanisms, 50.0); // Precondition: FailureMechanismContributionItem[] contributionItems = contribution.Distribution.ToArray();