Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContext.cs
===================================================================
diff -u -reabf1a800431a23b06c8d81dfbf0f46a71bb659b -r72855f408ad900220c30e399d15854ca7562d4f2
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContext.cs (.../ClosingStructuresContext.cs) (revision eabf1a800431a23b06c8d81dfbf0f46a71bb659b)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContext.cs (.../ClosingStructuresContext.cs) (revision 72855f408ad900220c30e399d15854ca7562d4f2)
@@ -61,11 +61,11 @@
///
/// Gets the assessment section of this instance.
///
- public IAssessmentSection AssessmentSection { get; private set; }
+ public IAssessmentSection AssessmentSection { get; }
///
/// Gets the failure mechanism of this instance.
///
- public ClosingStructuresFailureMechanism FailureMechanism { get; private set; }
+ public ClosingStructuresFailureMechanism FailureMechanism { get; }
}
}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs
===================================================================
diff -u -r702888aa87bd696750fcf3f5fcf50e2b8acb0390 -r72855f408ad900220c30e399d15854ca7562d4f2
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs (.../GrassCoverErosionInwardsInputViewInfoTest.cs) (revision 702888aa87bd696750fcf3f5fcf50e2b8acb0390)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs (.../GrassCoverErosionInwardsInputViewInfoTest.cs) (revision 72855f408ad900220c30e399d15854ca7562d4f2)
@@ -96,7 +96,7 @@
object viewData = info.GetViewData(context);
// Assert
- Assert.AreEqual(calculation, viewData);
+ Assert.AreSame(calculation, viewData);
mocks.VerifyAll();
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -r2bfeb6fc0d628eb592ea9e548c3a64b06f000134 -r72855f408ad900220c30e399d15854ca7562d4f2
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision 2bfeb6fc0d628eb592ea9e548c3a64b06f000134)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision 72855f408ad900220c30e399d15854ca7562d4f2)
@@ -120,6 +120,7 @@
+
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs (revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs (revision 72855f408ad900220c30e399d15854ca7562d4f2)
@@ -0,0 +1,93 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using Core.Common.Gui.Plugin;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Structures;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Data.TestUtil.IllustrationPoints;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.Views;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.Integration.Plugin.Test.ViewInfos
+{
+ [TestFixture]
+ public class GeneralResultFaultTreeIllustrationPointViewInfoTest
+ {
+ private RingtoetsPlugin plugin;
+ private ViewInfo info;
+
+ [SetUp]
+ public void SetUp()
+ {
+ plugin = new RingtoetsPlugin();
+ info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(GeneralResultFaultTreeIllustrationPointView));
+ }
+
+ [TearDown]
+ public void TearDown()
+ {
+ plugin.Dispose();
+ }
+
+ [Test]
+ public void Initialized_Always_ExpectedPropertiesSet()
+ {
+ // Assert
+ Assert.AreEqual(typeof(StructuresOutputContext), info.DataType);
+ Assert.AreEqual(typeof(IStructuresCalculation), info.ViewDataType);
+ TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GeneralOutputIcon, info.Image);
+ }
+
+ [Test]
+ public void GetViewName_Always_ReturnsCalculationOutputDisplayName()
+ {
+ // Setup
+ using (var view = new GeneralResultFaultTreeIllustrationPointView(() => new TestGeneralResultFaultTreeIllustrationPoint()))
+ {
+ var calculation = new TestStructuresCalculation();
+
+ // Call
+ string viewName = info.GetViewName(view, calculation);
+
+ // Assert
+ Assert.AreEqual("Resultaat", viewName);
+ }
+ }
+
+ [Test]
+ public void GetViewData_Always_ReturnsWrappedStructuresCalculation()
+ {
+ // Setup
+ var calculation = new TestStructuresCalculation();
+ var context = new StructuresOutputContext(calculation);
+
+ // Call
+ object viewData = info.GetViewData(context);
+
+ // Assert
+ Assert.AreSame(calculation, viewData);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r72855f408ad900220c30e399d15854ca7562d4f2
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs (.../WaveConditionsInputViewInfoTest.cs) (revision 93036b575ee81b4517b29db51f1eadf81454fb93)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs (.../WaveConditionsInputViewInfoTest.cs) (revision 72855f408ad900220c30e399d15854ca7562d4f2)
@@ -107,7 +107,7 @@
object viewData = info.GetViewData(context);
// Assert
- Assert.AreEqual(calculation, viewData);
+ Assert.AreSame(calculation, viewData);
}
[Test]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsCalculationsViewInfoTest.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r72855f408ad900220c30e399d15854ca7562d4f2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsCalculationsViewInfoTest.cs (.../MacroStabilityInwardsCalculationsViewInfoTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsCalculationsViewInfoTest.cs (.../MacroStabilityInwardsCalculationsViewInfoTest.cs) (revision 72855f408ad900220c30e399d15854ca7562d4f2)
@@ -82,7 +82,7 @@
assessmentSection);
// Call & Assert
- Assert.AreEqual(calculationGroup, info.GetViewData(calculationGroupContext));
+ Assert.AreSame(calculationGroup, info.GetViewData(calculationGroupContext));
mocks.VerifyAll();
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r72855f408ad900220c30e399d15854ca7562d4f2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision 72855f408ad900220c30e399d15854ca7562d4f2)
@@ -99,7 +99,7 @@
object viewData = info.GetViewData(calculationInputContext);
// Assert
- Assert.AreEqual(calculation, viewData);
+ Assert.AreSame(calculation, viewData);
mocks.VerifyAll();
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r72855f408ad900220c30e399d15854ca7562d4f2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs (.../MacroStabilityInwardsScenariosViewInfoTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsScenariosViewInfoTest.cs (.../MacroStabilityInwardsScenariosViewInfoTest.cs) (revision 72855f408ad900220c30e399d15854ca7562d4f2)
@@ -76,7 +76,7 @@
object viewData = info.GetViewData(scenariosContext);
// Assert
- Assert.AreEqual(calculationsGroup, viewData);
+ Assert.AreSame(calculationsGroup, viewData);
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs
===================================================================
diff -u -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5 -r72855f408ad900220c30e399d15854ca7562d4f2
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs (.../PipingCalculationsViewInfoTest.cs) (revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs (.../PipingCalculationsViewInfoTest.cs) (revision 72855f408ad900220c30e399d15854ca7562d4f2)
@@ -82,7 +82,7 @@
assessmentSection);
// Call & Assert
- Assert.AreEqual(calculationGroup, info.GetViewData(calculationGroupContext));
+ Assert.AreSame(calculationGroup, info.GetViewData(calculationGroupContext));
mocks.VerifyAll();
}
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs
===================================================================
diff -u -r702888aa87bd696750fcf3f5fcf50e2b8acb0390 -r72855f408ad900220c30e399d15854ca7562d4f2
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs (.../PipingInputViewInfoTest.cs) (revision 702888aa87bd696750fcf3f5fcf50e2b8acb0390)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs (.../PipingInputViewInfoTest.cs) (revision 72855f408ad900220c30e399d15854ca7562d4f2)
@@ -99,7 +99,7 @@
object viewData = info.GetViewData(calculationInputContext);
// Assert
- Assert.AreEqual(calculation, viewData);
+ Assert.AreSame(calculation, viewData);
mocks.VerifyAll();
}
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs
===================================================================
diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -r72855f408ad900220c30e399d15854ca7562d4f2
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs (.../PipingScenariosViewInfoTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs (.../PipingScenariosViewInfoTest.cs) (revision 72855f408ad900220c30e399d15854ca7562d4f2)
@@ -76,7 +76,7 @@
object viewData = info.GetViewData(pipingScenariosContext);
// Assert
- Assert.AreEqual(pipingCalculationsGroup, viewData);
+ Assert.AreSame(pipingCalculationsGroup, viewData);
}
[Test]