Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 62b8135dcc02e56da0616c5d6f4e345198994393) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -180,14 +180,12 @@ yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, CreateInstance = context => new GrassCoverErosionInwardsFailureMechanismView(context.WrappedData, context.Parent) }; yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, AdditionalDataCheck = context => context.WrappedData.InAssembly, CloseForData = CloseFailurePathViewForData, CreateInstance = context => new GrassCoverErosionInwardsFailurePathView(context.WrappedData, context.Parent) @@ -201,8 +199,7 @@ GetViewData = context => context.WrappedData, GetViewName = (view, context) => RiskeerCommonFormsResources.Scenarios_DisplayName, CreateInstance = context => new GrassCoverErosionInwardsScenariosView(context.WrappedData, context.ParentFailureMechanism), - CloseForData = CloseScenariosViewForData, - Image = RiskeerCommonFormsResources.ScenariosIcon + CloseForData = CloseScenariosViewForData }; yield return new RiskeerViewInfo< @@ -211,7 +208,6 @@ GrassCoverErosionInwardsFailureMechanismResultView>(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.WrappedData, CreateInstance = context => new GrassCoverErosionInwardsFailureMechanismResultView( @@ -222,15 +218,13 @@ yield return new RiskeerViewInfo(() => Gui) { - Image = RiskeerCommonFormsResources.GenericInputOutputIcon, GetViewName = (view, context) => RiskeerCommonFormsResources.Calculation_Input, GetViewData = context => context.Calculation, CloseForData = CloseInputViewForData }; yield return new RiskeerViewInfo(() => Gui) { - Image = RiskeerCommonFormsResources.GeneralOutputIcon, GetViewName = (view, context) => Resources.OvertoppingOutput_DisplayName, GetViewData = context => context.WrappedData, CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData, @@ -240,7 +234,6 @@ yield return new RiskeerViewInfo(() => Gui) { - Image = RiskeerCommonFormsResources.GeneralOutputIcon, GetViewName = (view, context) => GrassCoverErosionInwardsFormsResources.DikeHeight_DisplayName, GetViewData = context => context.WrappedData, CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData, @@ -250,7 +243,6 @@ yield return new RiskeerViewInfo(() => Gui) { - Image = RiskeerCommonFormsResources.GeneralOutputIcon, GetViewName = (view, context) => GrassCoverErosionInwardsFormsResources.OvertoppingRate_DisplayName, GetViewData = context => context.WrappedData, CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData, @@ -263,7 +255,6 @@ CreateInstance = context => new GrassCoverErosionInwardsCalculationsView(context.WrappedData, context.FailureMechanism, context.AssessmentSection), GetViewData = context => context.WrappedData, GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.GeneralFolderIcon, AdditionalDataCheck = context => context.WrappedData == context.FailureMechanism.CalculationsGroup, CloseForData = CloseCalculationsViewForData }; Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsCalculationsViewInfoTest.cs =================================================================== diff -u -r085a498bc066870390cef76b6ae8ec37573b2fdf -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsCalculationsViewInfoTest.cs (.../GrassCoverErosionInwardsCalculationsViewInfoTest.cs) (revision 085a498bc066870390cef76b6ae8ec37573b2fdf) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsCalculationsViewInfoTest.cs (.../GrassCoverErosionInwardsCalculationsViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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(GrassCoverErosionInwardsCalculationGroupContext), info.DataType); Assert.AreEqual(typeof(CalculationGroup), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralFolderIcon, info.Image); } [Test] Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -rc822ad9fa185d57ddbaf9c0bbd61790e73272bd1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs) (revision c822ad9fa185d57ddbaf9c0bbd61790e73272bd1) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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,18 +96,8 @@ Assert.AreSame(sectionResults, viewData); mocks.VerifyAll(); } - + [Test] - public void Image_Always_ReturnsFailureMechanismSectionResultIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image); - } - - [Test] public void CloseForData_AssessmentSectionRemovedWithoutFailureMechanism_ReturnsFalse() { // Setup Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismViewInfoTest.cs =================================================================== diff -u -r04117503725bf54fb849d35e0e4fe94bf9eb0345 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismViewInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismViewInfoTest.cs) (revision 04117503725bf54fb849d35e0e4fe94bf9eb0345) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismViewInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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_ReturnGrassCoverErosionInwardsFailureMechanismView() { Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailurePathViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailurePathViewInfoTest.cs (.../GrassCoverErosionInwardsFailurePathViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailurePathViewInfoTest.cs (.../GrassCoverErosionInwardsFailurePathViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs =================================================================== diff -u -rdfde1299339ca1573a354d708547072b1f30f24b -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs (.../GrassCoverErosionInwardsInputViewInfoTest.cs) (revision dfde1299339ca1573a354d708547072b1f30f24b) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs (.../GrassCoverErosionInwardsInputViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -20,7 +20,6 @@ // All rights reserved. using System.Linq; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -60,7 +59,6 @@ // Assert Assert.AreEqual(typeof(GrassCoverErosionInwardsInputContext), info.DataType); Assert.AreEqual(typeof(GrassCoverErosionInwardsCalculation), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GenericInputOutputIcon, info.Image); } [Test] Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs =================================================================== diff -u -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs (.../GrassCoverErosionInwardsOutputViewInfoTestBase.cs) (revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs (.../GrassCoverErosionInwardsOutputViewInfoTestBase.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -22,14 +22,12 @@ 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; 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.GrassCoverErosionInwards.Data; using Riskeer.GrassCoverErosionInwards.Forms.PresentationObjects; @@ -72,7 +70,6 @@ // Assert Assert.AreEqual(typeof(TOutputContext), info.DataType); Assert.AreEqual(typeof(GrassCoverErosionInwardsCalculation), info.ViewDataType); - TestHelper.AssertImagesAreEqual(Resources.GeneralOutputIcon, info.Image); } [Test] Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs =================================================================== diff -u -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs (.../GrassCoverErosionInwardsScenariosViewInfoTest.cs) (revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs (.../GrassCoverErosionInwardsScenariosViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,10 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -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; @@ -89,16 +87,6 @@ } [Test] - public void Image_Always_ReturnScenariosIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.ScenariosIcon, image); - } - - [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnFalse() { // Setup Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 62b8135dcc02e56da0616c5d6f4e345198994393) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -113,14 +113,12 @@ yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, CreateInstance = context => new GrassCoverErosionOutwardsFailureMechanismView(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 GrassCoverErosionOutwardsFailurePathView(context.WrappedData, context.Parent), CloseForData = CloseFailurePathViewForData @@ -132,7 +130,6 @@ GrassCoverErosionOutwardsFailureMechanismResultView>(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.WrappedData, CreateInstance = context => new GrassCoverErosionOutwardsFailureMechanismResultView( @@ -144,7 +141,6 @@ ICalculation, WaveConditionsInputView>(() => Gui) { - Image = RiskeerCommonFormsResources.GenericInputOutputIcon, GetViewName = (view, context) => RiskeerCommonFormsResources.Calculation_Input, CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData, CreateInstance = context => new WaveConditionsInputView( Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r7c4861326360ada93b789079b501f4f7c34572a1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs) (revision 7c4861326360ada93b789079b501f4f7c34572a1) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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; @@ -93,16 +91,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/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismViewInfoTest.cs =================================================================== diff -u -r1dd2c22368f99235c15314f434505d4b5fc27a90 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismViewInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewInfoTest.cs) (revision 1dd2c22368f99235c15314f434505d4b5fc27a90) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismViewInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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_ReturnGrassCoverErosionOutwardsFailureMechanismView() { Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailurePathViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailurePathViewInfoTest.cs (.../GrassCoverErosionOutwardsFailurePathViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailurePathViewInfoTest.cs (.../GrassCoverErosionOutwardsFailurePathViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs =================================================================== diff -u -r9959b748c7055a8d2716a60be77ac8edb8663e86 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs) (revision 9959b748c7055a8d2716a60be77ac8edb8663e86) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -24,7 +24,6 @@ using System.Linq; using Core.Common.Base.Data; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Components.Chart.Data; using Core.Gui.Plugin; using NUnit.Framework; @@ -77,7 +76,6 @@ // Assert Assert.AreEqual(typeof(GrassCoverErosionOutwardsWaveConditionsInputContext), info.DataType); Assert.AreEqual(typeof(ICalculation), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GenericInputOutputIcon, info.Image); } [Test] Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 62b8135dcc02e56da0616c5d6f4e345198994393) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -162,14 +162,12 @@ yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, CreateInstance = context => new HeightStructuresFailureMechanismView(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 HeightStructuresFailurePathView(context.WrappedData, context.Parent), CloseForData = CloseFailurePathViewForData @@ -184,7 +182,6 @@ GetViewName = (view, context) => RiskeerCommonFormsResources.Scenarios_DisplayName, CreateInstance = context => new HeightStructuresScenariosView(context.WrappedData, context.ParentFailureMechanism), CloseForData = CloseScenariosViewForData, - Image = RiskeerCommonFormsResources.ScenariosIcon }; yield return new RiskeerViewInfo< @@ -193,7 +190,6 @@ HeightStructuresFailureMechanismResultView>(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.WrappedData, CreateInstance = context => new HeightStructuresFailureMechanismResultView( @@ -207,7 +203,6 @@ CreateInstance = context => new HeightStructuresCalculationsView(context.WrappedData, context.FailureMechanism, context.AssessmentSection), GetViewData = context => context.WrappedData, GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.GeneralFolderIcon, AdditionalDataCheck = context => context.WrappedData == context.FailureMechanism.CalculationsGroup, CloseForData = CloseCalculationsViewForData }; Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresCalculationsViewInfoTest.cs =================================================================== diff -u -rfdef7e5b0412c76725a15c5d73a16d3915636da2 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresCalculationsViewInfoTest.cs (.../HeightStructuresCalculationsViewInfoTest.cs) (revision fdef7e5b0412c76725a15c5d73a16d3915636da2) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresCalculationsViewInfoTest.cs (.../HeightStructuresCalculationsViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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(HeightStructuresCalculationGroupContext), info.DataType); Assert.AreEqual(typeof(CalculationGroup), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralFolderIcon, info.Image); } [Test] Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -rbe7e72912cca4f8f78e6246b8b98361a5751b1bb -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs (.../HeightStructuresFailureMechanismResultViewInfoTest.cs) (revision be7e72912cca4f8f78e6246b8b98361a5751b1bb) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs (.../HeightStructuresFailureMechanismResultViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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; @@ -102,16 +100,6 @@ } [Test] - public void Image_Always_ReturnsFailureMechanismSectionResultIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image); - } - - [Test] public void CloseForData_AssessmentSectionRemovedWithoutFailureMechanism_ReturnsFalse() { // Setup Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismViewInfoTest.cs =================================================================== diff -u -r425e7027bd912f2c2c416ede1a90356d3b183881 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismViewInfoTest.cs (.../HeightStructuresFailureMechanismViewInfoTest.cs) (revision 425e7027bd912f2c2c416ede1a90356d3b183881) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismViewInfoTest.cs (.../HeightStructuresFailureMechanismViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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_ReturnHeightStructuresFailureMechanismView() { Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailurePathViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailurePathViewInfoTest.cs (.../HeightStructuresFailurePathViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailurePathViewInfoTest.cs (.../HeightStructuresFailurePathViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresScenariosViewInfoTest.cs =================================================================== diff -u -rd9fc90deb21b73411e4ecccc4405da3122d38999 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresScenariosViewInfoTest.cs (.../HeightStructuresScenariosViewInfoTest.cs) (revision d9fc90deb21b73411e4ecccc4405da3122d38999) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresScenariosViewInfoTest.cs (.../HeightStructuresScenariosViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,10 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -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; @@ -89,16 +87,6 @@ } [Test] - public void Image_Always_ReturnScenariosIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.ScenariosIcon, image); - } - - [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnFalse() { // Setup Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 62b8135dcc02e56da0616c5d6f4e345198994393) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -346,7 +346,6 @@ yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.Norms_DisplayName, - Image = RiskeerCommonFormsResources.NormsIcon, CloseForData = (view, dataToCloseFor) => dataToCloseFor is IAssessmentSection assessmentSection && assessmentSection.FailureMechanismContribution == view.FailureMechanismContribution, CreateInstance = context => new AssessmentSectionAssemblyCategoriesView(context.AssessmentSection.FailureMechanismContribution) @@ -356,7 +355,6 @@ { GetViewName = (view, context) => GetWaterLevelCalculationsForNormTargetProbabilitiesViewName(context.WrappedData, context.AssessmentSection), GetViewData = context => context.WrappedData, - Image = RiskeerCommonFormsResources.GenericInputOutputIcon, CloseForData = CloseHydraulicBoundaryCalculationsViewForData, CreateInstance = context => new DesignWaterLevelCalculationsView(context.WrappedData, context.AssessmentSection, @@ -372,7 +370,6 @@ { GetViewName = (view, context) => GetWaterLevelCalculationsForUserDefinedTargetProbabilitiesViewName(context.WrappedData, context.AssessmentSection), GetViewData = context => context.WrappedData.HydraulicBoundaryLocationCalculations, - Image = RiskeerCommonFormsResources.GenericInputOutputIcon, CloseForData = CloseForWaterLevelCalculationsForUserDefinedTargetProbabilityContextData, CreateInstance = context => new DesignWaterLevelCalculationsView(context.WrappedData.HydraulicBoundaryLocationCalculations, context.AssessmentSection, @@ -389,7 +386,6 @@ { GetViewName = (view, context) => GetWaveHeightCalculationsForUserDefinedTargetProbabilitiesViewName(context.WrappedData, context.AssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities), GetViewData = context => context.WrappedData.HydraulicBoundaryLocationCalculations, - Image = RiskeerCommonFormsResources.GenericInputOutputIcon, CloseForData = CloseForWaveHeightCalculationsForUserDefinedTargetProbabilityContextData, CreateInstance = context => new WaveHeightCalculationsView(context.WrappedData.HydraulicBoundaryLocationCalculations, context.AssessmentSection, @@ -406,31 +402,27 @@ yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => RiskeerFormsResources.AssessmentSectionMap_DisplayName, - Image = RiskeerFormsResources.Map, CreateInstance = context => new AssessmentSectionReferenceLineView(context.WrappedData), CloseForData = CloseAssessmentSectionViewForData }; yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => RiskeerFormsResources.AssessmentSectionMap_DisplayName, - Image = RiskeerFormsResources.Map, CreateInstance = context => new AssessmentSectionExtendedView(context.WrappedData), CloseForData = CloseAssessmentSectionViewForData }; yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => RiskeerFormsResources.AssessmentSectionMap_DisplayName, - Image = RiskeerFormsResources.Map, CreateInstance = context => new AssessmentSectionExtendedView(context.WrappedData), CloseForData = CloseAssessmentSectionViewForData }; yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => RiskeerFormsResources.AssessmentSectionMap_DisplayName, - Image = RiskeerFormsResources.Map, CreateInstance = context => new AssessmentSectionExtendedView(context.WrappedData), CloseForData = CloseAssessmentSectionViewForData }; @@ -580,7 +572,6 @@ MacroStabilityOutwardsResultView>(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, CloseForData = CloseFailureMechanismResultViewForData context.WrappedData.Name, CreateInstance = context => new SpecificFailurePathView(context.WrappedData, context.Parent), - Image = RiskeerCommonFormsResources.FailureMechanismIcon, AdditionalDataCheck = context => context.WrappedData.InAssembly, CloseForData = RiskeerPluginHelper.ShouldCloseForFailurePathView }; @@ -606,22 +596,19 @@ { GetViewName = (view, comment) => Resources.Comment_DisplayName, GetViewData = comment => comment, - Image = RiskeerCommonFormsResources.EditDocumentIcon, CloseForData = CloseCommentViewForData }; yield return new RiskeerViewInfo, FailureMechanismSectionsView>(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanismSections_DisplayName, - Image = RiskeerCommonFormsResources.SectionsIcon, CloseForData = RiskeerPluginHelper.ShouldCloseForFailurePathView, CreateInstance = context => new FailureMechanismSectionsView(context.WrappedData.Sections, context.WrappedData), GetViewData = context => context.WrappedData.Sections }; yield return new RiskeerViewInfo(() => Gui) { - Image = RiskeerCommonFormsResources.GeneralOutputIcon, GetViewName = (view, context) => RiskeerCommonFormsResources.CalculationOutput_DisplayName, GetViewData = context => context.WrappedData, CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData, @@ -632,23 +619,20 @@ yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.CombinedAssembly_DisplayName, - Image = Resources.AssemblyResultTotal, CloseForData = (view, dataToCloseFor) => ReferenceEquals(view.AssessmentSection, dataToCloseFor), CreateInstance = context => new AssemblyResultTotalView(context.WrappedData) }; yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => RiskeerFormsResources.AssemblyResultPerSection_DisplayName, - Image = Resources.AssemblyResultPerSection, CloseForData = (view, dataToCloseFor) => ReferenceEquals(view.AssessmentSection, dataToCloseFor), CreateInstance = context => new AssemblyResultPerSectionView(context.WrappedData) }; yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.AssemblyCategories_DisplayName, - Image = RiskeerCommonFormsResources.NormsIcon, CloseForData = RiskeerPluginHelper.ShouldCloseForFailureMechanismView, CreateInstance = context => new FailureMechanismAssemblyCategoriesView(context.WrappedData, context.AssessmentSection, @@ -659,7 +643,6 @@ yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.AssemblyCategories_DisplayName, - Image = RiskeerCommonFormsResources.NormsIcon, CloseForData = RiskeerPluginHelper.ShouldCloseForFailureMechanismView, CreateInstance = context => new MacroStabilityOutwardsAssemblyCategoriesView((MacroStabilityOutwardsFailureMechanism) context.WrappedData, context.AssessmentSection, @@ -668,15 +651,13 @@ yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.AssemblyCategories_DisplayName, - Image = RiskeerCommonFormsResources.NormsIcon, CloseForData = (view, dataToCloseFor) => ReferenceEquals(view.AssessmentSection, dataToCloseFor), CreateInstance = context => new AssemblyResultCategoriesView(context.WrappedData, context.GetAssemblyCategoriesFunc) }; yield return new RiskeerViewInfo(() => Gui) { GetViewName = (view, context) => RiskeerFormsResources.AssemblyResultPerSectionMapView_DisplayName, - Image = Resources.AssemblyResultPerSectionMap, CloseForData = (view, dataToCloseFor) => ReferenceEquals(view.AssessmentSection, dataToCloseFor), CreateInstance = context => new AssemblyResultPerSectionMapView(context.WrappedData) }; @@ -1340,7 +1321,6 @@ TView>(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.WrappedData, CreateInstance = createInstanceFunc @@ -1642,7 +1622,6 @@ FailureMechanismWithDetailedAssessmentView>(() => Gui) { GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, CloseForData = (view, dataToCloseFor) => ReferenceEquals(view.AssessmentSection, dataToCloseFor), AdditionalDataCheck = context => context.WrappedData.InAssembly, CreateInstance = createInstanceFunc @@ -1664,7 +1643,6 @@ FailureMechanismWithoutDetailedAssessmentView>(() => Gui) { GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, CloseForData = (view, dataToCloseFor) => ReferenceEquals(view.AssessmentSection, dataToCloseFor), AdditionalDataCheck = context => context.WrappedData.InAssembly, CreateInstance = createInstanceFunc Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultCategoriesViewInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultCategoriesViewInfoTest.cs (.../AssemblyResultCategoriesViewInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultCategoriesViewInfoTest.cs (.../AssemblyResultCategoriesViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Drawing; using System.Linq; using Core.Common.TestUtil; using Core.Gui.Plugin; @@ -72,16 +71,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.NormsIcon, image); - } - - [Test] public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultPerSectionMapViewInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultPerSectionMapViewInfoTest.cs (.../AssemblyResultPerSectionMapViewInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultPerSectionMapViewInfoTest.cs (.../AssemblyResultPerSectionMapViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Drawing; using System.Linq; using Core.Common.TestUtil; using Core.Gui.Plugin; @@ -29,7 +28,6 @@ using Riskeer.Integration.Data; using Riskeer.Integration.Forms.PresentationObjects; using Riskeer.Integration.Forms.Views; -using Riskeer.Integration.Plugin.Properties; namespace Riskeer.Integration.Plugin.Test.ViewInfos { @@ -71,16 +69,6 @@ } [Test] - public void Image_Always_ReturnsExpectedIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(Resources.AssemblyResultPerSectionMap, image); - } - - [Test] public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultPerSectionViewInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultPerSectionViewInfoTest.cs (.../AssemblyResultPerSectionViewInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultPerSectionViewInfoTest.cs (.../AssemblyResultPerSectionViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Drawing; using System.Linq; using Core.Common.TestUtil; using Core.Gui.Plugin; @@ -29,7 +28,6 @@ using Riskeer.Integration.Data; using Riskeer.Integration.Forms.PresentationObjects; using Riskeer.Integration.Forms.Views; -using Riskeer.Integration.Plugin.Properties; namespace Riskeer.Integration.Plugin.Test.ViewInfos { @@ -71,16 +69,6 @@ } [Test] - public void Image_Always_ReturnsExpectedIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(Resources.AssemblyResultPerSection, image); - } - - [Test] public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultTotalViewInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultTotalViewInfoTest.cs (.../AssemblyResultTotalViewInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssemblyResultTotalViewInfoTest.cs (.../AssemblyResultTotalViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Drawing; using System.Linq; using Core.Common.TestUtil; using Core.Gui.Plugin; @@ -29,7 +28,6 @@ using Riskeer.Integration.Data; using Riskeer.Integration.Forms.PresentationObjects; using Riskeer.Integration.Forms.Views; -using Riskeer.Integration.Plugin.Properties; namespace Riskeer.Integration.Plugin.Test.ViewInfos { @@ -96,16 +94,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(Resources.AssemblyResultTotal, image); - } - - [Test] public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionAssemblyCategoriesViewInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionAssemblyCategoriesViewInfoTest.cs (.../AssessmentSectionAssemblyCategoriesViewInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionAssemblyCategoriesViewInfoTest.cs (.../AssessmentSectionAssemblyCategoriesViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -20,9 +20,7 @@ // All rights reserved. using System; -using System.Drawing; using System.Linq; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -105,16 +103,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.NormsIcon, image); - } - - [Test] public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionStateRootContextViewInfoTest.cs =================================================================== diff -u -r3b81a49ee618fde68b02f7b4403b05d2bc05f7b0 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionStateRootContextViewInfoTest.cs (.../AssessmentSectionStateRootContextViewInfoTest.cs) (revision 3b81a49ee618fde68b02f7b4403b05d2bc05f7b0) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionStateRootContextViewInfoTest.cs (.../AssessmentSectionStateRootContextViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; using Core.Common.TestUtil; @@ -71,16 +70,6 @@ } [Test] - public void Image_Always_ReturnsExpectedIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerFormsResources.Map, image); - } - - [Test] public void CreateInstance_WithContext_ReturnsAssessmentSectionReferenceLineView() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CalculationsStateRootContextViewInfoTest.cs =================================================================== diff -u -r3b81a49ee618fde68b02f7b4403b05d2bc05f7b0 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CalculationsStateRootContextViewInfoTest.cs (.../CalculationsStateRootContextViewInfoTest.cs) (revision 3b81a49ee618fde68b02f7b4403b05d2bc05f7b0) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CalculationsStateRootContextViewInfoTest.cs (.../CalculationsStateRootContextViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; using Core.Common.TestUtil; @@ -71,16 +70,6 @@ } [Test] - public void Image_Always_ReturnsExpectedIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerFormsResources.Map, image); - } - - [Test] public void CreateInstance_WithContext_ReturnsAssessmentSectionReferenceLineView() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs =================================================================== diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs (.../CommentViewInfoTest.cs) (revision 62b8135dcc02e56da0616c5d6f4e345198994393) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs (.../CommentViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,10 +19,8 @@ // 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.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; @@ -89,16 +87,6 @@ } [Test] - public void Image_Always_ReturnsEditDocumentIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.EditDocumentIcon, image); - } - - [Test] public void CloseForData_ObjectIsNotObjectOfInterest_ReturnFalse() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/FailureMechanismAssemblyCategoriesViewInfoTest.cs =================================================================== diff -u -r2e1ab6663d2d1e55b101f212f276ad1bb25eadc1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/FailureMechanismAssemblyCategoriesViewInfoTest.cs (.../FailureMechanismAssemblyCategoriesViewInfoTest.cs) (revision 2e1ab6663d2d1e55b101f212f276ad1bb25eadc1) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/FailureMechanismAssemblyCategoriesViewInfoTest.cs (.../FailureMechanismAssemblyCategoriesViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -21,10 +21,8 @@ using System; 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 Riskeer.AssemblyTool.Data; @@ -91,16 +89,6 @@ } } - [Test] - public void Image_Always_ReturnsNormIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.NormsIcon, image); - } - [TestFixture] public class ShouldCloseFailureMechanismAssemblyCategoriesViewForDataTester : ShouldCloseViewWithFailureMechanismTester { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/FailureMechanismSectionsViewInfoTest.cs =================================================================== diff -u -rbc00873ff38760667e52ce3f0290a5d6ede0f7ab -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/FailureMechanismSectionsViewInfoTest.cs (.../FailureMechanismSectionsViewInfoTest.cs) (revision bc00873ff38760667e52ce3f0290a5d6ede0f7ab) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/FailureMechanismSectionsViewInfoTest.cs (.../FailureMechanismSectionsViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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 ShouldCloseFailureMechanismSectionsViewForDataTester : ShouldCloseViewWithFailurePathTester { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/FailurePathsStateRootContextViewInfoTest.cs =================================================================== diff -u -r3b81a49ee618fde68b02f7b4403b05d2bc05f7b0 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/FailurePathsStateRootContextViewInfoTest.cs (.../FailurePathsStateRootContextViewInfoTest.cs) (revision 3b81a49ee618fde68b02f7b4403b05d2bc05f7b0) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/FailurePathsStateRootContextViewInfoTest.cs (.../FailurePathsStateRootContextViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; using Core.Common.TestUtil; @@ -71,16 +70,6 @@ } [Test] - public void Image_Always_ReturnsExpectedIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerFormsResources.Map, image); - } - - [Test] public void CreateInstance_WithContext_ReturnsAssessmentSectionExtendedView() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs =================================================================== diff -u -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs (.../GeneralResultFaultTreeIllustrationPointViewInfoTest.cs) (revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs (.../GeneralResultFaultTreeIllustrationPointViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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 Rhino.Mocks; @@ -71,7 +70,6 @@ // Assert Assert.AreEqual(typeof(StructuresOutputContext), info.DataType); Assert.AreEqual(typeof(IStructuresCalculation), info.ViewDataType); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralOutputIcon, info.Image); } [Test] Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismViewInfoTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismViewInfoTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,10 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Components.Gis.Features; using Core.Gui.Plugin; using NUnit.Framework; @@ -86,16 +84,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsResultViewInfoTest.cs =================================================================== diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsResultViewInfoTest.cs (.../GrassCoverSlipOffInwardsResultViewInfoTest.cs) (revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsResultViewInfoTest.cs (.../GrassCoverSlipOffInwardsResultViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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; @@ -93,16 +91,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/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismViewInfoTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismViewInfoTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,10 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Components.Gis.Features; using Core.Gui.Plugin; using NUnit.Framework; @@ -86,16 +84,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsResultViewInfoTest.cs =================================================================== diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsResultViewInfoTest.cs (.../GrassCoverSlipOffOutwardsResultViewInfoTest.cs) (revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsResultViewInfoTest.cs (.../GrassCoverSlipOffOutwardsResultViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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; @@ -93,16 +91,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/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/HydraulicLoadsStateRootContextViewInfoTest.cs =================================================================== diff -u -r2ba5726e055a73908dbb510b992a9fc430f52fc7 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/HydraulicLoadsStateRootContextViewInfoTest.cs (.../HydraulicLoadsStateRootContextViewInfoTest.cs) (revision 2ba5726e055a73908dbb510b992a9fc430f52fc7) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/HydraulicLoadsStateRootContextViewInfoTest.cs (.../HydraulicLoadsStateRootContextViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; using Core.Common.TestUtil; @@ -71,16 +70,6 @@ } [Test] - public void Image_Always_ReturnsExpectedIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerFormsResources.Map, image); - } - - [Test] public void CreateInstance_WithContext_ReturnsAssessmentSectionExtendedView() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsAssemblyCategoriesViewInfoTest.cs =================================================================== diff -u -r2e1ab6663d2d1e55b101f212f276ad1bb25eadc1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsAssemblyCategoriesViewInfoTest.cs (.../MacroStabilityOutwardsAssemblyCategoriesViewInfoTest.cs) (revision 2e1ab6663d2d1e55b101f212f276ad1bb25eadc1) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsAssemblyCategoriesViewInfoTest.cs (.../MacroStabilityOutwardsAssemblyCategoriesViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -20,10 +20,8 @@ // All rights reserved. using System; -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Riskeer.AssemblyTool.Data; @@ -90,16 +88,6 @@ } } - [Test] - public void Image_Always_ReturnsNormIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.NormsIcon, image); - } - [TestFixture] public class ShouldCloseMacroStabilityOutwardsAssemblyCategoriesViewForDataTester : ShouldCloseViewWithFailureMechanismTester { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsFailureMechanismViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsFailureMechanismViewInfoTest.cs (.../MacroStabilityOutwardsFailureMechanismViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsFailureMechanismViewInfoTest.cs (.../MacroStabilityOutwardsFailureMechanismViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,10 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Components.Gis.Features; using Core.Gui.Plugin; using NUnit.Framework; @@ -87,16 +85,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsResultViewInfoTest.cs =================================================================== diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsResultViewInfoTest.cs (.../MacroStabilityOutwardsResultViewInfoTest.cs) (revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsResultViewInfoTest.cs (.../MacroStabilityOutwardsResultViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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; @@ -97,16 +95,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/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismViewInfoTest.cs (.../MicrostabilityFailureMechanismViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismViewInfoTest.cs (.../MicrostabilityFailureMechanismViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,10 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Components.Gis.Features; using Core.Gui.Plugin; using NUnit.Framework; @@ -86,16 +84,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityResultViewInfoTest.cs =================================================================== diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityResultViewInfoTest.cs (.../MicrostabilityResultViewInfoTest.cs) (revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityResultViewInfoTest.cs (.../MicrostabilityResultViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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; @@ -92,16 +90,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/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismViewInfoTest.cs (.../PipingStructureFailureMechanismViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismViewInfoTest.cs (.../PipingStructureFailureMechanismViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,10 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Components.Gis.Features; using Core.Gui.Plugin; using NUnit.Framework; @@ -86,16 +84,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureResultViewInfoTest.cs =================================================================== diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureResultViewInfoTest.cs (.../PipingStructureResultViewInfoTest.cs) (revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureResultViewInfoTest.cs (.../PipingStructureResultViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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; @@ -92,16 +90,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/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/SpecificFailurePathViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/SpecificFailurePathViewInfoTest.cs (.../SpecificFailurePathViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/SpecificFailurePathViewInfoTest.cs (.../SpecificFailurePathViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,19 +19,16 @@ // 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.Base; -using Core.Common.TestUtil; using Core.Gui.Plugin; using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; -using Riskeer.Common.Forms.Properties; using Riskeer.Integration.Data.FailurePath; using Riskeer.Integration.Forms.PresentationObjects; using Riskeer.Integration.Forms.Views; @@ -85,16 +82,6 @@ } [Test] - public void Image_Always_ReturnsGenericFailureMechanismIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(Resources.FailureMechanismIcon, image); - } - - [Test] [Apartment(ApartmentState.STA)] public void CreateInstance_WithContext_ReturnsSpecificFailurePathView() { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionFailureMechanismViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionFailureMechanismViewInfoTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionFailureMechanismViewInfoTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,10 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Components.Gis.Features; using Core.Gui.Plugin; using NUnit.Framework; @@ -86,16 +84,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs =================================================================== diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs) (revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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; @@ -93,16 +91,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/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/TechnicalInnovationFailureMechanismViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/TechnicalInnovationFailureMechanismViewInfoTest.cs (.../TechnicalInnovationFailureMechanismViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/TechnicalInnovationFailureMechanismViewInfoTest.cs (.../TechnicalInnovationFailureMechanismViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,10 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Components.Gis.Features; using Core.Gui.Plugin; using NUnit.Framework; @@ -86,16 +84,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/TechnicalInnovationResultViewInfoTest.cs =================================================================== diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/TechnicalInnovationResultViewInfoTest.cs (.../TechnicalInnovationResultViewInfoTest.cs) (revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/TechnicalInnovationResultViewInfoTest.cs (.../TechnicalInnovationResultViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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; @@ -92,16 +90,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/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs =================================================================== diff -u -r647b959fbded2f2d08c4caa113c8ec8621d755a0 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs) (revision 647b959fbded2f2d08c4caa113c8ec8621d755a0) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -21,13 +21,11 @@ using System; using System.Collections.Generic; -using System.Drawing; using System.Linq; using System.Threading; using System.Windows.Forms; using Core.Common.Base; using Core.Common.Base.Storage; -using Core.Common.TestUtil; using Core.Gui; using Core.Gui.Commands; using Core.Gui.Forms.Main; @@ -117,22 +115,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Setup - using (var plugin = new RiskeerPlugin()) - { - ViewInfo info = GetViewInfo(plugin); - - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GenericInputOutputIcon, image); - } - } - - [Test] public void GetViewData_Always_ReturnsHydraulicBoundaryLocationCalculations() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs =================================================================== diff -u -r0b653d9c7327ca4a1b83a84e61073d143e82b6e7 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs) (revision 0b653d9c7327ca4a1b83a84e61073d143e82b6e7) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -21,13 +21,11 @@ using System; using System.Collections.Generic; -using System.Drawing; using System.Linq; using System.Threading; using System.Windows.Forms; using Core.Common.Base; using Core.Common.Base.Storage; -using Core.Common.TestUtil; using Core.Gui; using Core.Gui.Commands; using Core.Gui.Forms.Main; @@ -121,22 +119,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Setup - using (var plugin = new RiskeerPlugin()) - { - ViewInfo info = GetViewInfo(plugin); - - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GenericInputOutputIcon, image); - } - } - - [Test] public void GetViewData_Always_ReturnsHydraulicBoundaryLocationCalculations() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismViewInfoTest.cs =================================================================== diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismViewInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismViewInfoTest.cs) (revision 68b02d607d704885a5d113d2766b237c207a1de6) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismViewInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -19,10 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Drawing; using System.Linq; using Core.Common.Controls.Views; -using Core.Common.TestUtil; using Core.Components.Gis.Features; using Core.Gui.Plugin; using NUnit.Framework; @@ -86,16 +84,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image); - } - - [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs =================================================================== diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs (.../WaterPressureAsphaltCoverResultViewInfoTest.cs) (revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs (.../WaterPressureAsphaltCoverResultViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -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; @@ -92,16 +90,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/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs =================================================================== diff -u -r0b653d9c7327ca4a1b83a84e61073d143e82b6e7 -ref8bf2f90306f8281026cecd4c44782ebe8407ed --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs) (revision 0b653d9c7327ca4a1b83a84e61073d143e82b6e7) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs) (revision ef8bf2f90306f8281026cecd4c44782ebe8407ed) @@ -21,13 +21,11 @@ using System; using System.Collections.Generic; -using System.Drawing; using System.Linq; using System.Threading; using System.Windows.Forms; using Core.Common.Base; using Core.Common.Base.Storage; -using Core.Common.TestUtil; using Core.Gui; using Core.Gui.Commands; using Core.Gui.Forms.Main; @@ -121,22 +119,6 @@ } [Test] - public void Image_Always_ReturnsGenericInputOutputIcon() - { - // Setup - using (var plugin = new RiskeerPlugin()) - { - ViewInfo info = GetViewInfo(plugin); - - // Call - Image image = info.Image; - - // Assert - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GenericInputOutputIcon, image); - } - } - - [Test] public void GetViewData_Always_ReturnsHydraulicBoundaryLocationCalculations() { // Setup