Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs =================================================================== diff -u -recb0e5b29e11012efd3944171530d9310e07804a -r5d13bf8acfe93e7edaeae98d7ef0c0978a74aae2 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs) (revision ecb0e5b29e11012efd3944171530d9310e07804a) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs) (revision 5d13bf8acfe93e7edaeae98d7ef0c0978a74aae2) @@ -32,9 +32,9 @@ using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.GuiServices; +using Ringtoets.Common.Forms.Views; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; -using Ringtoets.GrassCoverErosionOutwards.Forms.Views; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.ViewInfos @@ -52,10 +52,10 @@ ViewInfo info = GetInfo(plugin); // Assert - Assert.NotNull(info, "Expected a viewInfo definition for views with type {0}.", typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsView)); + Assert.NotNull(info, "Expected a viewInfo definition for views with type {0}.", typeof(DesignWaterLevelCalculationsView)); Assert.AreEqual(typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext), info.DataType); Assert.AreEqual(typeof(IObservableEnumerable), info.ViewDataType); - Assert.AreEqual(typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsView), info.ViewType); + Assert.AreEqual(typeof(DesignWaterLevelCalculationsView), info.ViewType); } } @@ -114,11 +114,10 @@ plugin.Activate(); // Call - var view = (GrassCoverErosionOutwardsDesignWaterLevelCalculationsView) info.CreateInstance(context); + var view = (DesignWaterLevelCalculationsView) info.CreateInstance(context); // Assert Assert.AreSame(assessmentSection, view.AssessmentSection); - Assert.AreSame(grassCoverErosionOutwardsFailureMechanism, view.FailureMechanism); } mockRepository.VerifyAll(); @@ -195,11 +194,10 @@ plugin.Gui = gui; plugin.Activate(); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), - grassCoverErosionOutwardsFailureMechanism, - assessmentSection, - () => 0.01, - "A")) + using (var view = new DesignWaterLevelCalculationsView(new ObservableList(), + assessmentSection, + () => 0.01, + "A")) { // Call info.AfterCreate(view, data); @@ -228,11 +226,10 @@ assessmentSection.Stub(a => a.Detach(null)).IgnoreArguments(); mocks.ReplayAll(); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), - failureMechanism, - assessmentSection, - () => 0.01, - "A")) + using (var view = new DesignWaterLevelCalculationsView(new ObservableList(), + assessmentSection, + () => 0.01, + "A")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -268,11 +265,10 @@ }); mocks.ReplayAll(); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), - failureMechanism, - assessmentSectionA, - () => 0.01, - "A")) + using (var view = new DesignWaterLevelCalculationsView(new ObservableList(), + assessmentSectionA, + () => 0.01, + "A")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -305,11 +301,10 @@ new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), - new GrassCoverErosionOutwardsFailureMechanism(), - assessmentSection, - () => 0.01, - "A")) + using (var view = new DesignWaterLevelCalculationsView(new ObservableList(), + assessmentSection, + () => 0.01, + "A")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -347,11 +342,10 @@ new GrassCoverErosionOutwardsFailureMechanism(), assessmentSectionB); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), - new GrassCoverErosionOutwardsFailureMechanism(), - assessmentSectionA, - () => 0.01, - "A")) + using (var view = new DesignWaterLevelCalculationsView(new ObservableList(), + assessmentSectionA, + () => 0.01, + "A")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -380,11 +374,10 @@ assessmentSection.Stub(a => a.Detach(null)).IgnoreArguments(); mocks.ReplayAll(); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), - new GrassCoverErosionOutwardsFailureMechanism(), - assessmentSection, - () => 0.01, - "A")) + using (var view = new DesignWaterLevelCalculationsView(new ObservableList(), + assessmentSection, + () => 0.01, + "A")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -401,7 +394,7 @@ private static ViewInfo GetInfo(PluginBase plugin) { - return plugin.GetViewInfos().FirstOrDefault(vi => vi.ViewType == typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsView)); + return plugin.GetViewInfos().FirstOrDefault(vi => vi.ViewType == typeof(DesignWaterLevelCalculationsView)); } } } \ No newline at end of file