Index: Core/Common/test/Core.Common.Base.Test/Geometry/Segment2DTest.cs =================================================================== diff -u -rb6a49c260d0e882476b16c0e7ee219d38be3b71e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Core/Common/test/Core.Common.Base.Test/Geometry/Segment2DTest.cs (.../Segment2DTest.cs) (revision b6a49c260d0e882476b16c0e7ee219d38be3b71e) +++ Core/Common/test/Core.Common.Base.Test/Geometry/Segment2DTest.cs (.../Segment2DTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -302,12 +302,12 @@ yield return new TestCaseData(new Segment2D(firstPoint, new Point2D(secondPoint.X + offset, secondPoint.Y))) - .SetName("One Point different"); + .SetName("One Point"); yield return new TestCaseData(new Segment2D( new Point2D(firstPoint.X + offset, secondPoint.Y), new Point2D(secondPoint.X + offset, secondPoint.Y))) - .SetName("Two Points different"); + .SetName("Two Points"); } private static Point2D CreatePoint2D(int seed) Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs =================================================================== diff -u -r0b30760a00d0db0af20b13b2c6545e006b9c31be -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs (.../DataGridViewComboBoxItemWrapperTest.cs) (revision 0b30760a00d0db0af20b13b2c6545e006b9c31be) +++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs (.../DataGridViewComboBoxItemWrapperTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -88,14 +88,8 @@ private class DataGridViewComboBoxItemWrapperEqualsTest : EqualsGuidelinesTestFixture, DerivedDataGridViewComboBoxItemWrapper> { - private TestClass wrappedObject; + private readonly TestClass wrappedObject = new TestClass(); - [SetUp] - public void Setup() - { - wrappedObject = new TestClass(); - } - protected override DataGridViewComboBoxItemWrapper CreateObject() { return new DataGridViewComboBoxItemWrapper(wrappedObject); @@ -109,7 +103,7 @@ private static IEnumerable GetUnequalTestCases() { yield return new TestCaseData(new DataGridViewComboBoxItemWrapper(new TestClass())) - .SetName("Different wrapped object"); + .SetName("Wrapped object"); } } Index: Core/Common/test/Core.Common.Controls.Test/PresentationObjects/WrappedObjectContextBaseTest.cs =================================================================== diff -u -rd38bb4d72a2f3d5ec51d58199dff8688bd0387ca -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Core/Common/test/Core.Common.Controls.Test/PresentationObjects/WrappedObjectContextBaseTest.cs (.../WrappedObjectContextBaseTest.cs) (revision d38bb4d72a2f3d5ec51d58199dff8688bd0387ca) +++ Core/Common/test/Core.Common.Controls.Test/PresentationObjects/WrappedObjectContextBaseTest.cs (.../WrappedObjectContextBaseTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -71,11 +71,11 @@ { var wrappedObject = new SimpleEquatable(sourceObject); yield return new TestCaseData(new AnotherSimpleWrappedObjectContext(wrappedObject)) - .SetName("Different ContextType"); + .SetName("ContextType"); var differentWrappedObject = new SimpleEquatable(new object()); yield return new TestCaseData(new SimpleWrappedObjectContext(differentWrappedObject)) - .SetName("Different wrapped data"); + .SetName("Wrapped data"); } } Index: Core/Common/test/Core.Common.Utils.Test/FileFilterGeneratorTest.cs =================================================================== diff -u -r5edeb0ef7899f4554c0c06d0e3f3b8269666e65e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Core/Common/test/Core.Common.Utils.Test/FileFilterGeneratorTest.cs (.../FileFilterGeneratorTest.cs) (revision 5edeb0ef7899f4554c0c06d0e3f3b8269666e65e) +++ Core/Common/test/Core.Common.Utils.Test/FileFilterGeneratorTest.cs (.../FileFilterGeneratorTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -143,9 +143,7 @@ private static FileFilterGenerator CreateFileFilterGenerator() { - const string description = "description"; - const string extension = "txt"; - return new FileFilterGenerator(extension, description); + return new FileFilterGenerator("txt", "description"); } } Index: Core/Components/test/Core.Components.Gis.Test/WmtsConnectionInfoTest.cs =================================================================== diff -u -r5edeb0ef7899f4554c0c06d0e3f3b8269666e65e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Core/Components/test/Core.Components.Gis.Test/WmtsConnectionInfoTest.cs (.../WmtsConnectionInfoTest.cs) (revision 5edeb0ef7899f4554c0c06d0e3f3b8269666e65e) +++ Core/Components/test/Core.Components.Gis.Test/WmtsConnectionInfoTest.cs (.../WmtsConnectionInfoTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -89,9 +89,7 @@ private static WmtsConnectionInfo CreateWmtsConnectionInfo() { - const string name = "name"; - const string url = "url"; - return new WmtsConnectionInfo(name, url); + return new WmtsConnectionInfo("name", "url"); } } Index: Core/Plugins/test/Core.Plugins.Map.Test/UITypeEditors/SelectableMetaDataAttributeTest.cs =================================================================== diff -u -r86156670bfb98201b1334f40469a900d598ecb70 -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Core/Plugins/test/Core.Plugins.Map.Test/UITypeEditors/SelectableMetaDataAttributeTest.cs (.../SelectableMetaDataAttributeTest.cs) (revision 86156670bfb98201b1334f40469a900d598ecb70) +++ Core/Plugins/test/Core.Plugins.Map.Test/UITypeEditors/SelectableMetaDataAttributeTest.cs (.../SelectableMetaDataAttributeTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -85,7 +85,7 @@ private static IEnumerable GetUnequalTestCases() { - yield return new TestCaseData(new SelectableMetaDataAttribute("Different attribute")); + yield return new TestCaseData(new SelectableMetaDataAttribute("Different attribute name")).SetName("Attribute"); } } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs =================================================================== diff -u -r5edeb0ef7899f4554c0c06d0e3f3b8269666e65e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs (.../BreakWaterTest.cs) (revision 5edeb0ef7899f4554c0c06d0e3f3b8269666e65e) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs (.../BreakWaterTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -124,9 +124,7 @@ private static BreakWater CreateBreakWater() { - const double height = 3.14; - const BreakWaterType type = BreakWaterType.Caisson; - return new BreakWater(type, height); + return new BreakWater(BreakWaterType.Caisson, 3.14); } } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/RoughnessPointTest.cs =================================================================== diff -u -r5edeb0ef7899f4554c0c06d0e3f3b8269666e65e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/RoughnessPointTest.cs (.../RoughnessPointTest.cs) (revision 5edeb0ef7899f4554c0c06d0e3f3b8269666e65e) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/RoughnessPointTest.cs (.../RoughnessPointTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -75,12 +75,14 @@ private static IEnumerable GetUnequalTestCases() { + var random = new Random(21); + double offset = random.NextDouble(); RoughnessPoint basePoint = CreateRoughnessPoint(); yield return new TestCaseData(new RoughnessPoint(basePoint.Point, - basePoint.Roughness + 10)) + basePoint.Roughness + offset)) .SetName("Roughness"); - yield return new TestCaseData(new RoughnessPoint(new Point2D(1, 1), + yield return new TestCaseData(new RoughnessPoint(new Point2D(basePoint.Point.X + offset, basePoint.Point.Y), basePoint.Roughness)) .SetName("Point"); } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs =================================================================== diff -u -r5edeb0ef7899f4554c0c06d0e3f3b8269666e65e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision 5edeb0ef7899f4554c0c06d0e3f3b8269666e65e) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -247,17 +247,17 @@ LogNormalDistribution otherMean = CreateFullyDefinedDistribution(); otherMean.Mean = (RoundedDouble) 987; yield return new TestCaseData(otherMean) - .SetName(nameof(otherMean)); + .SetName("Mean"); LogNormalDistribution otherStandardDeviation = CreateFullyDefinedDistribution(); otherStandardDeviation.StandardDeviation = (RoundedDouble) 0.987; yield return new TestCaseData(otherStandardDeviation) - .SetName(nameof(otherStandardDeviation)); + .SetName("StandardDeviation"); LogNormalDistribution otherShift = CreateFullyDefinedDistribution(); otherShift.Shift = (RoundedDouble) 0.987; yield return new TestCaseData(otherShift) - .SetName(nameof(otherShift)); + .SetName("Shift"); } private static LogNormalDistribution CreateFullyDefinedDistribution() Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs =================================================================== diff -u -r5edeb0ef7899f4554c0c06d0e3f3b8269666e65e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision 5edeb0ef7899f4554c0c06d0e3f3b8269666e65e) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -154,12 +154,12 @@ NormalDistribution otherMean = CreateFullyDefinedDistribution(); otherMean.Mean = (RoundedDouble) 987; yield return new TestCaseData(otherMean) - .SetName(nameof(otherMean)); + .SetName("Mean"); NormalDistribution otherStandardDeviation = CreateFullyDefinedDistribution(); otherStandardDeviation.StandardDeviation = (RoundedDouble) 0.987; yield return new TestCaseData(otherStandardDeviation) - .SetName(nameof(otherStandardDeviation)); + .SetName("Standard Deviation"); } private static NormalDistribution CreateFullyDefinedDistribution() Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs =================================================================== diff -u -r35ad17b0a4bbb3f4d210920fa16225d472e2128c -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision 35ad17b0a4bbb3f4d210920fa16225d472e2128c) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -244,17 +244,17 @@ VariationCoefficientLogNormalDistribution otherMean = CreateFullyDefinedDistribution(); otherMean.Mean = (RoundedDouble) 987; yield return new TestCaseData(otherMean) - .SetName(nameof(otherMean)); + .SetName("Mean"); - VariationCoefficientLogNormalDistribution otherStandardDeviation = CreateFullyDefinedDistribution(); - otherStandardDeviation.CoefficientOfVariation = (RoundedDouble) 0.987; - yield return new TestCaseData(otherStandardDeviation) - .SetName(nameof(otherStandardDeviation)); + VariationCoefficientLogNormalDistribution otherCoefficientOfVariation = CreateFullyDefinedDistribution(); + otherCoefficientOfVariation.CoefficientOfVariation = (RoundedDouble) 0.987; + yield return new TestCaseData(otherCoefficientOfVariation) + .SetName("CoefficientOfVariation"); VariationCoefficientLogNormalDistribution otherShift = CreateFullyDefinedDistribution(); otherShift.Shift = (RoundedDouble) 0.987; yield return new TestCaseData(otherShift) - .SetName(nameof(otherShift)); + .SetName("Shift"); } private static VariationCoefficientLogNormalDistribution CreateFullyDefinedDistribution() Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs =================================================================== diff -u -r35ad17b0a4bbb3f4d210920fa16225d472e2128c -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision 35ad17b0a4bbb3f4d210920fa16225d472e2128c) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -164,12 +164,12 @@ VariationCoefficientNormalDistribution otherMean = CreateFullyDefinedDistribution(); otherMean.Mean = (RoundedDouble) 987; yield return new TestCaseData(otherMean) - .SetName(nameof(otherMean)); + .SetName("Mean"); VariationCoefficientNormalDistribution otherStandardDeviation = CreateFullyDefinedDistribution(); otherStandardDeviation.CoefficientOfVariation = (RoundedDouble) 0.987; yield return new TestCaseData(otherStandardDeviation) - .SetName(nameof(otherStandardDeviation)); + .SetName("CoefficientOfVariation"); } private static VariationCoefficientNormalDistribution CreateFullyDefinedDistribution() Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/StructureBaseTest.cs =================================================================== diff -u -r5edeb0ef7899f4554c0c06d0e3f3b8269666e65e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/StructureBaseTest.cs (.../StructureBaseTest.cs) (revision 5edeb0ef7899f4554c0c06d0e3f3b8269666e65e) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/StructureBaseTest.cs (.../StructureBaseTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -202,26 +202,14 @@ private static IEnumerable GetUnequalTestCases() { - StructureBase.ConstructionProperties differentId = CreateFullyConfiguredConstructionProperties(); - differentId.Id = "differentId"; - yield return new TestCaseData(new TestStructureBase(differentId)) - .SetName(nameof(differentId)); + foreach (ChangePropertyData changeSingleDataProperty in ChangeSingleDataProperties()) + { + StructureBase.ConstructionProperties differentConstructionProperties = CreateFullyConfiguredConstructionProperties(); + changeSingleDataProperty.ActionToChangeProperty(differentConstructionProperties); + yield return new TestCaseData(new TestStructureBase(differentConstructionProperties)) + .SetName(changeSingleDataProperty.PropertyName); + } - StructureBase.ConstructionProperties differentName = CreateFullyConfiguredConstructionProperties(); - differentName.Name = "differentName"; - yield return new TestCaseData(new TestStructureBase(differentName)) - .SetName(nameof(differentName)); - - StructureBase.ConstructionProperties differentLocation = CreateFullyConfiguredConstructionProperties(); - differentLocation.Location = new Point2D(9, 9); - yield return new TestCaseData(new TestStructureBase(differentLocation)) - .SetName(nameof(differentLocation)); - - StructureBase.ConstructionProperties differentOrientation = CreateFullyConfiguredConstructionProperties(); - differentOrientation.StructureNormalOrientation = (RoundedDouble) 90; - yield return new TestCaseData(new TestStructureBase(differentOrientation)) - .SetName(nameof(differentOrientation)); - yield return new TestCaseData(new OtherTestStructureBase(CreateFullyConfiguredConstructionProperties())) .SetName("Other derived class"); } @@ -233,16 +221,27 @@ private static StructureBase.ConstructionProperties CreateFullyConfiguredConstructionProperties() { - const string id = "structure id"; - const string name = "Structure name"; return new StructureBase.ConstructionProperties { - Id = id, - Name = name, + Id = "structure id", + Name = "Structure name", Location = new Point2D(1, 1), StructureNormalOrientation = (RoundedDouble) 25 }; } + + private static IEnumerable> ChangeSingleDataProperties() + { + var random = new Random(21); + RoundedDouble offset = random.NextRoundedDouble(); + + yield return new ChangePropertyData(cs => cs.Id = "Different Id", "Id"); + yield return new ChangePropertyData(cs => cs.Name = "Different Name", "Name"); + yield return new ChangePropertyData(cs => cs.Location = new Point2D(cs.Location.X + offset, cs.Location.Y), + "Location"); + yield return new ChangePropertyData(cs => cs.StructureNormalOrientation = cs.StructureNormalOrientation + offset, + "Orientation"); + } } private class TestStructureBase : StructureBase Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CategoryTreeFolderTest.cs =================================================================== diff -u -r5edeb0ef7899f4554c0c06d0e3f3b8269666e65e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CategoryTreeFolderTest.cs (.../CategoryTreeFolderTest.cs) (revision 5edeb0ef7899f4554c0c06d0e3f3b8269666e65e) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CategoryTreeFolderTest.cs (.../CategoryTreeFolderTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -95,13 +95,13 @@ 1, 3 })) - .SetName("Different Content"); + .SetName("Content"); yield return new TestCaseData(new CategoryTreeFolder(baseFolder.Name, new object[0])) - .SetName("Different Content Count"); + .SetName("Content Count"); yield return new TestCaseData(new CategoryTreeFolder("Different name", baseFolder.Contents)) - .SetName("Different name"); + .SetName("Name"); } private static CategoryTreeFolder CreateConfiguredCategoryTreeFolder() Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/SelectableHydraulicBoundaryLocationTest.cs =================================================================== diff -u -rb6a49c260d0e882476b16c0e7ee219d38be3b71e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/SelectableHydraulicBoundaryLocationTest.cs (.../SelectableHydraulicBoundaryLocationTest.cs) (revision b6a49c260d0e882476b16c0e7ee219d38be3b71e) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/SelectableHydraulicBoundaryLocationTest.cs (.../SelectableHydraulicBoundaryLocationTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -80,23 +80,16 @@ [TestFixture] private class SelectableHydraulicBoundaryLocationEqualsTest : EqualsGuidelinesTestFixture { - private HydraulicBoundaryLocation location; + private readonly HydraulicBoundaryLocation location = new HydraulicBoundaryLocation(1, "Name", 0, 1); - [SetUp] - public void SetUp() - { - location = new HydraulicBoundaryLocation(1, "Name", 0, 1); - } - [Test] [TestCaseSource(nameof(EqualityReferencePoints))] public void Equals_ToOtherWithSameHydraulicBoundaryLocationsAndDifferentReferencePoints_ReturnsTrue(Point2D referencePoint1, Point2D referencePoint2) { // Setup - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "Name", 0, 1); - var inputItem1 = new SelectableHydraulicBoundaryLocation(hydraulicBoundaryLocation, referencePoint1); - var inputItem2 = new SelectableHydraulicBoundaryLocation(hydraulicBoundaryLocation, referencePoint2); + var inputItem1 = new SelectableHydraulicBoundaryLocation(location, referencePoint1); + var inputItem2 = new SelectableHydraulicBoundaryLocation(location, referencePoint2); // Call bool areEqualObjects12 = inputItem1.Equals(inputItem2); Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/RingtoetsProjectTest.cs =================================================================== diff -u -ra44cca6d22da0fde88c7ad47b2b98b4befdb12ca -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/RingtoetsProjectTest.cs (.../RingtoetsProjectTest.cs) (revision a44cca6d22da0fde88c7ad47b2b98b4befdb12ca) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/RingtoetsProjectTest.cs (.../RingtoetsProjectTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -147,19 +147,17 @@ .SetName("Description"); var random = new Random(21); - var differentAsessmentSections = CreateProject(); + RingtoetsProject differentAsessmentSections = CreateProject(); differentAsessmentSections.AssessmentSections.Add(new AssessmentSection(random.NextEnumValue())); yield return new TestCaseData(differentAsessmentSections) .SetName("AssessmentSections"); } private static RingtoetsProject CreateProject() { - const string name = "Some name"; - const string description = "Some desctiption"; - return new RingtoetsProject(name) + return new RingtoetsProject("Some name") { - Description = description + Description = "Some desctiption" }; } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsPreconsolidationStressTest.cs =================================================================== diff -u -ra990815a79d404dcad319ad79bc06024541ccf81 -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsPreconsolidationStressTest.cs (.../MacroStabilityInwardsPreconsolidationStressTest.cs) (revision a990815a79d404dcad319ad79bc06024541ccf81) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsPreconsolidationStressTest.cs (.../MacroStabilityInwardsPreconsolidationStressTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -165,15 +165,15 @@ yield return new TestCaseData(new MacroStabilityInwardsPreconsolidationStress(new Point2D(random.NextDouble(), random.NextDouble()), baseDistribution)) - .SetName("Different Location"); + .SetName("Location"); yield return new TestCaseData(new MacroStabilityInwardsPreconsolidationStress(baseStress.Location, new VariationCoefficientLogNormalDistribution { Mean = baseDistribution.Mean + random.NextRoundedDouble(), CoefficientOfVariation = baseDistribution.CoefficientOfVariation })) - .SetName("Different Distribution"); + .SetName("Distribution"); } private static MacroStabilityInwardsPreconsolidationStress CreatePreconsolidationStress() Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTest.cs =================================================================== diff -u -ra990815a79d404dcad319ad79bc06024541ccf81 -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTest.cs (.../MacroStabilityInwardsSoilProfile2DTest.cs) (revision a990815a79d404dcad319ad79bc06024541ccf81) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTest.cs (.../MacroStabilityInwardsSoilProfile2DTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -163,15 +163,15 @@ yield return new TestCaseData(new MacroStabilityInwardsSoilProfile2D("Different Name", baseProfile.Layers, baseProfile.PreconsolidationStresses)) - .SetName("Different Name"); + .SetName("Name"); yield return new TestCaseData(new MacroStabilityInwardsSoilProfile2D(baseProfile.Name, new[] { CreateRandomLayer(differentSeed) }, baseProfile.PreconsolidationStresses)) - .SetName("Different SoilLayer count"); + .SetName("SoilLayers count"); var differentLayers = new[] { @@ -181,12 +181,12 @@ yield return new TestCaseData(new MacroStabilityInwardsSoilProfile2D(baseProfile.Name, differentLayers, baseProfile.PreconsolidationStresses)) - .SetName("Different SoilLayers"); + .SetName("SoilLayers content"); yield return new TestCaseData(new MacroStabilityInwardsSoilProfile2D(baseProfile.Name, baseProfile.Layers, Enumerable.Empty())) - .SetName("Different Stress count"); + .SetName("PreconsolidationStresses count"); var differentStresses = new[] { @@ -196,7 +196,7 @@ yield return new TestCaseData(new MacroStabilityInwardsSoilProfile2D(baseProfile.Name, baseProfile.Layers, differentStresses)) - .SetName("Different Stresses"); + .SetName("PreconsolidationStresses content"); } private static MacroStabilityInwardsSoilProfile2D CreateRandomProfile() @@ -223,11 +223,7 @@ private static MacroStabilityInwardsSoilLayer2D CreateRandomLayer(int seed) { - return CreateRandomLayer(new Random(seed)); - } - - private static MacroStabilityInwardsSoilLayer2D CreateRandomLayer(Random random) - { + var random = new Random(seed); return new MacroStabilityInwardsSoilLayer2D(RingTestFactory.CreateRandomRing(random.Next()), new MacroStabilityInwardsSoilLayerData { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPhreaticLineTest.cs =================================================================== diff -u -r472d38ee5a4169cc628526afb7b72f7f4a1af013 -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPhreaticLineTest.cs (.../MacroStabilityInwardsPhreaticLineTest.cs) (revision 472d38ee5a4169cc628526afb7b72f7f4a1af013) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPhreaticLineTest.cs (.../MacroStabilityInwardsPhreaticLineTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -117,7 +117,7 @@ .SetName("Geometry coordinates"); } - public static MacroStabilityInwardsPhreaticLine CreatePhreaticLine() + private static MacroStabilityInwardsPhreaticLine CreatePhreaticLine() { return new MacroStabilityInwardsPhreaticLine( "Test", Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayer2DTest.cs =================================================================== diff -u -r472d38ee5a4169cc628526afb7b72f7f4a1af013 -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayer2DTest.cs (.../MacroStabilityInwardsSoilLayer2DTest.cs) (revision 472d38ee5a4169cc628526afb7b72f7f4a1af013) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayer2DTest.cs (.../MacroStabilityInwardsSoilLayer2DTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -152,14 +152,14 @@ baseLayer.NestedLayers.First(), new MacroStabilityInwardsSoilLayer2D(RingTestFactory.CreateRandomRing(21)) })) - .SetName("Different Nested Layer Count"); + .SetName("Nested Layer Count"); yield return new TestCaseData(new MacroStabilityInwardsSoilLayer2D(baseLayer.OuterRing, baseLayer.Data, new [] { new MacroStabilityInwardsSoilLayer2D(RingTestFactory.CreateRandomRing(30)) })) - .SetName("Different Nested Layer"); + .SetName("Nested Layer content"); } private static MacroStabilityInwardsSoilLayer2D CreateRandomLayer(int randomSeed) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetLineTest.cs =================================================================== diff -u -r472d38ee5a4169cc628526afb7b72f7f4a1af013 -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetLineTest.cs (.../MacroStabilityInwardsWaternetLineTest.cs) (revision 472d38ee5a4169cc628526afb7b72f7f4a1af013) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetLineTest.cs (.../MacroStabilityInwardsWaternetLineTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -127,14 +127,14 @@ new Point2D(1, 1), new Point2D(1, 1) }, new TestMacroStabilityInwardsPhreaticLine())) - .SetName("Geometry other count"); + .SetName("Geometry Count"); yield return new TestCaseData(new MacroStabilityInwardsWaternetLine("Test", new[] { new Point2D(0, 0), new Point2D(2, 2) }, new TestMacroStabilityInwardsPhreaticLine())) - .SetName("Geometry not same coordinates"); + .SetName("Geometry content"); yield return new TestCaseData(new MacroStabilityInwardsWaternetLine("Test", new[] { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetTest.cs =================================================================== diff -u -r472d38ee5a4169cc628526afb7b72f7f4a1af013 -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetTest.cs (.../MacroStabilityInwardsWaternetTest.cs) (revision 472d38ee5a4169cc628526afb7b72f7f4a1af013) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetTest.cs (.../MacroStabilityInwardsWaternetTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -94,7 +94,7 @@ return new DerivedMacroStabilityInwardsWaternet(CreateWaternet()); } - public static MacroStabilityInwardsWaternet CreateWaternet() + private static MacroStabilityInwardsWaternet CreateWaternet() { return new MacroStabilityInwardsWaternet( new MacroStabilityInwardsPhreaticLine[] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/RingTest.cs =================================================================== diff -u -r472d38ee5a4169cc628526afb7b72f7f4a1af013 -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/RingTest.cs (.../RingTest.cs) (revision 472d38ee5a4169cc628526afb7b72f7f4a1af013) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/RingTest.cs (.../RingTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -93,13 +93,13 @@ List differentNrOfPoints = baseRing.Points.ToList(); differentNrOfPoints.RemoveAt(0); yield return new TestCaseData(new Ring(differentNrOfPoints)) - .SetName("Different Nr of Points"); + .SetName("Nr of Points"); baseRing = CreateRing(); Point2D[] differentPoints = baseRing.Points.ToArray(); differentPoints[0] = new Point2D(0, 0); yield return new TestCaseData(new Ring(differentPoints)) - .SetName("Different Points"); + .SetName("Points Content"); } private static Ring CreateRing() Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilLayerTest.cs =================================================================== diff -u -r5edeb0ef7899f4554c0c06d0e3f3b8269666e65e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilLayerTest.cs (.../PipingSoilLayerTest.cs) (revision 5edeb0ef7899f4554c0c06d0e3f3b8269666e65e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilLayerTest.cs (.../PipingSoilLayerTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -101,15 +101,15 @@ protected override TestLayer CreateDerivedObject() { - PipingSoilLayer baseLayer = CreateRandomLayer(21); + PipingSoilLayer baseLayer = CreateRandomLayer(seed); return new TestLayer(baseLayer); } private static IEnumerable GetUnequalTestCases() { PipingSoilLayer baseLayer = CreateRandomLayer(seed); - var random = new Random(21); + var random = new Random(seed); double offset = random.NextDouble(); yield return new TestCaseData(new PipingSoilLayer(double.NaN) Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilProfileTest.cs =================================================================== diff -u -r5edeb0ef7899f4554c0c06d0e3f3b8269666e65e -rd502e52f215cfeb0b08dcc3289e5fbf1a6bce625 --- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilProfileTest.cs (.../PipingSoilProfileTest.cs) (revision 5edeb0ef7899f4554c0c06d0e3f3b8269666e65e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilProfileTest.cs (.../PipingSoilProfileTest.cs) (revision d502e52f215cfeb0b08dcc3289e5fbf1a6bce625) @@ -202,24 +202,24 @@ [TestFixture] private class PipingSoilProfileEqualsTest : EqualsGuidelinesTestFixture { - private const string name = "Profile name"; - private const double bottom = 3.14; + private const string baseName = "Profile name"; + private const double baseBottom = 3.14; private const SoilProfileType type = SoilProfileType.SoilProfile1D; protected override PipingSoilProfile CreateObject() { - return CreateSingleLayerProfile(name, bottom, type); + return CreateSingleLayerProfile(baseName, baseBottom, type); } protected override TestProfile CreateDerivedObject() { - PipingSoilProfile baseProfile = CreateSingleLayerProfile(name, bottom, type); + PipingSoilProfile baseProfile = CreateSingleLayerProfile(baseName, baseBottom, type); return new TestProfile(baseProfile); } private static IEnumerable GetUnequalTestCases() { - PipingSoilProfile baseProfile = CreateSingleLayerProfile(name, bottom, type); + PipingSoilProfile baseProfile = CreateSingleLayerProfile(baseName, baseBottom, type); var random = new Random(21); double offset = random.NextDouble();