Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r5720d0df0fc620ad53df2a68058a2e8fb6b7c473 -r20e038bad82a79fa790358800fcbafd628e8c987 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 5720d0df0fc620ad53df2a68058a2e8fb6b7c473) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 20e038bad82a79fa790358800fcbafd628e8c987) @@ -532,15 +532,8 @@ context.WrappedData, (StrengthStabilityLengthwiseConstructionFailureMechanism) context.FailureMechanism)); - yield return CreateFailureMechanismResultViewInfo< - WaterPressureAsphaltCoverFailureMechanism, - WaterPressureAsphaltCoverFailureMechanismSectionResultOld, - WaterPressureAsphaltCoverResultViewOld, - WaterPressureAsphaltCoverSectionResultRowOld, - FailureMechanismAssemblyCategoryGroupControl>( - context => new WaterPressureAsphaltCoverResultViewOld( - context.WrappedData, - (WaterPressureAsphaltCoverFailureMechanism) context.FailureMechanism)); + yield return CreateFailureMechanismResultViewInfo( + fm => fm.GeneralInput.N, fm => fm.GeneralInput.ApplyLengthEffectInSection); yield return new RiskeerViewInfo< ProbabilityFailureMechanismSectionResultContext, @@ -1127,7 +1120,7 @@ yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultOldTreeNodeInfo(); yield return CreateFailureMechanismSectionResultOldTreeNodeInfo(); - yield return CreateFailureMechanismSectionResultOldTreeNodeInfo(); + yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return new TreeNodeInfo> { @@ -2649,13 +2642,16 @@ private static object[] WaterPressureAsphaltCoverFailurePathEnabledChildNodeObjects(WaterPressureAsphaltCoverFailurePathContext nodeData) { + IAssessmentSection assessmentSection = nodeData.Parent; + WaterPressureAsphaltCoverFailureMechanism failureMechanism = nodeData.WrappedData; + return new object[] { new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName, - GetWaterPressureAsphaltCoverFailurePathInputs(nodeData.WrappedData, nodeData.Parent), + GetWaterPressureAsphaltCoverFailurePathInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input), new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Outputs_DisplayName, - GetWaterPressureAsphaltCoverFailurePathOutputs(nodeData.WrappedData), + GetWaterPressureAsphaltCoverFailurePathOutputs(failureMechanism, assessmentSection), TreeFolderCategory.Output) }; } @@ -2669,12 +2665,11 @@ }; } - private static IEnumerable GetWaterPressureAsphaltCoverFailurePathOutputs(WaterPressureAsphaltCoverFailureMechanism nodeData) + private static IEnumerable GetWaterPressureAsphaltCoverFailurePathOutputs(WaterPressureAsphaltCoverFailureMechanism nodeData, IAssessmentSection assessmentSection) { return new object[] { - new FailureMechanismSectionResultContext( - nodeData.SectionResultsOld, nodeData), + new WaterPressureAsphaltCoverFailureMechanismSectionResultContext(nodeData.SectionResults, nodeData, assessmentSection), nodeData.InAssemblyOutputComments }; } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs =================================================================== diff -u -r5720d0df0fc620ad53df2a68058a2e8fb6b7c473 -r20e038bad82a79fa790358800fcbafd628e8c987 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 5720d0df0fc620ad53df2a68058a2e8fb6b7c473) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 20e038bad82a79fa790358800fcbafd628e8c987) @@ -448,9 +448,9 @@ PluginTestHelper.AssertViewInfoDefined( viewInfos, - typeof(FailureMechanismSectionResultContext), - typeof(IObservableEnumerable), - typeof(WaterPressureAsphaltCoverResultViewOld)); + typeof(WaterPressureAsphaltCoverFailureMechanismSectionResultContext), + typeof(IObservableEnumerable), + typeof(NonAdoptableWithProfileProbabilityFailureMechanismResultView)); PluginTestHelper.AssertViewInfoDefined( viewInfos, @@ -642,7 +642,7 @@ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingStructureFailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); + Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaterPressureAsphaltCoverFailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(Comment))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StructuresOutputContext))); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -rc824230711295e8892f4cb3348a3e28cec85e0d6 -r20e038bad82a79fa790358800fcbafd628e8c987 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision c824230711295e8892f4cb3348a3e28cec85e0d6) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 20e038bad82a79fa790358800fcbafd628e8c987) @@ -27,10 +27,8 @@ using Core.Gui.ContextMenu; using NUnit.Framework; using Rhino.Mocks; -using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Plugin.TestUtil; -using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.SectionResults; +using Riskeer.Integration.Forms.PresentationObjects.StandAlone; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -45,66 +43,57 @@ public void SetUp() { plugin = new RiskeerPlugin(); - info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(FailureMechanismSectionResultContext)); + info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(WaterPressureAsphaltCoverFailureMechanismSectionResultContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { - // Setup - using (plugin) - { - // Assert - Assert.IsNotNull(info.Text); - Assert.IsNull(info.ForeColor); - Assert.IsNotNull(info.Image); - Assert.IsNotNull(info.ContextMenuStrip); - Assert.IsNull(info.EnsureVisibleOnCreate); - Assert.IsNull(info.ExpandOnCreate); - Assert.IsNull(info.ChildNodeObjects); - Assert.IsNull(info.CanRename); - Assert.IsNull(info.OnNodeRenamed); - Assert.IsNull(info.CanRemove); - Assert.IsNull(info.OnNodeRemoved); - Assert.IsNull(info.CanCheck); - Assert.IsNull(info.CheckedState); - Assert.IsNull(info.OnNodeChecked); - Assert.IsNull(info.CanDrag); - Assert.IsNull(info.CanDrop); - Assert.IsNull(info.CanInsert); - Assert.IsNull(info.OnDrop); - } + // Assert + Assert.IsNotNull(info.Text); + Assert.IsNull(info.ForeColor); + Assert.IsNotNull(info.Image); + Assert.IsNotNull(info.ContextMenuStrip); + Assert.IsNull(info.EnsureVisibleOnCreate); + Assert.IsNull(info.ExpandOnCreate); + Assert.IsNull(info.ChildNodeObjects); + Assert.IsNull(info.CanRename); + Assert.IsNull(info.OnNodeRenamed); + Assert.IsNull(info.CanRemove); + Assert.IsNull(info.OnNodeRemoved); + Assert.IsNull(info.CanCheck); + Assert.IsNull(info.CheckedState); + Assert.IsNull(info.OnNodeChecked); + Assert.IsNull(info.CanDrag); + Assert.IsNull(info.CanDrop); + Assert.IsNull(info.CanInsert); + Assert.IsNull(info.OnDrop); } [Test] public void Text_Always_ReturnsName() { - // Setup - var mechanism = new WaterPressureAsphaltCoverFailureMechanism(); - var context = new FailureMechanismSectionResultContext(mechanism.SectionResultsOld, - mechanism); - using (plugin) - { - // Call - string text = info.Text(context); + // Call + string text = info.Text(null); - // Assert - Assert.AreEqual("Resultaat", text); - } + // Assert + Assert.AreEqual("Resultaat", text); } [Test] public void Image_Always_ReturnsFailureMechanismSectionResultIcon() { - // Setup - using (plugin) - { - // Call - Image image = info.Image(null); + // Call + Image image = info.Image(null); - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image); - } + // Assert + TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image); } [Test] @@ -116,7 +105,7 @@ menuBuilder.Expect(mb => mb.AddOpenItem()).Return(menuBuilder); menuBuilder.Expect(mb => mb.Build()).Return(null); - using (plugin) + using (plugin) // This is needed to prevent interference from mocks in dispose using (var treeViewControl = new TreeViewControl()) { IGui gui = StubFactory.CreateGuiStub(mocks); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailurePathContextTreeNodeInfoTest.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r20e038bad82a79fa790358800fcbafd628e8c987 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailurePathContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailurePathContextTreeNodeInfoTest.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailurePathContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailurePathContextTreeNodeInfoTest.cs) (revision 20e038bad82a79fa790358800fcbafd628e8c987) @@ -32,7 +32,6 @@ using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Plugin.TestUtil; using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.SectionResults; using Riskeer.Integration.Forms.PresentationObjects.StandAlone; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; @@ -166,10 +165,10 @@ Assert.AreEqual("Oordeel", outputFolder.Name); Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category); - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) - outputFolder.Contents.ElementAt(0); + var failureMechanismResultsContext = (WaterPressureAsphaltCoverFailureMechanismSectionResultContext) outputFolder.Contents.ElementAt(0); Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); - Assert.AreSame(failureMechanism.SectionResultsOld, failureMechanismResultsContext.WrappedData); + Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection); + Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); var inAssemblyOutputComments = (Comment) outputFolder.Contents.ElementAt(1); Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs =================================================================== diff -u -r72082701dd10333c0dd79313fca6191306d134a7 -r20e038bad82a79fa790358800fcbafd628e8c987 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs (.../WaterPressureAsphaltCoverResultViewInfoTest.cs) (revision 72082701dd10333c0dd79313fca6191306d134a7) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs (.../WaterPressureAsphaltCoverResultViewInfoTest.cs) (revision 20e038bad82a79fa790358800fcbafd628e8c987) @@ -28,9 +28,9 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Forms.PresentationObjects; +using Riskeer.Common.Forms.Views; using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.SectionResults; -using Riskeer.Integration.Forms.Views.SectionResultViews; +using Riskeer.Integration.Forms.PresentationObjects.StandAlone; namespace Riskeer.Integration.Plugin.Test.ViewInfos { @@ -46,7 +46,7 @@ { mocks = new MockRepository(); plugin = new RiskeerPlugin(); - info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(WaterPressureAsphaltCoverResultViewOld)); + info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(NonAdoptableWithProfileProbabilityFailureMechanismResultView)); } [TearDown] @@ -59,23 +59,27 @@ public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual(typeof(FailureMechanismSectionResultContext), info.DataType); - Assert.AreEqual(typeof(IObservableEnumerable), info.ViewDataType); + Assert.AreEqual(typeof(WaterPressureAsphaltCoverFailureMechanismSectionResultContext), info.DataType); + Assert.AreEqual(typeof(IObservableEnumerable), info.ViewDataType); } [Test] public void GetViewData_WithContext_ReturnsWrappedFailureMechanismResult() { // Setup + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); - var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResultsOld, - failureMechanism); + var context = new WaterPressureAsphaltCoverFailureMechanismSectionResultContext( + failureMechanism.SectionResults, failureMechanism, assessmentSection); // Call object viewData = info.GetViewData(context); // Assert - Assert.AreSame(failureMechanism.SectionResultsOld, viewData); + Assert.AreSame(failureMechanism.SectionResults, viewData); + mocks.VerifyAll(); } [Test] @@ -98,7 +102,8 @@ var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); - using (var view = new WaterPressureAsphaltCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N, fm => fm.GeneralInput.ApplyLengthEffectInSection)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -125,7 +130,8 @@ mocks.ReplayAll(); - using (var view = new WaterPressureAsphaltCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N, fm => fm.GeneralInput.ApplyLengthEffectInSection)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -151,7 +157,8 @@ mocks.ReplayAll(); - using (var view = new WaterPressureAsphaltCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N, fm => fm.GeneralInput.ApplyLengthEffectInSection)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -167,13 +174,15 @@ public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue() { // Setup + var assessmentSection = mocks.Stub(); + var failurePathContext = mocks.StrictMock>(); var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism); - mocks.ReplayAll(); - using (var view = new WaterPressureAsphaltCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N, fm => fm.GeneralInput.ApplyLengthEffectInSection)) { // Call bool closeForData = info.CloseForData(view, failurePathContext); @@ -189,13 +198,16 @@ public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse() { // Setup + var assessmentSection = mocks.Stub(); + var failurePathContext = mocks.StrictMock>(); failurePathContext.Expect(fm => fm.WrappedData).Return(new WaterPressureAsphaltCoverFailureMechanism()); mocks.ReplayAll(); var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); - using (var view = new WaterPressureAsphaltCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => fm.GeneralInput.N, fm => fm.GeneralInput.ApplyLengthEffectInSection)) { // Call bool closeForData = info.CloseForData(view, failurePathContext); @@ -211,16 +223,19 @@ public void CreateInstance_WithContext_ReturnsView() { // Setup - var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); - var context = new FailureMechanismSectionResultContext( - failureMechanism.SectionResultsOld, - failureMechanism); + var assessmentSection = mocks.Stub(); + var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); + var context = new WaterPressureAsphaltCoverFailureMechanismSectionResultContext( + failureMechanism.SectionResults, failureMechanism, assessmentSection); + mocks.ReplayAll(); + // Call IView view = info.CreateInstance(context); // Assert - Assert.IsInstanceOf(view); + Assert.IsInstanceOf>(view); + mocks.VerifyAll(); } } } \ No newline at end of file