Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/RingtoetsMacroStabilityInwardsSurfaceLineTest.cs =================================================================== diff -u -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7 -r64349951de884b464e77654a723f26176c9a202c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/RingtoetsMacroStabilityInwardsSurfaceLineTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/RingtoetsMacroStabilityInwardsSurfaceLineTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineTest.cs) (revision 64349951de884b464e77654a723f26176c9a202c) @@ -100,8 +100,8 @@ // Assert Assert.AreNotSame(sourceData, surfaceLine.Points); CollectionAssert.AreEqual(sourceData, surfaceLine.Points); - Assert.AreSame(sourceData[0], surfaceLine.StartingWorldPoint); - Assert.AreSame(sourceData[0], surfaceLine.EndingWorldPoint); + TestHelper.AssertAreEqualButNotSame(sourceData[0], surfaceLine.StartingWorldPoint); + TestHelper.AssertAreEqualButNotSame(sourceData[0], surfaceLine.EndingWorldPoint); } [Test] @@ -124,8 +124,8 @@ // Assert Assert.AreNotSame(sourceData, surfaceLine.Points); CollectionAssert.AreEqual(sourceData, surfaceLine.Points); - Assert.AreSame(sourceData[0], surfaceLine.StartingWorldPoint); - Assert.AreSame(sourceData[3], surfaceLine.EndingWorldPoint); + TestHelper.AssertAreEqualButNotSame(sourceData[0], surfaceLine.StartingWorldPoint); + TestHelper.AssertAreEqualButNotSame(sourceData[3], surfaceLine.EndingWorldPoint); } [Test] @@ -459,10 +459,7 @@ surfaceLine.CopyProperties(surfaceLineToUpdateFrom); // Assert - Assert.AreEqual(surfaceLineToUpdateFrom.Name, surfaceLine.Name); - Assert.AreEqual(surfaceLineToUpdateFrom.ReferenceLineIntersectionWorldPoint, - surfaceLine.ReferenceLineIntersectionWorldPoint); - CollectionAssert.AreEqual(expectedGeometry, surfaceLine.Points); + AssertPropertiesUpdated(surfaceLineToUpdateFrom, surfaceLine); } [Test] @@ -481,10 +478,7 @@ surfaceLine.CopyProperties(surfaceLineToUpdateFrom); // Assert - Assert.AreEqual(surfaceLineToUpdateFrom.Name, surfaceLine.Name); - Assert.AreEqual(surfaceLineToUpdateFrom.ReferenceLineIntersectionWorldPoint, - surfaceLine.ReferenceLineIntersectionWorldPoint); - CollectionAssert.AreEqual(surfaceLineToUpdateFrom.Points, surfaceLine.Points); + AssertPropertiesUpdated(surfaceLineToUpdateFrom, surfaceLine); } [Test] @@ -501,9 +495,7 @@ surfaceLine.CopyProperties(surfaceLineToUpdateFrom); // Assert - Assert.AreEqual(surfaceLineToUpdateFrom.Name, surfaceLine.Name); - Assert.AreEqual(expectedIntersectionPoint, surfaceLine.ReferenceLineIntersectionWorldPoint); - CollectionAssert.AreEqual(surfaceLineToUpdateFrom.Points, surfaceLine.Points); + AssertPropertiesUpdated(surfaceLineToUpdateFrom, surfaceLine); } [Test] @@ -517,10 +509,7 @@ surfaceLine.CopyProperties(surfaceLineToUpdateFrom); // Assert - Assert.AreEqual(surfaceLineToUpdateFrom.Name, surfaceLine.Name); - Assert.AreEqual(surfaceLineToUpdateFrom.ReferenceLineIntersectionWorldPoint, - surfaceLine.ReferenceLineIntersectionWorldPoint); - CollectionAssert.AreEqual(surfaceLineToUpdateFrom.Points, surfaceLine.Points); + AssertPropertiesUpdated(surfaceLineToUpdateFrom, surfaceLine); } [Test] @@ -707,6 +696,16 @@ Assert.AreEqual(hashCodeOne, hashCodeTwo); } + private static void AssertPropertiesUpdated(RingtoetsMacroStabilityInwardsSurfaceLine expectedSurfaceLine, + RingtoetsMacroStabilityInwardsSurfaceLine actualSurfaceLine) + { + Assert.AreEqual(expectedSurfaceLine.Name, actualSurfaceLine.Name); + TestHelper.AssertAreEqualButNotSame(expectedSurfaceLine.ReferenceLineIntersectionWorldPoint, + actualSurfaceLine.ReferenceLineIntersectionWorldPoint); + CollectionAssert.AreEqual(expectedSurfaceLine.Points, actualSurfaceLine.Points); + TestHelper.AssertCollectionAreNotSame(expectedSurfaceLine.Points, actualSurfaceLine.Points); + } + private static RingtoetsMacroStabilityInwardsSurfaceLine CreateSurfaceLineWithCharacteristicPoints() { var surfaceLine = new RingtoetsMacroStabilityInwardsSurfaceLine