Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -rd8bd61b7bc08c01d7965635f028a227d0425d120 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs (.../ClosingStructuresFailureMechanismResultViewInfoTest.cs) (revision d8bd61b7bc08c01d7965635f028a227d0425d120) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs (.../ClosingStructuresFailureMechanismResultViewInfoTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -104,7 +104,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -131,7 +131,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -157,7 +157,7 @@ mocks.ReplayAll(); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -179,7 +179,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, failureMechanism); @@ -201,7 +201,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, new ClosingStructuresFailureMechanism()); @@ -224,7 +224,7 @@ var context = new ClosingStructuresFailurePathContext(failureMechanism, assessmentSection); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, context); @@ -247,7 +247,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, context); Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs =================================================================== diff -u -r5bc50675b4c430fa3eadf3f66ae395ddcbfdeb18 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 5bc50675b4c430fa3eadf3f66ae395ddcbfdeb18) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -126,12 +126,12 @@ /// public TFailureMechanism FailureMechanism { get; } + public object Data { get; set; } + /// /// Gets the assessment section. /// protected IAssessmentSection AssessmentSection { get; } - - public object Data { get; set; } protected override void OnLoad(EventArgs e) { Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionResultRow.cs =================================================================== diff -u -r28a403716edb44152aa438d99ce0d7a686bdb775 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionResultRow.cs (.../FailureMechanismSectionResultRow.cs) (revision 28a403716edb44152aa438d99ce0d7a686bdb775) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionResultRow.cs (.../FailureMechanismSectionResultRow.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -82,10 +82,10 @@ protected T SectionResult { get; } /// - /// Gets the assembly result of the failure mechanism section. + /// Gets or sets the assembly result of the failure mechanism section. /// protected FailureMechanismSectionAssemblyResult AssemblyResult { get; set; } - + /// /// Updates all data and notifies the wrapped section result. /// Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r9adf74970cedd7a9f60b47aec8795d6dc7531aaf -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismSectionResultRowTest.cs (.../AdoptableFailureMechanismSectionResultRowTest.cs) (revision 9adf74970cedd7a9f60b47aec8795d6dc7531aaf) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismSectionResultRowTest.cs (.../AdoptableFailureMechanismSectionResultRowTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -583,7 +583,7 @@ Assert.AreEqual(expectedAssemblyResult.SectionProbability, row.SectionProbability); Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup), row.AssemblyGroup); - + mocks.VerifyAll(); } @@ -623,7 +623,6 @@ row.InitialFailureMechanismResultType = AdoptableInitialFailureMechanismResultType.Manual; // Then - Assert.AreEqual(errorText, columnStateDefinitions[ConstructionProperties.SectionProbabilityIndex].ErrorText); Assert.AreEqual(errorText, columnStateDefinitions[ConstructionProperties.AssemblyGroupIndex].ErrorText); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r9adf74970cedd7a9f60b47aec8795d6dc7531aaf -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs (.../AdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs) (revision 9adf74970cedd7a9f60b47aec8795d6dc7531aaf) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs (.../AdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -807,7 +807,6 @@ // Then var expectedAssemblyResult = new DefaultFailureMechanismSectionAssemblyResult(); - Assert.AreEqual(expectedAssemblyResult.ProfileProbability, row.ProfileProbability); Assert.AreEqual(expectedAssemblyResult.SectionProbability, row.SectionProbability); Assert.AreEqual(expectedAssemblyResult.N, row.SectionN, row.SectionN.GetAccuracy()); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs =================================================================== diff -u -rf6f3beffe28b239bdd68d53b3b64bbaff8cf6615 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision f6f3beffe28b239bdd68d53b3b64bbaff8cf6615) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -139,7 +139,7 @@ var failureMechanism = new TestFailureMechanism(); // Call - using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism)) + using (TestFailureMechanismResultView view = ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism)) { // Assert Assert.AreEqual(2, view.Controls.Count); @@ -181,7 +181,7 @@ const int stringColumnIndex = 1; // Call - using (ShowFailureMechanismResultsView(new ObservableList())) + using (ShowFailureMechanismResultView(new ObservableList())) { // Assert DataGridView dataGridView = GetDataGridView(); @@ -204,7 +204,7 @@ var failureMechanism = new TestFailureMechanism(); // Call - using (ShowFailureMechanismResultsView(failureMechanism.SectionResults)) + using (ShowFailureMechanismResultView(failureMechanism.SectionResults)) { // Assert ComboBox comboBox = GetProbabilityResultTypeComboBox(); @@ -238,7 +238,7 @@ return double.NaN; }; - using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(sectionResults, performFailureMechanismAssemblyFunc)) + using (TestFailureMechanismResultView view = ShowFailureMechanismResultView(sectionResults, performFailureMechanismAssemblyFunc)) { var rowsChanged = false; DataGridView dataGridView = GetDataGridView(); @@ -270,7 +270,7 @@ return double.NaN; }; - using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(sectionResults, performFailureMechanismAssemblyFunc)) + using (ShowFailureMechanismResultView(sectionResults, performFailureMechanismAssemblyFunc)) { DataGridView dataGridView = GetDataGridView(); @@ -305,7 +305,7 @@ return double.NaN; }; - using (ShowFailureMechanismResultsView(sectionResults, performFailureMechanismAssemblyFunc)) + using (ShowFailureMechanismResultView(sectionResults, performFailureMechanismAssemblyFunc)) { var invalidated = false; DataGridView dataGridView = GetDataGridView(); @@ -337,7 +337,7 @@ sectionResult }; - using (ShowFailureMechanismResultsView(sectionResults)) + using (ShowFailureMechanismResultView(sectionResults)) { DataGridView dataGridView = GetDataGridView(); var row = (TestRow) dataGridView.Rows[0].DataBoundItem; @@ -368,7 +368,7 @@ sectionResult }; - using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(sectionResults)) + using (TestFailureMechanismResultView view = ShowFailureMechanismResultView(sectionResults)) { DataGridView dataGridView = GetDataGridView(); var row = (TestRow) dataGridView.Rows[0].DataBoundItem; @@ -401,7 +401,7 @@ sectionResult2 }; - using (ShowFailureMechanismResultsView(sectionResults)) + using (ShowFailureMechanismResultView(sectionResults)) { DataGridView dataGridView = GetDataGridView(); var row1 = (TestRow) dataGridView.Rows[0].DataBoundItem; @@ -433,7 +433,7 @@ FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult() }; - using (ShowFailureMechanismResultsView(sectionResults)) + using (ShowFailureMechanismResultView(sectionResults)) { DataGridView dataGridView = GetDataGridView(); var row = (TestRow) dataGridView.Rows[0].DataBoundItem; @@ -461,7 +461,7 @@ sectionResult }; - using (ShowFailureMechanismResultsView(sectionResults)) + using (ShowFailureMechanismResultView(sectionResults)) { DataGridView dataGridView = GetDataGridView(); var row = (TestRow) dataGridView.Rows[0].DataBoundItem; @@ -490,7 +490,7 @@ sectionResult }; - using (ShowFailureMechanismResultsView(sectionResults)) + using (ShowFailureMechanismResultView(sectionResults)) { DataGridView dataGridView = GetDataGridView(); var row = (TestRow) dataGridView.Rows[0].DataBoundItem; @@ -530,27 +530,27 @@ return TypeUtils.GetField(view, "errorProvider"); } - private TestFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable sectionResults) + private TestFailureMechanismResultView ShowFailureMechanismResultView(IObservableEnumerable sectionResults) { - return ShowFailureMechanismResultsView(sectionResults, new TestFailureMechanism()); + return ShowFailureMechanismResultView(sectionResults, new TestFailureMechanism()); } - private TestFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable sectionResults, - Func performFailureMechanismAssemblyFunc) + private TestFailureMechanismResultView ShowFailureMechanismResultView(IObservableEnumerable sectionResults, + Func performFailureMechanismAssemblyFunc) { - return ShowFailureMechanismResultsView(sectionResults, new TestFailureMechanism(), new AssessmentSectionStub(), performFailureMechanismAssemblyFunc); + return ShowFailureMechanismResultView(sectionResults, new TestFailureMechanism(), new AssessmentSectionStub(), performFailureMechanismAssemblyFunc); } - private TestFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable sectionResults, - TestFailureMechanism failureMechanism) + private TestFailureMechanismResultView ShowFailureMechanismResultView(IObservableEnumerable sectionResults, + TestFailureMechanism failureMechanism) { - return ShowFailureMechanismResultsView(sectionResults, failureMechanism, new AssessmentSectionStub(), (fm, ass) => double.NaN); + return ShowFailureMechanismResultView(sectionResults, failureMechanism, new AssessmentSectionStub(), (fm, ass) => double.NaN); } - private TestFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable sectionResults, - TestFailureMechanism failureMechanism, - IAssessmentSection assessmentSection, - Func performFailureMechanismAssemblyFunc) + private TestFailureMechanismResultView ShowFailureMechanismResultView(IObservableEnumerable sectionResults, + TestFailureMechanism failureMechanism, + IAssessmentSection assessmentSection, + Func performFailureMechanismAssemblyFunc) { var failureMechanismResultView = new TestFailureMechanismResultView(sectionResults, failureMechanism, assessmentSection, performFailureMechanismAssemblyFunc); testForm.Controls.Add(failureMechanismResultView); @@ -612,7 +612,7 @@ # region Assembly [Test] - public void FailureMechanismResultsView_AllDataSet_PassesInputToPerformAssemblyFunc() + public void FailureMechanismResultView_AllDataSet_PassesInputToPerformAssemblyFunc() { // Setup var mocks = new MockRepository(); @@ -631,7 +631,7 @@ }; // Call - using (ShowFailureMechanismResultsView(new ObservableList(), failureMechanism, assessmentSection, performFailureMechanismAssemblyFunc)) + using (ShowFailureMechanismResultView(new ObservableList(), failureMechanism, assessmentSection, performFailureMechanismAssemblyFunc)) { // Assert Assert.AreSame(failureMechanism, failureMechanismInput); @@ -640,7 +640,7 @@ mocks.VerifyAll(); } - + [Test] [TestCase(double.NaN, "-")] [TestCase(double.NegativeInfinity, "-Oneindig")] @@ -654,7 +654,7 @@ var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var failureMechanism = new TestFailureMechanism { AssemblyResult = @@ -664,7 +664,7 @@ }; // When - using (ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => assemblyResult)) + using (ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => assemblyResult)) { // Precondition ComboBox comboBox = GetProbabilityResultTypeComboBox(); @@ -698,7 +698,7 @@ // When using (TestFailureMechanismResultView view = - ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => throw new AssemblyException(exceptionMessage))) + ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => throw new AssemblyException(exceptionMessage))) { // Precondition ComboBox comboBox = GetProbabilityResultTypeComboBox(); @@ -747,7 +747,7 @@ return double.NaN; }; - using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism, assessmentSection, performFailureMechanismAssemblyFunc)) + using (TestFailureMechanismResultView view = ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection, performFailureMechanismAssemblyFunc)) { // Precondition ComboBox comboBox = GetProbabilityResultTypeComboBox(); @@ -778,7 +778,7 @@ var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var failureMechanism = new TestFailureMechanism { AssemblyResult = @@ -788,7 +788,7 @@ } }; - using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => throw new AssemblyException(exceptionMessage))) + using (TestFailureMechanismResultView view = ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => throw new AssemblyException(exceptionMessage))) { // Precondition ComboBox comboBox = GetProbabilityResultTypeComboBox(); @@ -828,7 +828,7 @@ }; failureMechanism.AssemblyResult.Attach(observer); - using (ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism)) + using (ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism)) { TextBox failurePathAssemblyProbabilityTextBox = GetFailurePathAssemblyProbabilityTextBox(); @@ -878,7 +878,7 @@ } }; - using (ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => assemblyResult)) + using (ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => assemblyResult)) { // Precondition TextBox failurePathAssemblyProbabilityTextBox = GetFailurePathAssemblyProbabilityTextBox(); @@ -928,7 +928,7 @@ }; failureMechanism.AssemblyResult.Attach(observer); - using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism)) + using (TestFailureMechanismResultView view = ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism)) { // Precondition TextBox failurePathAssemblyProbabilityTextBox = GetFailurePathAssemblyProbabilityTextBox(); @@ -974,7 +974,7 @@ }; failureMechanism.AssemblyResult.Attach(observer); - using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism)) + using (TestFailureMechanismResultView view = ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism)) { // Precondition TextBox failurePathAssemblyProbabilityTextBox = GetFailurePathAssemblyProbabilityTextBox(); @@ -1022,7 +1022,7 @@ } }; - using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism)) + using (TestFailureMechanismResultView view = ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism)) { // Precondition var textBoxTester = new TextBoxTester("failurePathAssemblyProbabilityTextBox"); @@ -1060,7 +1060,7 @@ } }; - using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism)) + using (TestFailureMechanismResultView view = ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism)) { // Precondition var textBoxTester = new TextBoxTester("failurePathAssemblyProbabilityTextBox"); @@ -1100,7 +1100,7 @@ } }; - using (ShowFailureMechanismResultsView(failureMechanism.SectionResults, failureMechanism)) + using (ShowFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism)) { var textBoxTester = new ControlTester("failurePathAssemblyProbabilityTextBox"); const Keys keyData = Keys.Escape; Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs =================================================================== diff -u -rc94078c6f9c234210cb4fea84338c02fb989b5e4 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs (.../NonAdoptableFailureMechanismResultViewTest.cs) (revision c94078c6f9c234210cb4fea84338c02fb989b5e4) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs (.../NonAdoptableFailureMechanismResultViewTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -61,7 +61,7 @@ { testForm.Dispose(); } - + [Test] public void Constructor_ExpectedValues() { @@ -74,7 +74,7 @@ // Call using (var view = new NonAdoptableFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Assert Assert.IsInstanceOf ShowFailureMechanismResultsView(TestNonAdoptableFailureMechanism failureMechanism) { return ShowFailureMechanismResultsView(failureMechanism, new AssessmentSectionStub()); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r9adf74970cedd7a9f60b47aec8795d6dc7531aaf -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs (.../NonAdoptableFailureMechanismSectionResultRowTest.cs) (revision 9adf74970cedd7a9f60b47aec8795d6dc7531aaf) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs (.../NonAdoptableFailureMechanismSectionResultRowTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -571,7 +571,6 @@ // Then const string expectedErrorText = "Message"; - Assert.AreEqual(expectedErrorText, columnStateDefinitions[ConstructionProperties.SectionProbabilityIndex].ErrorText); Assert.AreEqual(expectedErrorText, columnStateDefinitions[ConstructionProperties.AssemblyGroupIndex].ErrorText); } Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r645d46e81fd2b6e15d505ace3be6d12fc172d91e -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs (.../StructuresFailureMechanismResultViewTest.cs) (revision 645d46e81fd2b6e15d505ace3be6d12fc172d91e) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs (.../StructuresFailureMechanismResultViewTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -63,7 +63,7 @@ { testForm.Dispose(); } - + [Test] public void Constructor_ExpectedValues() { @@ -76,7 +76,7 @@ // Call using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, section) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, section) => double.NaN)) { // Assert Assert.IsInstanceOf ShowFailureMechanismResultsView( TestStructuresFailureMechanism failureMechanism) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -re41c5d035f2641f1e1bf55b9e6f37501c8e8be95 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs) (revision e41c5d035f2641f1e1bf55b9e6f37501c8e8be95) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -103,9 +103,10 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -133,9 +134,10 @@ mocks.ReplayAll(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -160,9 +162,10 @@ mocks.ReplayAll(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -180,12 +183,13 @@ // Setup var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, failureMechanism); @@ -203,13 +207,14 @@ // Setup var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, new GrassCoverErosionOutwardsFailureMechanism()); @@ -232,9 +237,10 @@ var context = new GrassCoverErosionOutwardsFailurePathContext(failureMechanism, assessmentSection); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, context); @@ -258,9 +264,10 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, context); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -re41c5d035f2641f1e1bf55b9e6f37501c8e8be95 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs) (revision e41c5d035f2641f1e1bf55b9e6f37501c8e8be95) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -106,9 +106,10 @@ var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -136,9 +137,10 @@ var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -164,9 +166,10 @@ mocks.ReplayAll(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -190,9 +193,10 @@ mocks.ReplayAll(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, failurePathContext); @@ -209,17 +213,18 @@ { // Setup var assessmentSection = mocks.Stub(); - + var failurePathContext = mocks.StrictMock>(); failurePathContext.Expect(fm => fm.WrappedData).Return(new GrassCoverSlipOffInwardsFailureMechanism()); mocks.ReplayAll(); var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, failurePathContext); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -re41c5d035f2641f1e1bf55b9e6f37501c8e8be95 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismResultViewInfoTest.cs (.../MicrostabilityFailureMechanismResultViewInfoTest.cs) (revision e41c5d035f2641f1e1bf55b9e6f37501c8e8be95) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismResultViewInfoTest.cs (.../MicrostabilityFailureMechanismResultViewInfoTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -105,9 +105,10 @@ var failureMechanism = new MicrostabilityFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -135,9 +136,10 @@ var failureMechanism = new MicrostabilityFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -163,9 +165,10 @@ mocks.ReplayAll(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -189,9 +192,10 @@ mocks.ReplayAll(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, failurePathContext); @@ -215,9 +219,10 @@ var failureMechanism = new MicrostabilityFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, failurePathContext); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -rf923887556cf2bb4815be25d3359d6d3662d3dd7 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismResultViewInfoTest.cs (.../PipingStructureFailureMechanismResultViewInfoTest.cs) (revision f923887556cf2bb4815be25d3359d6d3662d3dd7) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismResultViewInfoTest.cs (.../PipingStructureFailureMechanismResultViewInfoTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -104,7 +104,7 @@ var failureMechanism = new PipingStructureFailureMechanism(); using (var view = new NonAdoptableFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -131,7 +131,7 @@ var failureMechanism = new PipingStructureFailureMechanism(); using (var view = new NonAdoptableFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -157,7 +157,7 @@ mocks.ReplayAll(); using (var view = new NonAdoptableFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -181,7 +181,7 @@ mocks.ReplayAll(); using (var view = new NonAdoptableFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, failurePathContext); @@ -205,7 +205,7 @@ var failureMechanism = new PipingStructureFailureMechanism(); using (var view = new NonAdoptableFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, failurePathContext); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -re41c5d035f2641f1e1bf55b9e6f37501c8e8be95 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs) (revision e41c5d035f2641f1e1bf55b9e6f37501c8e8be95) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -71,7 +71,7 @@ // Setup var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); var context = new WaterPressureAsphaltCoverFailureMechanismSectionResultContext( failureMechanism.SectionResults, failureMechanism, assessmentSection); @@ -106,9 +106,10 @@ var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -135,9 +136,10 @@ var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -162,9 +164,10 @@ mocks.ReplayAll(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -182,15 +185,16 @@ // Setup var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); - var assessmentSection = mocks.Stub(); + var assessmentSection = mocks.Stub(); var failurePathContext = mocks.StrictMock>(); failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism); mocks.ReplayAll(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, failurePathContext); @@ -213,9 +217,10 @@ var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, failurePathContext); @@ -237,7 +242,7 @@ var context = new WaterPressureAsphaltCoverFailureMechanismSectionResultContext( failureMechanism.SectionResults, failureMechanism, assessmentSection); mocks.ReplayAll(); - + // Call IView view = info.CreateInstance(context); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r21c3c3cc07b1a3932e322ec6cec98bf4c81c0641 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs) (revision 21c3c3cc07b1a3932e322ec6cec98bf4c81c0641) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -156,8 +156,7 @@ mocks.ReplayAll(); - using (var view = new MacroStabilityInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection) - ) + using (var view = new MacroStabilityInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -rd8bd61b7bc08c01d7965635f028a227d0425d120 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismResultViewInfoTest.cs (.../StabilityPointStructuresFailureMechanismResultViewInfoTest.cs) (revision d8bd61b7bc08c01d7965635f028a227d0425d120) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismResultViewInfoTest.cs (.../StabilityPointStructuresFailureMechanismResultViewInfoTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -104,7 +104,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -132,7 +132,7 @@ mocks.ReplayAll(); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -159,7 +159,7 @@ mocks.ReplayAll(); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -182,7 +182,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, failureMechanism); @@ -205,7 +205,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, new StabilityPointStructuresFailureMechanism()); @@ -229,7 +229,7 @@ var context = new StabilityPointStructuresFailurePathContext(failureMechanism, assessmentSection); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, context); @@ -253,7 +253,7 @@ var context = new StabilityPointStructuresFailurePathContext(new StabilityPointStructuresFailureMechanism(), assessmentSection); using (var view = new StructuresFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) + failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN)) { // Call bool closeForData = info.CloseForData(view, context); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -re41c5d035f2641f1e1bf55b9e6f37501c8e8be95 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverFailureMechanismResultViewInfoTest.cs (.../StabilityStoneCoverFailureMechanismResultViewInfoTest.cs) (revision e41c5d035f2641f1e1bf55b9e6f37501c8e8be95) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverFailureMechanismResultViewInfoTest.cs (.../StabilityStoneCoverFailureMechanismResultViewInfoTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -102,9 +102,10 @@ var failureMechanism = new StabilityStoneCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -131,9 +132,10 @@ var failureMechanism = new StabilityStoneCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -158,9 +160,10 @@ mocks.ReplayAll(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -178,12 +181,13 @@ // Setup var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var failureMechanism = new StabilityStoneCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, failureMechanism); @@ -201,12 +205,13 @@ // Setup var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var failureMechanism = new StabilityStoneCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, new StabilityStoneCoverFailureMechanism()); @@ -229,9 +234,10 @@ var context = new StabilityStoneCoverFailurePathContext(failureMechanism, assessmentSection); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, context); @@ -254,9 +260,10 @@ var failureMechanism = new StabilityStoneCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => fm.GeneralInput.ApplyLengthEffectInSection, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => fm.GeneralInput.ApplyLengthEffectInSection, + sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, context); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -re41c5d035f2641f1e1bf55b9e6f37501c8e8be95 -r9aaabd7e325d5951d0d84713754373a90b47738c --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs) (revision e41c5d035f2641f1e1bf55b9e6f37501c8e8be95) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs) (revision 9aaabd7e325d5951d0d84713754373a90b47738c) @@ -105,9 +105,9 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -133,9 +133,9 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -160,9 +160,9 @@ mocks.ReplayAll(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -180,12 +180,12 @@ // Setup var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, failureMechanism); @@ -203,12 +203,12 @@ // Setup var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, new WaveImpactAsphaltCoverFailureMechanism()); @@ -231,9 +231,9 @@ var context = new WaveImpactAsphaltCoverFailurePathContext(failureMechanism, assessmentSection); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, context); @@ -257,9 +257,9 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( - failureMechanism.SectionResults, failureMechanism, assessmentSection, - (fm, ass) => double.NaN, - fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) + failureMechanism.SectionResults, failureMechanism, assessmentSection, + (fm, ass) => double.NaN, + fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) { // Call bool closeForData = info.CloseForData(view, context);