Index: Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs =================================================================== diff -u -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7 -r72100b160a77aa268c4cb3aca0124473fc924c70 --- Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs (.../Point2DTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7) +++ Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs (.../Point2DTest.cs) (revision 72100b160a77aa268c4cb3aca0124473fc924c70) @@ -32,7 +32,7 @@ public class Point2DTest { [Test] - public void Constructor_WithXandY_SetPropeties() + public void Constructor_WithXandY_SetProperties() { // Setup var random = new Random(22); @@ -48,7 +48,7 @@ } [Test] - public void CopyConstructor_WithPointWithXandY_SetPropeties() + public void CopyConstructor_WithPointWithXandY_SetProperties() { // Setup var random = new Random(22); Index: Core/Common/test/Core.Common.Base.Test/Geometry/Point3DTest.cs =================================================================== diff -u -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7 -r72100b160a77aa268c4cb3aca0124473fc924c70 --- Core/Common/test/Core.Common.Base.Test/Geometry/Point3DTest.cs (.../Point3DTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7) +++ Core/Common/test/Core.Common.Base.Test/Geometry/Point3DTest.cs (.../Point3DTest.cs) (revision 72100b160a77aa268c4cb3aca0124473fc924c70) @@ -46,7 +46,7 @@ } [Test] - public void CopyConstructor_WithPointWithXandY_SetPropeties() + public void CopyConstructor_WithPointWithXandY_SetProperties() { // Setup const double x = 1.1; Index: Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs =================================================================== diff -u -r1b1fb73a7519560cd8d2f53e7a7471be26d34ba7 -r72100b160a77aa268c4cb3aca0124473fc924c70 --- Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs (.../TestHelperTest.cs) (revision 1b1fb73a7519560cd8d2f53e7a7471be26d34ba7) +++ Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs (.../TestHelperTest.cs) (revision 72100b160a77aa268c4cb3aca0124473fc924c70) @@ -37,19 +37,19 @@ { private static readonly ILog log = LogManager.GetLogger(typeof(TestHelperTest)); - private static IEnumerable AssertObjectsEqualButNotSameSource + private static IEnumerable AssertAreEqualButNotSameSource { get { var objectA = new TestEqualSameObject(1); var objectB = new TestEqualSameObject(1); var objectC = new TestEqualSameObject(2); - yield return new TestCaseData(objectA, objectA, false).SetName("EqualsAndSameObjects_False"); - yield return new TestCaseData(objectA, objectB, true).SetName("EqualsNotSameObjects_True"); - yield return new TestCaseData(objectA, objectC, false).SetName("NotEqualsNotSameObjects_False"); + yield return new TestCaseData(objectA, objectA, false).SetName("EqualAndSameObjects_False"); + yield return new TestCaseData(objectA, objectB, true).SetName("EqualNotSameObjects_True"); + yield return new TestCaseData(objectA, objectC, false).SetName("NotEqualNotSameObjects_False"); yield return new TestCaseData(null, null, true).SetName("BothNull_True"); yield return new TestCaseData(objectA, null, false).SetName("ObjectBNull_False"); - yield return new TestCaseData(null, objectB, false).SetName("ObjectBNull_False"); + yield return new TestCaseData(null, objectB, false).SetName("ObjectANull_False"); } } @@ -714,8 +714,8 @@ } [Test] - [TestCaseSource(nameof(AssertObjectsEqualButNotSameSource))] - public void AssertObjectsEqualButNotSame_DifferentObjects_ReturnExpectedValues(object objectA, object objectB, bool shouldSucceed) + [TestCaseSource(nameof(AssertAreEqualButNotSameSource))] + public void AssertAreEqualButNotSame_DifferentObjects_ReturnExpectedValues(object objectA, object objectB, bool shouldSucceed) { // Call TestDelegate test = () => TestHelper.AssertAreEqualButNotSame(objectA, objectB); @@ -947,7 +947,7 @@ Assert.Throws(test); } - public class TestEqualSameObject + private class TestEqualSameObject { private readonly int someInt; @@ -969,7 +969,7 @@ return someInt; } - protected bool Equals(TestEqualSameObject other) + private bool Equals(TestEqualSameObject other) { return someInt == other.someInt; } Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs =================================================================== diff -u -r1b1fb73a7519560cd8d2f53e7a7471be26d34ba7 -r72100b160a77aa268c4cb3aca0124473fc924c70 --- Core/Common/test/Core.Common.TestUtil/TestHelper.cs (.../TestHelper.cs) (revision 1b1fb73a7519560cd8d2f53e7a7471be26d34ba7) +++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs (.../TestHelper.cs) (revision 72100b160a77aa268c4cb3aca0124473fc924c70) @@ -398,8 +398,8 @@ /// The object which should be equal, but not same as . /// Thrown when either: /// - /// is not equal to - /// is the same as + /// is not equal to ; + /// is the same as . /// /// public static void AssertAreEqualButNotSame(object objectA, object objectB) Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileTest.cs =================================================================== diff -u -r1b1fb73a7519560cd8d2f53e7a7471be26d34ba7 -r72100b160a77aa268c4cb3aca0124473fc924c70 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileTest.cs (.../DikeProfileTest.cs) (revision 1b1fb73a7519560cd8d2f53e7a7471be26d34ba7) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileTest.cs (.../DikeProfileTest.cs) (revision 72100b160a77aa268c4cb3aca0124473fc924c70) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Linq; using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Base.Geometry; Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/StructureBaseTest.cs =================================================================== diff -u -r5c348ad608dfd7af011130adf085ed0cc8272730 -r72100b160a77aa268c4cb3aca0124473fc924c70 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/StructureBaseTest.cs (.../StructureBaseTest.cs) (revision 5c348ad608dfd7af011130adf085ed0cc8272730) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/StructureBaseTest.cs (.../StructureBaseTest.cs) (revision 72100b160a77aa268c4cb3aca0124473fc924c70) @@ -220,8 +220,7 @@ // Assert Assert.AreNotEqual(otherStructure.Id, structure.Id); Assert.AreEqual(otherStructure.Name, structure.Name); - Assert.AreEqual(otherStructure.Location, structure.Location); - Assert.AreNotSame(otherStructure.Location, structure.Location); + TestHelper.AssertAreEqualButNotSame(otherStructure.Location, structure.Location); Assert.AreEqual(otherStructure.StructureNormalOrientation, structure.StructureNormalOrientation); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs =================================================================== diff -u -r1b1fb73a7519560cd8d2f53e7a7471be26d34ba7 -r72100b160a77aa268c4cb3aca0124473fc924c70 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision 1b1fb73a7519560cd8d2f53e7a7471be26d34ba7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision 72100b160a77aa268c4cb3aca0124473fc924c70) @@ -1141,7 +1141,7 @@ { Assert.AreEqual(expectedSurfaceLine.Name, actualSurfaceLine.Name); TestHelper.AssertAreEqualButNotSame(expectedSurfaceLine.ReferenceLineIntersectionWorldPoint, - actualSurfaceLine.ReferenceLineIntersectionWorldPoint); + actualSurfaceLine.ReferenceLineIntersectionWorldPoint); CollectionAssert.AreEqual(expectedSurfaceLine.Points, actualSurfaceLine.Points); TestHelper.AssertCollectionAreNotSame(expectedSurfaceLine.Points, actualSurfaceLine.Points); TestHelper.AssertAreEqualButNotSame(expectedSurfaceLine.BottomDitchDikeSide, actualSurfaceLine.BottomDitchDikeSide);