Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs
===================================================================
diff -u -r41fac7fff0a505c08945108d795dcb877f10b816 -r4c3daa6c52d8de89a58df080ea82b72b1855e534
--- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision 41fac7fff0a505c08945108d795dcb877f10b816)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision 4c3daa6c52d8de89a58df080ea82b72b1855e534)
@@ -59,7 +59,7 @@
IsRelevant = true;
}
- public virtual double Contribution
+ public double Contribution
{
get
{
Fisheye: Tag 4c3daa6c52d8de89a58df080ea82b72b1855e534 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/ProbabilityAssessmentOutputTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs (revision 4c3daa6c52d8de89a58df080ea82b72b1855e534)
@@ -0,0 +1,59 @@
+// Copyright (C) Stichting Deltares 2016. 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;
+using Core.Common.Base;
+using Core.Common.Base.Data;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Probability;
+
+namespace Ringtoets.Common.Data.Test.Probability
+{
+ [TestFixture]
+ public class ProbabilityAssessmentOutputTest
+ {
+ [Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Setup
+ var random = new Random(5);
+ var requiredProbability = new RoundedDouble(2, random.NextDouble());
+ var requiredReliability = new RoundedDouble(3, random.NextDouble());
+ var probability = new RoundedDouble(2, random.NextDouble());
+ var reliability = new RoundedDouble(3, random.NextDouble());
+ var factorOfSafety = new RoundedDouble(3, random.NextDouble());
+
+ // Call
+ var output = new ProbabilityAssessmentOutput(requiredProbability, requiredReliability, probability, reliability, factorOfSafety);
+
+ // Assert
+ Assert.IsInstanceOf(output);
+ Assert.IsInstanceOf(output);
+ Assert.IsNotNull(output);
+ Assert.AreEqual(requiredProbability, output.RequiredProbability);
+ Assert.AreEqual(requiredReliability, output.RequiredReliability);
+ Assert.AreEqual(probability, output.Probability);
+ Assert.AreEqual(reliability, output.Reliability);
+ Assert.AreEqual(factorOfSafety, output.FactorOfSafety);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u -r006d96ecb9e7d838d7682912270c7d43e0ad67e1 -r4c3daa6c52d8de89a58df080ea82b72b1855e534
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision 006d96ecb9e7d838d7682912270c7d43e0ad67e1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision 4c3daa6c52d8de89a58df080ea82b72b1855e534)
@@ -59,7 +59,7 @@
-
+
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f -r4c3daa6c52d8de89a58df080ea82b72b1855e534
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 4c3daa6c52d8de89a58df080ea82b72b1855e534)
@@ -745,7 +745,6 @@
pipingFailureMechanismMock,
assessmentSectionMock);
- pipingFailureMechanismMock.Stub(fm => fm.Contribution).Return(0.24);
assessmentSectionMock.Stub(s => s.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 30, 20000));
gui.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f -r4c3daa6c52d8de89a58df080ea82b72b1855e534
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 4c3daa6c52d8de89a58df080ea82b72b1855e534)
@@ -429,7 +429,6 @@
observer.Expect(o => o.UpdateObserver());
- pipingFailureMechanismMock.Stub(fm => fm.Contribution).Return(0.24);
assessmentSectionMock.Stub(s => s.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 30, 20000));
gui.Expect(cmp => cmp.Get(pipingCalculationContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
gui.Expect(g => g.MainWindow).Return(mainWindow);
@@ -532,7 +531,6 @@
pipingFailureMechanismMock,
assessmentSectionMock);
- pipingFailureMechanismMock.Stub(fm => fm.Contribution).Return(0.24);
assessmentSectionMock.Stub(s => s.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 30, 20000));
gui.Expect(g => g.Get(pipingCalculationContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
gui.Expect(g => g.MainWindow).Return(mainWindow);