Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 62b8135dcc02e56da0616c5d6f4e345198994393) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -246,14 +246,12 @@ yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, CreateInstance = context => new MacroStabilityInwardsFailureMechanismView(context.WrappedData, context.Parent) }; yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, AdditionalDataCheck = context => context.WrappedData.InAssembly, CreateInstance = context => new MacroStabilityInwardsFailurePathView(context.WrappedData, context.Parent), CloseForData = CloseFailurePathViewForData @@ -265,7 +263,6 @@ MacroStabilityInwardsFailureMechanismResultView>(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.WrappedData, CreateInstance = context => new MacroStabilityInwardsFailureMechanismResultView( @@ -277,7 +274,6 @@ { GetViewData = context => context.WrappedData, GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.GeneralFolderIcon, AdditionalDataCheck = context => context.WrappedData == context.FailureMechanism.CalculationsGroup, CreateInstance = context => new MacroStabilityInwardsCalculationsView(context.WrappedData, context.FailureMechanism, context.AssessmentSection), CloseForData = CloseCalculationsViewForData @@ -287,7 +283,6 @@ { GetViewData = context => context.MacroStabilityInwardsCalculation, GetViewName = (view, context) => RiskeerCommonFormsResources.Calculation_Input, - Image = RiskeerCommonFormsResources.GenericInputOutputIcon, CloseForData = CloseInputViewForData, CreateInstance = context => new MacroStabilityInwardsInputView(context.MacroStabilityInwardsCalculation, context.FailureMechanism.GeneralInput, @@ -299,7 +294,6 @@ { GetViewData = context => context.WrappedData, GetViewName = (view, context) => RiskeerCommonFormsResources.Scenarios_DisplayName, - Image = RiskeerCommonFormsResources.ScenariosIcon, CloseForData = CloseScenariosViewForData, CreateInstance = context => new MacroStabilityInwardsScenariosView(context.WrappedData, context.FailureMechanism) }; @@ -308,7 +302,6 @@ { GetViewData = context => context.WrappedData, GetViewName = (view, context) => RiskeerCommonFormsResources.CalculationOutput_DisplayName, - Image = RiskeerCommonFormsResources.GeneralOutputIcon, CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData, CreateInstance = context => new MacroStabilityInwardsOutputView(context.WrappedData, context.FailureMechanism.GeneralInput, () => GetNormativeAssessmentLevel(context.AssessmentSection, context.WrappedData)) @@ -317,7 +310,6 @@ yield return new RiskeerViewInfo, FailureMechanismSectionsProbabilityAssessmentView>(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanismSections_DisplayName, - Image = RiskeerCommonFormsResources.SectionsIcon, CloseForData = RiskeerPluginHelper.ShouldCloseForFailureMechanismView, CreateInstance = context => new FailureMechanismSectionsProbabilityAssessmentView(context.WrappedData.Sections, (IFailureMechanism) context.WrappedData, Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsCalculationsViewInfoTest.cs =================================================================== diff -u -rb6ec9563f4b236ae0e6ba3ea5c7918b807908b90 -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsCalculationsViewInfoTest.cs (.../MacroStabilityInwardsCalculationsViewInfoTest.cs) (revision b6ec9563f4b236ae0e6ba3ea5c7918b807908b90) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsCalculationsViewInfoTest.cs (.../MacroStabilityInwardsCalculationsViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -20,7 +20,6 @@ // All rights reserved. using System.Linq; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -61,7 +60,6 @@ // Assert Assert.AreEqual(typeof(MacroStabilityInwardsCalculationGroupContext), info.DataType); Assert.AreEqual(typeof(CalculationGroup), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralFolderIcon, info.Image); } [Test] Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs) (revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -19,11 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using Core.Common.Base; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -99,16 +97,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image); - } - - [Test] public void CloseForData_AssessmentSectionRemovedWithoutFailureMechanism_ReturnsFalse() { // Setup Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismSectionsProbabilityAssessmentViewInfoTest.cs =================================================================== diff -u -r9a83eb890b0d3aac04ee48d4999fae0c92e7e10c -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismSectionsProbabilityAssessmentViewInfoTest.cs (.../MacroStabilityInwardsFailureMechanismSectionsProbabilityAssessmentViewInfoTest.cs) (revision 9a83eb890b0d3aac04ee48d4999fae0c92e7e10c) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismSectionsProbabilityAssessmentViewInfoTest.cs (.../MacroStabilityInwardsFailureMechanismSectionsProbabilityAssessmentViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -20,10 +20,8 @@ // All rights reserved. using System.Collections.Generic; -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -88,16 +86,6 @@ mocks.VerifyAll(); } - [Test] - public void Image_Always_ReturnsSectionsIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.SectionsIcon, image); - } - [TestFixture] public class ShouldCloseMacroStabilityInwardsSectionsViewForDataTester : ShouldCloseViewWithFailureMechanismTester { Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismViewInfoTest.cs =================================================================== diff -u -r42a2e255d9edfb03030381064e96bd9041bf8216 -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismViewInfoTest.cs (.../MacroStabilityInwardsFailureMechanismViewInfoTest.cs) (revision 42a2e255d9edfb03030381064e96bd9041bf8216) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismViewInfoTest.cs (.../MacroStabilityInwardsFailureMechanismViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -19,11 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using System.Threading; using System.Windows.Forms; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -83,16 +81,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] [Apartment(ApartmentState.STA)] public void CreateInstance_WithContext_ReturnMacroStabilityInwardsFailureMechanismView() { Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailurePathViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailurePathViewInfoTest.cs (.../MacroStabilityInwardsFailurePathViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailurePathViewInfoTest.cs (.../MacroStabilityInwardsFailurePathViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -19,11 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using System.Threading; using System.Windows.Forms; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -83,16 +81,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] [TestCase(true)] [TestCase(false)] public void AdditionalDataCheck_Always_ReturnTrueOnlyIfFailureMechanismInAssembly(bool inAssembly) Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs =================================================================== diff -u -rb6ec9563f4b236ae0e6ba3ea5c7918b807908b90 -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision b6ec9563f4b236ae0e6ba3ea5c7918b807908b90) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -21,15 +21,13 @@ using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; -using Riskeer.Common.Forms.Properties; using Riskeer.MacroStabilityInwards.Data; using Riskeer.MacroStabilityInwards.Data.SoilProfile; using Riskeer.MacroStabilityInwards.Forms.PresentationObjects; @@ -65,7 +63,6 @@ // Assert Assert.AreEqual(typeof(MacroStabilityInwardsInputContext), info.DataType); Assert.AreEqual(typeof(MacroStabilityInwardsCalculationScenario), info.ViewDataType); - TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, info.Image); } [Test] Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs =================================================================== diff -u -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs (.../MacroStabilityInwardsOutputViewInfoTest.cs) (revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs (.../MacroStabilityInwardsOutputViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -22,7 +22,6 @@ using System.Linq; using Core.Common.Base.Data; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -31,7 +30,6 @@ using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.PresentationObjects; -using Riskeer.Common.Forms.Properties; using Riskeer.Common.Plugin.TestUtil; using Riskeer.MacroStabilityInwards.Data; using Riskeer.MacroStabilityInwards.Data.SoilProfile; @@ -68,7 +66,6 @@ // Assert Assert.AreEqual(typeof(MacroStabilityInwardsOutputContext), info.DataType); Assert.AreEqual(typeof(MacroStabilityInwardsCalculationScenario), info.ViewDataType); - TestHelper.AssertImagesAreEqual(Resources.GeneralOutputIcon, info.Image); } [Test] Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs =================================================================== diff -u -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs (.../MacroStabilityInwardsScenariosViewInfoTest.cs) (revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs (.../MacroStabilityInwardsScenariosViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -21,7 +21,6 @@ using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -60,7 +59,6 @@ // Assert Assert.AreEqual(typeof(MacroStabilityInwardsScenariosContext), info.DataType); Assert.AreEqual(typeof(CalculationGroup), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.ScenariosIcon, info.Image); } [Test] Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 62b8135dcc02e56da0616c5d6f4e345198994393) +++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -246,14 +246,12 @@ yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, CreateInstance = context => new PipingFailureMechanismView(context.WrappedData, context.Parent) }; yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, AdditionalDataCheck = context => context.WrappedData.InAssembly, CreateInstance = context => new PipingFailurePathView(context.WrappedData, context.Parent), CloseForData = ClosePipingFailurePathViewForData @@ -265,7 +263,6 @@ PipingFailureMechanismResultView>(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.WrappedData, CreateInstance = context => new PipingFailureMechanismResultView( @@ -278,7 +275,6 @@ { GetViewData = context => context.WrappedData, GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.GeneralFolderIcon, AdditionalDataCheck = context => context.WrappedData == context.FailureMechanism.CalculationsGroup, CreateInstance = context => new PipingCalculationsView(context.WrappedData, context.FailureMechanism, context.AssessmentSection), CloseForData = ClosePipingCalculationsViewForData @@ -288,23 +284,20 @@ { GetViewData = context => context.PipingCalculation, GetViewName = (view, context) => RiskeerCommonFormsResources.Calculation_Input, - Image = PipingFormsResources.PipingInputIcon, CloseForData = ClosePipingInputViewForData }; yield return new RiskeerViewInfo(() => Gui) { GetViewData = context => context.PipingCalculation, GetViewName = (view, context) => RiskeerCommonFormsResources.Calculation_Input, - Image = PipingFormsResources.PipingInputIcon, CloseForData = ClosePipingInputViewForData }; yield return new RiskeerViewInfo(() => Gui) { GetViewData = context => context.WrappedData, GetViewName = (view, context) => RiskeerCommonFormsResources.Scenarios_DisplayName, - Image = RiskeerCommonFormsResources.ScenariosIcon, CloseForData = ClosePipingScenariosViewForData, CreateInstance = context => new PipingScenariosView(context.WrappedData, context.FailureMechanism, context.AssessmentSection) }; @@ -313,7 +306,6 @@ { GetViewData = context => context.WrappedData.Sections, GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanismSections_DisplayName, - Image = RiskeerCommonFormsResources.SectionsIcon, CloseForData = RiskeerPluginHelper.ShouldCloseForFailureMechanismView, CreateInstance = context => new FailureMechanismSectionsProbabilityAssessmentView(context.WrappedData.Sections, (IFailureMechanism) context.WrappedData, @@ -324,7 +316,6 @@ { GetViewData = context => context.WrappedData, GetViewName = (view, context) => PipingFormsResources.ProbabilisticProfileSpecificOutput_DisplayName, - Image = RiskeerCommonFormsResources.GeneralOutputIcon, CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData, AdditionalDataCheck = context => !context.WrappedData.HasOutput || context.WrappedData.Output.ProfileSpecificOutput is PartialProbabilisticFaultTreePipingOutput, CreateInstance = context => new ProbabilisticFaultTreePipingOutputView( @@ -336,7 +327,6 @@ { GetViewData = context => context.WrappedData, GetViewName = (view, context) => PipingFormsResources.ProbabilisticProfileSpecificOutput_DisplayName, - Image = RiskeerCommonFormsResources.GeneralOutputIcon, CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData, AdditionalDataCheck = context => context.WrappedData.HasOutput && context.WrappedData.Output.ProfileSpecificOutput is PartialProbabilisticSubMechanismPipingOutput, CreateInstance = context => @@ -351,7 +341,6 @@ { GetViewData = context => context.WrappedData, GetViewName = (view, context) => PipingFormsResources.ProbabilisticSectionSpecificOutput_DisplayName, - Image = RiskeerCommonFormsResources.GeneralOutputIcon, CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData, AdditionalDataCheck = context => !context.WrappedData.HasOutput || context.WrappedData.Output.SectionSpecificOutput is PartialProbabilisticFaultTreePipingOutput, CreateInstance = context => @@ -366,7 +355,6 @@ { GetViewData = context => context.WrappedData, GetViewName = (view, context) => PipingFormsResources.ProbabilisticSectionSpecificOutput_DisplayName, - Image = RiskeerCommonFormsResources.GeneralOutputIcon, CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData, AdditionalDataCheck = context => context.WrappedData.HasOutput && context.WrappedData.Output.SectionSpecificOutput is PartialProbabilisticSubMechanismPipingOutput, CreateInstance = context => Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs =================================================================== diff -u -r38eb7e68aa0b16a05615adf2abbe763e62df5ace -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs (.../PipingCalculationsViewInfoTest.cs) (revision 38eb7e68aa0b16a05615adf2abbe763e62df5ace) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs (.../PipingCalculationsViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -20,7 +20,6 @@ // All rights reserved. using System.Linq; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -61,7 +60,6 @@ // Assert Assert.AreEqual(typeof(PipingCalculationGroupContext), info.DataType); Assert.AreEqual(typeof(CalculationGroup), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralFolderIcon, info.Image); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs (.../PipingFailureMechanismResultViewInfoTest.cs) (revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs (.../PipingFailureMechanismResultViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -19,11 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using Core.Common.Base; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -98,16 +96,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image); - } - - [Test] public void CloseForData_AssessmentSectionRemovedWithoutFailureMechanism_ReturnsFalse() { // Setup Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismSectionsProbabilityAssessmentViewInfoTest.cs =================================================================== diff -u -raadbaf228b074ae1d2a2ec3163a5705fc2bf69e0 -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismSectionsProbabilityAssessmentViewInfoTest.cs (.../PipingFailureMechanismSectionsProbabilityAssessmentViewInfoTest.cs) (revision aadbaf228b074ae1d2a2ec3163a5705fc2bf69e0) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismSectionsProbabilityAssessmentViewInfoTest.cs (.../PipingFailureMechanismSectionsProbabilityAssessmentViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -20,10 +20,8 @@ // All rights reserved. using System.Collections.Generic; -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -88,16 +86,6 @@ mocks.VerifyAll(); } - [Test] - public void Image_Always_ReturnsSectionsIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.SectionsIcon, image); - } - [TestFixture] public class ShouldClosePipingSectionsViewForDataTester : ShouldCloseViewWithFailureMechanismTester { Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs =================================================================== diff -u -r04117503725bf54fb849d35e0e4fe94bf9eb0345 -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs (.../PipingFailureMechanismViewInfoTest.cs) (revision 04117503725bf54fb849d35e0e4fe94bf9eb0345) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs (.../PipingFailureMechanismViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -19,11 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using System.Threading; using System.Windows.Forms; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -84,16 +82,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] [Apartment(ApartmentState.STA)] public void CreateInstance_WithContext_ReturnPipingFailureMechanismView() { Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailurePathViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailurePathViewInfoTest.cs (.../PipingFailurePathViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailurePathViewInfoTest.cs (.../PipingFailurePathViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -19,11 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using System.Threading; using System.Windows.Forms; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -84,16 +82,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] [TestCase(true)] [TestCase(false)] public void AdditionalDataCheck_Always_ReturnTrueOnlyIfFailureMechanismInAssembly(bool inAssembly) Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs =================================================================== diff -u -r033c6c0593bb66a5fcea0bbf16d4165071fa6476 -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs (.../PipingScenariosViewInfoTest.cs) (revision 033c6c0593bb66a5fcea0bbf16d4165071fa6476) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs (.../PipingScenariosViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -21,7 +21,6 @@ using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -62,7 +61,6 @@ // Assert Assert.AreEqual(typeof(PipingScenariosContext), info.DataType); Assert.AreEqual(typeof(CalculationGroup), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.ScenariosIcon, info.Image); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs =================================================================== diff -u -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs (.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs) (revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs (.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -22,7 +22,6 @@ using System.Linq; using System.Threading; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Riskeer.Common.Data.Calculation; @@ -69,7 +68,6 @@ { // Assert Assert.AreEqual(typeof(ProbabilisticPipingCalculationScenario), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralOutputIcon, info.Image); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs =================================================================== diff -u -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs (.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs) (revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs (.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -22,7 +22,6 @@ using System.Linq; using System.Threading; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Riskeer.Common.Data.Calculation; @@ -69,7 +68,6 @@ { // Assert Assert.AreEqual(typeof(ProbabilisticPipingCalculationScenario), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralOutputIcon, info.Image); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticPipingInputViewInfoTest.cs =================================================================== diff -u -r3d3aae8c8517497d0644e640f1a521bdf483065b -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticPipingInputViewInfoTest.cs (.../ProbabilisticPipingInputViewInfoTest.cs) (revision 3d3aae8c8517497d0644e640f1a521bdf483065b) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticPipingInputViewInfoTest.cs (.../ProbabilisticPipingInputViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -20,7 +20,6 @@ // All rights reserved. using System.Linq; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -63,7 +62,6 @@ { // Assert Assert.AreEqual(typeof(ProbabilisticPipingCalculationScenario), info.ViewDataType); - TestHelper.AssertImagesAreEqual(PipingFormsResources.PipingInputIcon, info.Image); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs =================================================================== diff -u -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs (.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs) (revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs (.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -22,7 +22,6 @@ using System.Linq; using System.Threading; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Riskeer.Common.Data.Calculation; @@ -69,7 +68,6 @@ { // Assert Assert.AreEqual(typeof(ProbabilisticPipingCalculationScenario), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralOutputIcon, info.Image); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs =================================================================== diff -u -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs (.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs) (revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs (.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -22,7 +22,6 @@ using System.Linq; using System.Threading; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Riskeer.Common.Data.Calculation; @@ -69,7 +68,6 @@ { // Assert Assert.AreEqual(typeof(ProbabilisticPipingCalculationScenario), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralOutputIcon, info.Image); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/SemiProbabilisticPipingInputViewInfoTest.cs =================================================================== diff -u -r3d3aae8c8517497d0644e640f1a521bdf483065b -rdbe0316b596d72e1d037cb905ed7d3379d747e0e --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/SemiProbabilisticPipingInputViewInfoTest.cs (.../SemiProbabilisticPipingInputViewInfoTest.cs) (revision 3d3aae8c8517497d0644e640f1a521bdf483065b) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/SemiProbabilisticPipingInputViewInfoTest.cs (.../SemiProbabilisticPipingInputViewInfoTest.cs) (revision dbe0316b596d72e1d037cb905ed7d3379d747e0e) @@ -20,7 +20,6 @@ // All rights reserved. using System.Linq; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -63,7 +62,6 @@ { // Assert Assert.AreEqual(typeof(SemiProbabilisticPipingCalculationScenario), info.ViewDataType); - TestHelper.AssertImagesAreEqual(PipingFormsResources.PipingInputIcon, info.Image); } [Test]