Index: Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/TopLevelFaultTreeIllustrationPointConverterTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r302f7aa1d44e603cca42532043a02c8c6a638293
--- Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/TopLevelFaultTreeIllustrationPointConverterTest.cs (.../TopLevelFaultTreeIllustrationPointConverterTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/TopLevelFaultTreeIllustrationPointConverterTest.cs (.../TopLevelFaultTreeIllustrationPointConverterTest.cs) (revision 302f7aa1d44e603cca42532043a02c8c6a638293)
@@ -25,8 +25,8 @@
using Riskeer.Common.Data.IllustrationPoints;
using Riskeer.Common.Data.TestUtil;
using Riskeer.Common.Service.IllustrationPoints;
+using Riskeer.HydraRing.Calculation.TestUtil.IllustrationPoints;
using HydraRingIllustrationPointTreeNode = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointTreeNode;
-using HydraRingTestWindDirection = Riskeer.HydraRing.Calculation.TestUtil.IllustrationPoints.TestWindDirection;
using HydraRingCombinationType = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.CombinationType;
using HydraRingWindDirection = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.WindDirection;
using HydraRingWindDirectionClosingSituation = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.WindDirectionClosingSituation;
@@ -64,7 +64,7 @@
public void Convert_HydraRingIllustrationPointTreeNodeNull_ThrowsArgumentNullException()
{
// Setup
- var hydraRingWindDirectionClosingSituation = new HydraRingWindDirectionClosingSituation(new HydraRingTestWindDirection(),
+ var hydraRingWindDirectionClosingSituation = new HydraRingWindDirectionClosingSituation(WindDirectionTestFactory.CreateWindDirection(),
"random closing situation");
// Call
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverterTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r302f7aa1d44e603cca42532043a02c8c6a638293
--- Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverterTest.cs (.../TopLevelSubMechanismIllustrationPointConverterTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverterTest.cs (.../TopLevelSubMechanismIllustrationPointConverterTest.cs) (revision 302f7aa1d44e603cca42532043a02c8c6a638293)
@@ -25,10 +25,10 @@
using Riskeer.Common.Data.IllustrationPoints;
using Riskeer.Common.Data.TestUtil;
using Riskeer.Common.Service.IllustrationPoints;
+using Riskeer.HydraRing.Calculation.TestUtil.IllustrationPoints;
using HydraRingWindDirection = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.WindDirection;
using HydraRingWindDirectionClosingSituation = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.WindDirectionClosingSituation;
using HydraRingIllustrationPointResult = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointResult;
-using HydraRingTestWindDirection = Riskeer.HydraRing.Calculation.TestUtil.IllustrationPoints.TestWindDirection;
using HydraRingSubMechanismIllustrationPoint = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPoint;
using HydraRingSubMechanismIllustrationPointStochast = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPointStochast;
@@ -59,7 +59,7 @@
public void Convert_SubMechanismIllustrationPointNull_ThrowsArgumentNullException()
{
// Setup
- var hydraRingWindDirection = new HydraRingTestWindDirection();
+ HydraRingWindDirection hydraRingWindDirection = WindDirectionTestFactory.CreateWindDirection();
// Call
void Call() => TopLevelSubMechanismIllustrationPointConverter.Convert(new HydraRingWindDirectionClosingSituation(hydraRingWindDirection, string.Empty),
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Output/IllustrationPoints/WindDirection.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r302f7aa1d44e603cca42532043a02c8c6a638293
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Output/IllustrationPoints/WindDirection.cs (.../WindDirection.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Output/IllustrationPoints/WindDirection.cs (.../WindDirection.cs) (revision 302f7aa1d44e603cca42532043a02c8c6a638293)
@@ -26,7 +26,7 @@
///
/// A wind direction for which illustration points are determined.
///
- public class WindDirection
+ public sealed class WindDirection
{
///
/// Creates a .
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/GeneralResultTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r302f7aa1d44e603cca42532043a02c8c6a638293
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/GeneralResultTest.cs (.../GeneralResultTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/GeneralResultTest.cs (.../GeneralResultTest.cs) (revision 302f7aa1d44e603cca42532043a02c8c6a638293)
@@ -51,7 +51,7 @@
{
// Call
TestDelegate call = () => new GeneralResult(0,
- new TestWindDirection(),
+ WindDirectionTestFactory.CreateWindDirection(),
null,
new Dictionary<
WindDirectionClosingSituation,
@@ -67,7 +67,7 @@
{
// Call
TestDelegate call = () => new GeneralResult(0,
- new TestWindDirection(),
+ WindDirectionTestFactory.CreateWindDirection(),
Enumerable.Empty(),
null);
@@ -82,7 +82,7 @@
// Setup
var random = new Random(123);
double beta = random.NextDouble();
- var governingWind = new TestWindDirection();
+ WindDirection governingWind = WindDirectionTestFactory.CreateWindDirection();
IEnumerable stochasts = Enumerable.Empty();
var illustrationPoints = new Dictionary();
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/WindDirectionClosingSituationTest.cs
===================================================================
diff -u -reb40fe36ff3d32030219b02b62369e52ef067b0c -r302f7aa1d44e603cca42532043a02c8c6a638293
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/WindDirectionClosingSituationTest.cs (.../WindDirectionClosingSituationTest.cs) (revision eb40fe36ff3d32030219b02b62369e52ef067b0c)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/WindDirectionClosingSituationTest.cs (.../WindDirectionClosingSituationTest.cs) (revision 302f7aa1d44e603cca42532043a02c8c6a638293)
@@ -46,7 +46,7 @@
public void Constructor_WithoutClosingSituation_ThrowsArgumentNullException()
{
// Call
- void Call() => new WindDirectionClosingSituation(new TestWindDirection(), null);
+ void Call() => new WindDirectionClosingSituation(WindDirectionTestFactory.CreateWindDirection(), null);
// Assert
var exception = Assert.Throws(Call);
@@ -58,7 +58,7 @@
{
// Setup
var closingSituation = string.Empty;
- var windDirection = new TestWindDirection();
+ WindDirection windDirection = WindDirectionTestFactory.CreateWindDirection();
// Call
var instance = new WindDirectionClosingSituation(windDirection, closingSituation);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/WindDirectionTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r302f7aa1d44e603cca42532043a02c8c6a638293
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/WindDirectionTest.cs (.../WindDirectionTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/WindDirectionTest.cs (.../WindDirectionTest.cs) (revision 302f7aa1d44e603cca42532043a02c8c6a638293)
@@ -38,10 +38,10 @@
double windDirectionAngle = random.NextDouble();
// Call
- TestDelegate call = () => new WindDirection(null, windDirectionAngle);
+ void Call() => new WindDirection(null, windDirectionAngle);
// Assert
- var exception = Assert.Throws(call);
+ var exception = Assert.Throws(Call);
Assert.AreEqual("name", exception.ParamName);
}
@@ -63,18 +63,13 @@
}
[TestFixture]
- private class WindDirectionEqualsTest : EqualsTestFixture
+ private class WindDirectionEqualsTest : EqualsTestFixture
{
protected override WindDirection CreateObject()
{
return CreateWindDirection();
}
- protected override DerivedWindDirection CreateDerivedObject()
- {
- return new DerivedWindDirection(CreateWindDirection());
- }
-
private static IEnumerable GetUnequalTestCases()
{
WindDirection baseDirection = CreateWindDirection();
@@ -94,10 +89,5 @@
return new WindDirection("Name", random.NextDouble());
}
}
-
- private class DerivedWindDirection : WindDirection
- {
- public DerivedWindDirection(WindDirection windDirection) : base(windDirection.Name, windDirection.Angle) {}
- }
}
}
\ No newline at end of file
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.TestUtil/IllustrationPoints/GeneralResultTestFactory.cs
===================================================================
diff -u -r1e546384bf995c241a4fed48779922c20cbc7167 -r302f7aa1d44e603cca42532043a02c8c6a638293
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.TestUtil/IllustrationPoints/GeneralResultTestFactory.cs (.../GeneralResultTestFactory.cs) (revision 1e546384bf995c241a4fed48779922c20cbc7167)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.TestUtil/IllustrationPoints/GeneralResultTestFactory.cs (.../GeneralResultTestFactory.cs) (revision 302f7aa1d44e603cca42532043a02c8c6a638293)
@@ -38,7 +38,7 @@
var stochast = new Stochast("Stochast A", 0, 0);
return new GeneralResult(0.5,
- new TestWindDirection(),
+ WindDirectionTestFactory.CreateWindDirection(),
new[]
{
stochast,
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.TestUtil/IllustrationPoints/TestGeneralResult.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r302f7aa1d44e603cca42532043a02c8c6a638293
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.TestUtil/IllustrationPoints/TestGeneralResult.cs (.../TestGeneralResult.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.TestUtil/IllustrationPoints/TestGeneralResult.cs (.../TestGeneralResult.cs) (revision 302f7aa1d44e603cca42532043a02c8c6a638293)
@@ -35,7 +35,7 @@
///
public TestGeneralResult()
: base(0,
- new TestWindDirection(),
+ WindDirectionTestFactory.CreateWindDirection(),
Enumerable.Empty(),
new Dictionary()) {}
@@ -48,7 +48,7 @@
{
var generalResult = new TestGeneralResult();
- generalResult.IllustrationPoints.Add(new WindDirectionClosingSituation(new TestWindDirection(), "closing situation"),
+ generalResult.IllustrationPoints.Add(new WindDirectionClosingSituation(WindDirectionTestFactory.CreateWindDirection(), "closing situation"),
new IllustrationPointTreeNode(new TestFaultTreeIllustrationPoint()));
return generalResult;
@@ -62,7 +62,7 @@
public static TestGeneralResult CreateGeneralResultWithSubMechanismIllustrationPoints()
{
var generalResult = new TestGeneralResult();
- generalResult.IllustrationPoints.Add(new WindDirectionClosingSituation(new TestWindDirection(), "closing situation"),
+ generalResult.IllustrationPoints.Add(new WindDirectionClosingSituation(WindDirectionTestFactory.CreateWindDirection(), "closing situation"),
new IllustrationPointTreeNode(new TestSubMechanismIllustrationPoint()));
return generalResult;
Fisheye: Tag 302f7aa1d44e603cca42532043a02c8c6a638293 refers to a dead (removed) revision in file `Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.TestUtil/IllustrationPoints/TestWindDirection.cs'.
Fisheye: No comparison available. Pass `N' to diff?