Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs =================================================================== diff -u -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -88,7 +88,7 @@ { // Setup var registry = new PersistenceRegistry(); - var profile = new TestPipingSoilProfile(); + PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); registry.Register(new SoilProfileEntity(), profile); // Call @@ -103,7 +103,7 @@ { // Setup var registry = new PersistenceRegistry(); - var profile = new TestPipingSoilProfile(); + PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); // Call bool result = registry.Contains(profile); @@ -117,8 +117,8 @@ { // Setup var registry = new PersistenceRegistry(); - var profile = new TestPipingSoilProfile(); - registry.Register(new SoilProfileEntity(), new TestPipingSoilProfile()); + PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); + registry.Register(new SoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Call bool result = registry.Contains(profile); @@ -378,7 +378,7 @@ { // Setup var registry = new PersistenceRegistry(); - var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); registry.Register(new StochasticSoilProfileEntity(), stochasticSoilProfile); // Call @@ -393,7 +393,7 @@ { // Setup var registry = new PersistenceRegistry(); - var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Call bool result = registry.Contains(stochasticSoilProfile); @@ -407,8 +407,8 @@ { // Setup var registry = new PersistenceRegistry(); - var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, new TestPipingSoilProfile()); - registry.Register(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile(0.7, new TestPipingSoilProfile())); + var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); + registry.Register(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile(0.7, PipingSoilProfileTestFactory.CreatePipingSoilProfile())); // Call bool result = registry.Contains(stochasticSoilProfile); @@ -1031,7 +1031,7 @@ { // Setup var registry = new PersistenceRegistry(); - var profile = new TestPipingSoilProfile(); + PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); var entity = new SoilProfileEntity(); registry.Register(entity, profile); @@ -1047,7 +1047,7 @@ { // Setup var registry = new PersistenceRegistry(); - var profile = new TestPipingSoilProfile(); + PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); // Call TestDelegate test = () => registry.Get(profile); @@ -1061,8 +1061,8 @@ { // Setup var registry = new PersistenceRegistry(); - var profile = new TestPipingSoilProfile(); - registry.Register(new SoilProfileEntity(), new TestPipingSoilProfile()); + PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); + registry.Register(new SoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Call TestDelegate test = () => registry.Get(profile); @@ -1326,7 +1326,7 @@ { // Setup var registry = new PersistenceRegistry(); - var stochasticSoilProfile = new PipingStochasticSoilProfile(0.2, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(0.2, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); var entity = new StochasticSoilProfileEntity(); registry.Register(entity, stochasticSoilProfile); @@ -1342,7 +1342,7 @@ { // Setup var registry = new PersistenceRegistry(); - var stochasticSoilProfile = new PipingStochasticSoilProfile(0.2, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(0.2, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Call TestDelegate test = () => registry.Get(stochasticSoilProfile); @@ -1356,8 +1356,8 @@ { // Setup var registry = new PersistenceRegistry(); - var stochasticSoilProfile = new PipingStochasticSoilProfile(0.2, new TestPipingSoilProfile()); - registry.Register(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile(0.4, new TestPipingSoilProfile())); + var stochasticSoilProfile = new PipingStochasticSoilProfile(0.2, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); + registry.Register(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile(0.4, PipingSoilProfileTestFactory.CreatePipingSoilProfile())); // Call TestDelegate test = () => registry.Get(stochasticSoilProfile); @@ -2136,7 +2136,7 @@ var registry = new PersistenceRegistry(); // Call - TestDelegate test = () => registry.Register(null, new PipingStochasticSoilProfile(1, new TestPipingSoilProfile())); + TestDelegate test = () => registry.Register(null, new PipingStochasticSoilProfile(1, PipingSoilProfileTestFactory.CreatePipingSoilProfile())); // Assert string paramName = Assert.Throws(test).ParamName; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs (.../PipingCalculationScenarioCreateExtensionsTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs (.../PipingCalculationScenarioCreateExtensionsTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -240,7 +240,7 @@ public void Create_StochasticSoilProfileSet_EntityHasStochasticSoilProfileEntity() { // Setup - var soilProfile = new TestPipingSoilProfile(); + PipingSoilProfile soilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); var stochasticSoilProfile = new PipingStochasticSoilProfile(0.6, soilProfile); var soilModel = new PipingStochasticSoilModel("A"); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs =================================================================== diff -u -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs (.../PipingSoilProfileCreateExtensionsTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs (.../PipingSoilProfileCreateExtensionsTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -36,7 +36,7 @@ public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() { // Setup - var soilProfile = new TestPipingSoilProfile(); + PipingSoilProfile soilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); // Call TestDelegate test = () => soilProfile.Create(null); @@ -96,7 +96,7 @@ public void Create_ForTheSameEntityTwice_ReturnsSameSoilProfileEntityInstance() { // Setup - var soilProfile = new TestPipingSoilProfile(); + PipingSoilProfile soilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); var registry = new PersistenceRegistry(); SoilProfileEntity firstEntity = soilProfile.Create(registry); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs (.../PipingStochasticSoilModelCreateExtensionsTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs (.../PipingStochasticSoilModelCreateExtensionsTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -93,8 +93,8 @@ { StochasticSoilProfiles = { - new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile()), - new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile()) + new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile()), + new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile()) } }; var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilProfileCreateExtensionsTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilProfileCreateExtensionsTest.cs (.../PipingStochasticSoilProfileCreateExtensionsTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilProfileCreateExtensionsTest.cs (.../PipingStochasticSoilProfileCreateExtensionsTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -26,6 +26,7 @@ using NUnit.Framework; using Ringtoets.Piping.Data.SoilProfile; using Ringtoets.Piping.KernelWrapper.TestUtil; +using Ringtoets.Piping.Primitives; namespace Application.Ringtoets.Storage.Test.Create.Piping { @@ -36,7 +37,7 @@ public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() { // Setup - var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Call TestDelegate test = () => stochasticSoilProfile.Create(null, 0); @@ -53,7 +54,7 @@ var random = new Random(21); double probability = random.NextDouble(); int order = random.Next(); - var stochasticSoilProfile = new PipingStochasticSoilProfile(probability, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(probability, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); var registry = new PersistenceRegistry(); // Call @@ -69,7 +70,7 @@ public void Create_DifferentStochasticSoilProfilesWithSamePipingSoilProfile_ReturnsStochasticSoilProfileEntityWithSameSoilProfileEntitySet() { // Setup - var testPipingSoilProfile = new TestPipingSoilProfile(); + PipingSoilProfile testPipingSoilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); var firstStochasticSoilProfile = new PipingStochasticSoilProfile(new Random(21).NextDouble(), testPipingSoilProfile); var secondStochasticSoilProfile = new PipingStochasticSoilProfile(new Random(21).NextDouble(), testPipingSoilProfile); var registry = new PersistenceRegistry(); @@ -86,7 +87,7 @@ public void Create_SameStochasticSoilProfileMultipleTimes_ReturnSameEntity() { // Setup - var soilProfile = new TestPipingSoilProfile(); + PipingSoilProfile soilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, soilProfile); var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -250,7 +250,7 @@ var stochasticSoilModel = new PipingStochasticSoilModel("A"); var stochasticSoilModelEntity = new StochasticSoilModelEntity(); - var stochasticSoilProfile = new PipingStochasticSoilProfile(1, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(1, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); var stochasticSoilProfileEntity = new StochasticSoilProfileEntity { StochasticSoilModelEntity = stochasticSoilModelEntity Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs (.../ReadConversionCollectorTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs (.../ReadConversionCollectorTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -69,7 +69,7 @@ // Setup var collector = new ReadConversionCollector(); var entity = new StochasticSoilProfileEntity(); - collector.Read(entity, new PipingStochasticSoilProfile(1, new TestPipingSoilProfile())); + collector.Read(entity, new PipingStochasticSoilProfile(1, PipingSoilProfileTestFactory.CreatePipingSoilProfile())); // Call bool result = collector.Contains(entity); @@ -98,7 +98,8 @@ // Setup var collector = new ReadConversionCollector(); var entity = new StochasticSoilProfileEntity(); - collector.Read(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile(0.4, new TestPipingSoilProfile())); + collector.Read(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile( + 0.4, PipingSoilProfileTestFactory.CreatePipingSoilProfile())); // Call bool result = collector.Contains(entity); @@ -126,7 +127,7 @@ { // Setup var collector = new ReadConversionCollector(); - var profile = new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile()); + var profile = new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); var entity = new StochasticSoilProfileEntity(); collector.Read(entity, profile); @@ -157,7 +158,8 @@ // Setup var collector = new ReadConversionCollector(); var entity = new StochasticSoilProfileEntity(); - collector.Read(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile(0.7, new TestPipingSoilProfile())); + collector.Read(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile( + 0.7, PipingSoilProfileTestFactory.CreatePipingSoilProfile())); // Call TestDelegate test = () => collector.Get(entity); @@ -173,7 +175,8 @@ var collector = new ReadConversionCollector(); // Call - TestDelegate test = () => collector.Read(null, new PipingStochasticSoilProfile(0.7, new TestPipingSoilProfile())); + TestDelegate test = () => collector.Read(null, new PipingStochasticSoilProfile( + 0.7, PipingSoilProfileTestFactory.CreatePipingSoilProfile())); // Assert string paramName = Assert.Throws(test).ParamName; @@ -218,7 +221,7 @@ // Setup var collector = new ReadConversionCollector(); var entity = new SoilProfileEntity(); - collector.Read(entity, new TestPipingSoilProfile()); + collector.Read(entity, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Call bool result = collector.Contains(entity); @@ -247,7 +250,7 @@ // Setup var collector = new ReadConversionCollector(); var entity = new SoilProfileEntity(); - collector.Read(new SoilProfileEntity(), new TestPipingSoilProfile()); + collector.Read(new SoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Call bool result = collector.Contains(entity); @@ -275,7 +278,7 @@ { // Setup var collector = new ReadConversionCollector(); - var profile = new TestPipingSoilProfile(); + PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); var entity = new SoilProfileEntity(); collector.Read(entity, profile); @@ -306,7 +309,7 @@ // Setup var collector = new ReadConversionCollector(); var entity = new SoilProfileEntity(); - collector.Read(new SoilProfileEntity(), new TestPipingSoilProfile()); + collector.Read(new SoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Call TestDelegate test = () => collector.Get(entity); @@ -322,7 +325,7 @@ var collector = new ReadConversionCollector(); // Call - TestDelegate test = () => collector.Read(null, new TestPipingSoilProfile()); + TestDelegate test = () => collector.Read(null, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Assert string paramName = Assert.Throws(test).ParamName; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -859,7 +859,7 @@ Point2D[] referenceLineGeometryPoints = assessmentSection.ReferenceLine.Points.ToArray(); - PipingSoilProfile pipingSoilProfile = new TestPipingSoilProfile(); + PipingSoilProfile pipingSoilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); PipingSoilLayer pipingSoilLayer = pipingSoilProfile.Layers.First(); pipingSoilLayer.BelowPhreaticLevelMean = 2.2; pipingSoilLayer.BelowPhreaticLevelDeviation = 1.2; @@ -884,7 +884,7 @@ StochasticSoilProfiles = { new PipingStochasticSoilProfile(0.2, pipingSoilProfile), - new PipingStochasticSoilProfile(0.8, new TestPipingSoilProfile()) + new PipingStochasticSoilProfile(0.8, PipingSoilProfileTestFactory.CreatePipingSoilProfile()) } } }, "some/path/to/stochasticSoilModelFile"); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs =================================================================== diff -u -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs (.../PipingStochasticSoilModelTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs (.../PipingStochasticSoilModelTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -105,7 +105,7 @@ // Setup PipingStochasticSoilModel model = CreateEmptyModel(); PipingStochasticSoilModel otherModel = CreateEmptyModel(); - var expectedAddedProfile = new PipingStochasticSoilProfile(0.2, new TestPipingSoilProfile()); + var expectedAddedProfile = new PipingStochasticSoilProfile(0.2, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); otherModel.StochasticSoilProfiles.Add(expectedAddedProfile); // Call @@ -128,13 +128,15 @@ { // Setup const string profileName = "A"; - var expectedUpdatedProfile = new PipingStochasticSoilProfile(0.2, - new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile1D)); + var expectedUpdatedProfile = new PipingStochasticSoilProfile( + 0.2, + new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile1D)); PipingStochasticSoilModel model = CreateEmptyModel(); model.StochasticSoilProfiles.Add(expectedUpdatedProfile); PipingStochasticSoilModel otherModel = CreateEmptyModel(); - otherModel.StochasticSoilProfiles.Add(new PipingStochasticSoilProfile(0.2, - new PipingSoilProfile(profileName, -1, CreateLayers(), SoilProfileType.SoilProfile1D))); + otherModel.StochasticSoilProfiles.Add(new PipingStochasticSoilProfile( + 0.2, + new PipingSoilProfile(profileName, -1, CreateLayers(), SoilProfileType.SoilProfile1D))); // Call PipingStochasticSoilModelProfileDifference difference = model.Update(otherModel); @@ -238,8 +240,8 @@ const string equalProfileName = "nameA"; PipingStochasticSoilModel model = CreateEmptyModel(); - var stochasticProfileA = new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile(equalProfileName)); - var stochasticProfileB = new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile("nameB")); + var stochasticProfileA = new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile(equalProfileName)); + var stochasticProfileB = new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile("nameB")); model.StochasticSoilProfiles.Add(stochasticProfileA); model.StochasticSoilProfiles.Add(stochasticProfileB); @@ -256,7 +258,7 @@ { new PipingSoilLayer(0) }, SoilProfileType.SoilProfile1D)); - var otherStochasticProfileB = new PipingStochasticSoilProfile(0.3, new TestPipingSoilProfile("other profile name")); + var otherStochasticProfileB = new PipingStochasticSoilProfile(0.3, PipingSoilProfileTestFactory.CreatePipingSoilProfile("other profile name")); otherModel.StochasticSoilProfiles.Add(otherStochasticProfileA); otherModel.StochasticSoilProfiles.Add(otherStochasticProfileB); @@ -291,11 +293,11 @@ public void Update_ModelsWithAddedProfilesWithSameNames_ThrowsInvalidOperationException() { // Setup - var addedProfile = new PipingStochasticSoilProfile(0.2, new TestPipingSoilProfile()); + var addedProfile = new PipingStochasticSoilProfile(0.2, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); PipingStochasticSoilModel otherModel = CreateEmptyModel(); otherModel.StochasticSoilProfiles.Add(addedProfile); - var existingProfile = new PipingStochasticSoilProfile(0.2, new TestPipingSoilProfile()); + var existingProfile = new PipingStochasticSoilProfile(0.2, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); PipingStochasticSoilModel model = CreateEmptyModel(); model.StochasticSoilProfiles.Add(existingProfile); model.StochasticSoilProfiles.Add(existingProfile); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs =================================================================== diff -u -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs (.../PipingStochasticSoilProfileTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs (.../PipingStochasticSoilProfileTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -116,7 +116,7 @@ { // Setup const double probability = 1.0; - var profile = new TestPipingSoilProfile(); + PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(); var stochasticProfile = new PipingStochasticSoilProfile(probability, profile); var otherStochasticProfile = new PipingStochasticSoilProfile(probability, profile); @@ -194,12 +194,15 @@ private static TestCaseData[] PipingStochasticProfileUnequalCombinations() { const string profileName = "newProfile"; - var stochasticSoilProfileA = new PipingStochasticSoilProfile(1.0, new TestPipingSoilProfile( - profileName, SoilProfileType.SoilProfile1D)); - var stochasticSoilProfileB = new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile( - profileName, SoilProfileType.SoilProfile1D)); - var stochasticSoilProfileC = new PipingStochasticSoilProfile(1.0, new TestPipingSoilProfile( - profileName, SoilProfileType.SoilProfile2D)); + var stochasticSoilProfileA = new PipingStochasticSoilProfile( + 1.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile(profileName, + SoilProfileType.SoilProfile1D)); + var stochasticSoilProfileB = new PipingStochasticSoilProfile( + 0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile(profileName, + SoilProfileType.SoilProfile1D)); + var stochasticSoilProfileC = new PipingStochasticSoilProfile( + 1.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile(profileName, + SoilProfileType.SoilProfile2D)); return new[] { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingStochasticSoilModelTestFactory.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingStochasticSoilModelTestFactory.cs (.../PipingStochasticSoilModelTestFactory.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingStochasticSoilModelTestFactory.cs (.../PipingStochasticSoilModelTestFactory.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -39,8 +39,8 @@ { StochasticSoilProfiles = { - new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile("A")), - new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile("B")) + new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile("A")), + new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile("B")) } }; } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -1256,7 +1256,7 @@ var properties = new PipingInputContextProperties(context, handler); - inputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, new TestPipingSoilProfile()); + inputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Call properties.SurfaceLine = newSurfaceLine; @@ -1277,7 +1277,7 @@ mocks.ReplayAll(); PipingSurfaceLine testSurfaceLine = ValidSurfaceLine(0, 2); - var stochasticSoilProfile = new PipingStochasticSoilProfile(0.0, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(0.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); var stochasticSoilModel = new PipingStochasticSoilModel("StochasticSoilModelName") { StochasticSoilProfiles = @@ -1324,7 +1324,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var stochasticSoilProfile = new PipingStochasticSoilProfile(0.0, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(0.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); var stochasticSoilModel = new PipingStochasticSoilModel("StochasticSoilModelName") { StochasticSoilProfiles = Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilProfilePropertiesTest.cs =================================================================== diff -u -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilProfilePropertiesTest.cs (.../PipingStochasticSoilProfilePropertiesTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilProfilePropertiesTest.cs (.../PipingStochasticSoilProfilePropertiesTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -49,7 +49,7 @@ public void Constructor_ValidStochasticSoilProfile_ExpectedValues() { // Setup - var stochasticSoilProfile = new PipingStochasticSoilProfile(1, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(1, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Call var properties = new PipingStochasticSoilProfileProperties(stochasticSoilProfile); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -103,7 +103,7 @@ var assessmentSection = mockRepository.Stub(); var handler = mockRepository.Stub(); - var stochasticSoilProfile = new PipingStochasticSoilProfile(1.0, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(1.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); var stochasticSoilModel = new PipingStochasticSoilModel("Model") { Geometry = Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -59,7 +59,7 @@ var pipingInput = new PipingInput(new GeneralPipingInput()) { - StochasticSoilProfile = new PipingStochasticSoilProfile(1.0, new TestPipingSoilProfile()) + StochasticSoilProfile = new PipingStochasticSoilProfile(1.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile()) }; var pipingInputContext = new PipingInputContext(pipingInput, calculationItem, @@ -103,7 +103,7 @@ var assessmentSection = mockRepository.Stub(); var handler = mockRepository.Stub(); - var stochasticSoilProfile = new PipingStochasticSoilProfile(1.0, new TestPipingSoilProfile()); + var stochasticSoilProfile = new PipingStochasticSoilProfile(1.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); var stochasticSoilModel = new PipingStochasticSoilModel("Model") { Geometry = Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -1509,8 +1509,8 @@ }, StochasticSoilProfiles = { - new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile("A")), - new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile("B")) + new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile("A")), + new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile("B")) } } }, arbirtraryFilePath); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj =================================================================== diff -u -r7b7bd75dc1c1327386c9be96b5d480565bb8ecd6 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj (.../Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj) (revision 7b7bd75dc1c1327386c9be96b5d480565bb8ecd6) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj (.../Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -60,7 +60,6 @@ - Fisheye: Tag 2e94a93cca7fbb97675bff67cca2329e8b0b7505 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/TestPipingSoilProfileTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/PipingSoilProfileTestFactory.cs =================================================================== diff -u -rd8b351cf9e2e2b25c29ca3d2d426ca48f035fe98 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/PipingSoilProfileTestFactory.cs (.../PipingSoilProfileTestFactory.cs) (revision d8b351cf9e2e2b25c29ca3d2d426ca48f035fe98) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/PipingSoilProfileTestFactory.cs (.../PipingSoilProfileTestFactory.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -29,7 +29,14 @@ public static class PipingSoilProfileTestFactory { /// - /// Creates a new instance of with arbitrary values. + /// Creates a new instance of , which has: + /// + /// set to ; + /// set to 0.0; + /// set to a collection with a single + /// with set to 0.0; + /// set to . + /// /// /// The name to set for the . /// The created . @@ -39,7 +46,14 @@ } /// - /// Creates a new instance of with arbitrary values. + /// Creates a new instance of , which has: + /// + /// set to "name"; + /// set to 0.0; + /// set to a collection with a single + /// with set to 0.0; + /// set to . + /// /// /// The created . public static PipingSoilProfile CreatePipingSoilProfile() @@ -50,10 +64,10 @@ /// /// Creates a new instance of that has: /// - /// set to - /// set to 0.0 + /// set to ; + /// set to 0.0; /// set to a collection with a single - /// with set to 0.0. + /// with set to 0.0; /// set to . /// /// Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj (.../Ringtoets.Piping.KernelWrapper.TestUtil.csproj) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj (.../Ringtoets.Piping.KernelWrapper.TestUtil.csproj) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -62,7 +62,6 @@ - Fisheye: Tag 2e94a93cca7fbb97675bff67cca2329e8b0b7505 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/TestPipingSoilProfile.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs =================================================================== diff -u -rd8b351cf9e2e2b25c29ca3d2d426ca48f035fe98 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs (.../PipingStochasticSoilModelUpdateDataStrategyTest.cs) (revision d8b351cf9e2e2b25c29ca3d2d426ca48f035fe98) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs (.../PipingStochasticSoilModelUpdateDataStrategyTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -480,7 +480,7 @@ { model.StochasticSoilProfiles.Add(new PipingStochasticSoilProfile( 1.0 / profileNames.Length, - new TestPipingSoilProfile(profileName))); + PipingSoilProfileTestFactory.CreatePipingSoilProfile(profileName))); } return model; } Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505) @@ -1309,8 +1309,8 @@ }, StochasticSoilProfiles = { - new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile("A")), - new PipingStochasticSoilProfile(0.5, new TestPipingSoilProfile("B")) + new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile("A")), + new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile("B")) } } },