Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r93278dca1c6c5d43bb95e2a53c16daedda0bd162 -r3b838833901be7e334c406b2214e00341878f9c7 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 93278dca1c6c5d43bb95e2a53c16daedda0bd162) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 3b838833901be7e334c406b2214e00341878f9c7) @@ -43,6 +43,7 @@ using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.TreeNodeInfos; using Riskeer.Common.Forms.UpdateInfos; +using Riskeer.Common.Forms.Views; using Riskeer.Common.Plugin; using Riskeer.Common.Service; using Riskeer.Common.Util.Helpers; @@ -104,16 +105,20 @@ CloseForData = CloseFailurePathViewForData }; - yield return new RiskeerViewInfo, - IObservableEnumerable, - WaveImpactAsphaltCoverFailureMechanismResultViewOld>(() => Gui) + yield return new RiskeerViewInfo< + WaveImpactAsphaltCoverFailureMechanismSectionResultContext, + IObservableEnumerable, + NonAdoptableWithProfileProbabilityFailureMechanismResultView>(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.WrappedData, - CreateInstance = context => new WaveImpactAsphaltCoverFailureMechanismResultViewOld( + CreateInstance = context => new NonAdoptableWithProfileProbabilityFailureMechanismResultView( context.WrappedData, - (WaveImpactAsphaltCoverFailureMechanism) context.FailureMechanism) + (WaveImpactAsphaltCoverFailureMechanism) context.FailureMechanism, + context.AssessmentSection, + fm => fm.GeneralWaveImpactAsphaltCoverInput.GetN(context.AssessmentSection.ReferenceLine.Length), + fm => fm.GeneralWaveImpactAsphaltCoverInput.ApplyLengthEffectInSection) }; yield return new RiskeerViewInfo> + yield return new TreeNodeInfo { Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, @@ -280,7 +285,8 @@ : ReferenceEquals(view.FailureMechanism, failureMechanism); } - private static bool CloseFailureMechanismResultViewForData(WaveImpactAsphaltCoverFailureMechanismResultViewOld view, object dataToCloseFor) + private static bool CloseFailureMechanismResultViewForData( + NonAdoptableWithProfileProbabilityFailureMechanismResultView view, object dataToCloseFor) { var failureMechanism = dataToCloseFor as WaveImpactAsphaltCoverFailureMechanism; @@ -403,8 +409,8 @@ new FailureMechanismAssemblyCategoriesContext( failureMechanism, assessmentSection, () => failureMechanism.GeneralWaveImpactAsphaltCoverInput.GetN( assessmentSection.ReferenceLine.Length)), - new FailureMechanismSectionResultContext( - failureMechanism.SectionResultsOld, failureMechanism), + new WaveImpactAsphaltCoverFailureMechanismSectionResultContext( + failureMechanism.SectionResults, failureMechanism, assessmentSection), failureMechanism.InAssemblyOutputComments }; } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -rc824230711295e8892f4cb3348a3e28cec85e0d6 -r3b838833901be7e334c406b2214e00341878f9c7 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision c824230711295e8892f4cb3348a3e28cec85e0d6) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 3b838833901be7e334c406b2214e00341878f9c7) @@ -27,40 +27,33 @@ using Core.Gui.ContextMenu; using NUnit.Framework; using Rhino.Mocks; -using Riskeer.Common.Forms.PresentationObjects; -using Riskeer.WaveImpactAsphaltCover.Data; +using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.TreeNodeInfos { [TestFixture] public class WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest { - private MockRepository mocks; private WaveImpactAsphaltCoverPlugin plugin; private TreeNodeInfo info; [SetUp] public void SetUp() { - mocks = new MockRepository(); plugin = new WaveImpactAsphaltCoverPlugin(); - info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(FailureMechanismSectionResultContext)); + info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(WaveImpactAsphaltCoverFailureMechanismSectionResultContext)); } [TearDown] public void TearDown() { plugin.Dispose(); - mocks.VerifyAll(); } [Test] public void Initialized_Always_ExpectedPropertiesSet() { - // Setup - mocks.ReplayAll(); - // Assert Assert.IsNotNull(info.Text); Assert.IsNull(info.ForeColor); @@ -85,26 +78,16 @@ [Test] public void Text_Always_ReturnsName() { - // Setup - mocks.ReplayAll(); - - var mechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var context = new FailureMechanismSectionResultContext(mechanism.SectionResultsOld, mechanism); - // Call - string text = info.Text(context); + string text = info.Text(null); // Assert Assert.AreEqual("Resultaat", text); - mocks.VerifyAll(); } [Test] public void Image_Always_ReturnsFailureMechanismSectionResultIcon() { - // Setup - mocks.ReplayAll(); - // Call Image image = info.Image(null); @@ -116,6 +99,8 @@ public void ContextMenuStrip_Always_CallsBuilder() { // Setup + var mocks = new MockRepository(); + var menuBuilder = mocks.StrictMock(); menuBuilder.Expect(mb => mb.AddOpenItem()).Return(menuBuilder); menuBuilder.Expect(mb => mb.Build()).Return(null); @@ -135,7 +120,7 @@ } // Assert - // Expectancies will be tested in TearDown() + mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailurePathContextTreeNodeInfoTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -r3b838833901be7e334c406b2214e00341878f9c7 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailurePathContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailurePathContextTreeNodeInfoTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailurePathContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailurePathContextTreeNodeInfoTest.cs) (revision 3b838833901be7e334c406b2214e00341878f9c7) @@ -155,9 +155,10 @@ Assert.AreEqual(failureMechanism.GeneralWaveImpactAsphaltCoverInput.GetN(assessmentSection.ReferenceLine.Length), calculator.AssemblyCategoriesInput.N); } - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1); + var failureMechanismResultsContext = (WaveImpactAsphaltCoverFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1); 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) outputsFolder.Contents.ElementAt(2); Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r72082701dd10333c0dd79313fca6191306d134a7 -r3b838833901be7e334c406b2214e00341878f9c7 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs) (revision 72082701dd10333c0dd79313fca6191306d134a7) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs) (revision 3b838833901be7e334c406b2214e00341878f9c7) @@ -27,10 +27,9 @@ using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; -using Riskeer.Common.Forms.PresentationObjects; +using Riskeer.Common.Forms.Views; using Riskeer.WaveImpactAsphaltCover.Data; using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects; -using Riskeer.WaveImpactAsphaltCover.Forms.Views; namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.ViewInfos { @@ -46,7 +45,7 @@ { mocks = new MockRepository(); plugin = new WaveImpactAsphaltCoverPlugin(); - info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(WaveImpactAsphaltCoverFailureMechanismResultViewOld)); + info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(NonAdoptableWithProfileProbabilityFailureMechanismResultView)); } [TearDown] @@ -59,8 +58,8 @@ public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual(typeof(FailureMechanismSectionResultContext), info.DataType); - Assert.AreEqual(typeof(IObservableEnumerable), info.ViewDataType); + Assert.AreEqual(typeof(WaveImpactAsphaltCoverFailureMechanismSectionResultContext), info.DataType); + Assert.AreEqual(typeof(IObservableEnumerable), info.ViewDataType); } [Test] @@ -71,16 +70,16 @@ mocks.ReplayAll(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var context = new ProbabilityFailureMechanismSectionResultContext( - failureMechanism.SectionResultsOld, + var context = new WaveImpactAsphaltCoverFailureMechanismSectionResultContext( + failureMechanism.SectionResults, failureMechanism, assessmentSection); // Call object viewData = info.GetViewData(context); // Assert - Assert.AreSame(failureMechanism.SectionResultsOld, viewData); + Assert.AreSame(failureMechanism.SectionResults, viewData); mocks.VerifyAll(); } @@ -104,7 +103,9 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - using (var view = new WaveImpactAsphaltCoverFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, + fm => double.NaN, fm => true)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -131,7 +132,9 @@ mocks.ReplayAll(); - using (var view = new WaveImpactAsphaltCoverFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, + fm => double.NaN, fm => true)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -157,7 +160,9 @@ mocks.ReplayAll(); - using (var view = new WaveImpactAsphaltCoverFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, + fm => double.NaN, fm => true)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -173,32 +178,46 @@ public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue() { // Setup + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - using (var view = new WaveImpactAsphaltCoverFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, + fm => double.NaN, fm => true)) { // Call bool closeForData = info.CloseForData(view, failureMechanism); // Assert Assert.IsTrue(closeForData); } + + mocks.VerifyAll(); } [Test] public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse() { // Setup + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - using (var view = new WaveImpactAsphaltCoverFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, + fm => double.NaN, fm => true)) { // Call bool closeForData = info.CloseForData(view, new WaveImpactAsphaltCoverFailureMechanism()); // Assert Assert.IsFalse(closeForData); } + + mocks.VerifyAll(); } [Test] @@ -211,7 +230,9 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverFailurePathContext(failureMechanism, assessmentSection); - using (var view = new WaveImpactAsphaltCoverFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, + fm => double.NaN, fm => true)) { // Call bool closeForData = info.CloseForData(view, context); @@ -235,7 +256,9 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - using (var view = new WaveImpactAsphaltCoverFailureMechanismResultViewOld(failureMechanism.SectionResultsOld, failureMechanism)) + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + failureMechanism.SectionResults, failureMechanism, assessmentSection, + fm => double.NaN, fm => true)) { // Call bool closeForData = info.CloseForData(view, context); @@ -255,16 +278,16 @@ mocks.ReplayAll(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var context = new ProbabilityFailureMechanismSectionResultContext( - failureMechanism.SectionResultsOld, + var context = new WaveImpactAsphaltCoverFailureMechanismSectionResultContext( + failureMechanism.SectionResults, failureMechanism, assessmentSection); // Call IView view = info.CreateInstance(context); // Assert - Assert.IsInstanceOf(view); + Assert.IsInstanceOf>(view); mocks.VerifyAll(); } } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs =================================================================== diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r3b838833901be7e334c406b2214e00341878f9c7 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision d07611d7e455e358e7255b2807447412ac56f9c6) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 3b838833901be7e334c406b2214e00341878f9c7) @@ -31,7 +31,8 @@ using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.Calculation; -using Riskeer.Common.Forms.PresentationObjects; +using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Forms.Views; using Riskeer.Revetment.Data; using Riskeer.Revetment.Forms.Views; using Riskeer.WaveImpactAsphaltCover.Data; @@ -124,9 +125,9 @@ PluginTestHelper.AssertViewInfoDefined( viewInfos, - typeof(FailureMechanismSectionResultContext), - typeof(IObservableEnumerable), - typeof(WaveImpactAsphaltCoverFailureMechanismResultViewOld)); + typeof(WaveImpactAsphaltCoverFailureMechanismSectionResultContext), + typeof(IObservableEnumerable), + typeof(NonAdoptableWithProfileProbabilityFailureMechanismResultView)); PluginTestHelper.AssertViewInfoDefined( viewInfos, @@ -157,7 +158,7 @@ Assert.AreEqual(8, treeNodeInfos.Length); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverHydraulicLoadsContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverFailurePathContext))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); + Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverFailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyWaveImpactAsphaltCoverOutput)));