Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs =================================================================== diff -u -r7f69931abed072f3687e3781f7a07bfa800283bb -r87e561d5a754af1b28d65e61e8395b70b9e4f218 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs (.../PipingCalculationScenarioExtensionsTest.cs) (revision 7f69931abed072f3687e3781f7a07bfa800283bb) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs (.../PipingCalculationScenarioExtensionsTest.cs) (revision 87e561d5a754af1b28d65e61e8395b70b9e4f218) @@ -37,7 +37,7 @@ public void IsSurfaceLineIntersectionWithReferenceLineInSection_SurfaceLineNull_ReturnsFalse() { // Setup - var calculation = new TestPipingCalculation(); + var calculation = new TestPipingCalculationScenario(); // Call bool intersects = calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(Enumerable.Empty()); @@ -67,7 +67,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new TestPipingCalculation + var calculation = new TestPipingCalculationScenario { InputParameters = { @@ -76,14 +76,14 @@ }; // Call - TestDelegate call = () => calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(Enumerable.Empty()); + void Call() => calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(Enumerable.Empty()); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] - public void IsSurfaceLineIntersectionWithReferenceLineInSection_SurfaceLineIntersectsReferenceline_ReturnsTrue() + public void IsSurfaceLineIntersectionWithReferenceLineInSection_SurfaceLineIntersectsReferenceLine_ReturnsTrue() { // Setup var surfaceLine = new PipingSurfaceLine(string.Empty) @@ -103,7 +103,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new TestPipingCalculation + var calculation = new TestPipingCalculationScenario { InputParameters = { @@ -121,7 +121,7 @@ } [Test] - public void IsSurfaceLineIntersectionWithReferenceLineInSection_SurfaceLineDoesNotIntersectReferenceline_ReturnsFalse() + public void IsSurfaceLineIntersectionWithReferenceLineInSection_SurfaceLineDoesNotIntersectReferenceLine_ReturnsFalse() { // Setup var surfaceLine = new PipingSurfaceLine(string.Empty) @@ -141,7 +141,7 @@ new Point2D(20.0, 0.0) }); - var calculation = new TestPipingCalculation + var calculation = new TestPipingCalculationScenario { InputParameters = { Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/TestPipingCalculationScenario.cs =================================================================== diff -u -rc069d025d589b0d59947643ca92ff720e3374286 -r87e561d5a754af1b28d65e61e8395b70b9e4f218 --- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/TestPipingCalculationScenario.cs (.../TestPipingCalculationScenario.cs) (revision c069d025d589b0d59947643ca92ff720e3374286) +++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/TestPipingCalculationScenario.cs (.../TestPipingCalculationScenario.cs) (revision 87e561d5a754af1b28d65e61e8395b70b9e4f218) @@ -20,13 +20,14 @@ // All rights reserved. using System; +using Core.Common.Base.Data; namespace Riskeer.Piping.Data.TestUtil { /// /// Piping calculation scenario that can be used for testing. /// - public class TestPipingCalculationScenario : TestPipingCalculation + public class TestPipingCalculationScenario : TestPipingCalculation, IPipingCalculationScenario { /// /// Creates a new instance of with default . @@ -42,5 +43,9 @@ /// Thrown when /// is null. public TestPipingCalculationScenario(PipingInput pipingInput, bool hasOutput = false) : base(pipingInput, hasOutput) {} + + public bool IsRelevant { get; set; } + + public RoundedDouble Contribution { get; set; } } } \ No newline at end of file