Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r5d00e46dbca617ca3c297bff76dc7cc63211b9de -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 5d00e46dbca617ca3c297bff76dc7cc63211b9de) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -436,53 +436,58 @@ MacroStabilityInwardsFailureMechanism failuremechanism = demoAssessmentSection.MacroStabilityInwards; var soilModel = new MacroStabilityInwardsStochasticSoilModel("Test model"); - var soilProfile2D = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile2D, 1234L); - soilProfile2D.SoilProfile = new MacroStabilityInwardsSoilProfile2D("test 2D", - new[] - { - new MacroStabilityInwardsSoilLayer2D(new Ring(new[] - { - new Point2D(20.210230, 26.00001), - new Point2D(3.830, 1.040506), - new Point2D(6.9300, 3.032406), - new Point2D(14.8312, 12.673506) - }), - new[] - { - new Ring(new[] - { - new Point2D(20.210230, 26.00001), - new Point2D(3.830, 1.040506), - new Point2D(6.9300, 3.032406) - }), - new Ring(new[] - { - new Point2D(6.9300, 3.032406), - new Point2D(14.8312, 12.673506) - }) - }) - { - Properties = - { - MaterialName = "Zand" - } - } - }, SoilProfileType.SoilProfile2D, 1234L); + var soilProfile2D = new MacroStabilityInwardsStochasticSoilProfile( + 0.2, + new MacroStabilityInwardsSoilProfile2D( + "test 2D", + new[] + { + new MacroStabilityInwardsSoilLayer2D( + new Ring(new[] + { + new Point2D(20.210230, 26.00001), + new Point2D(3.830, 1.040506), + new Point2D(6.9300, 3.032406), + new Point2D(14.8312, 12.673506) + }), + new[] + { + new Ring(new[] + { + new Point2D(20.210230, 26.00001), + new Point2D(3.830, 1.040506), + new Point2D(6.9300, 3.032406) + }), + new Ring(new[] + { + new Point2D(6.9300, 3.032406), + new Point2D(14.8312, 12.673506) + }) + }) + { + Properties = + { + MaterialName = "Zand" + } + } + }, SoilProfileType.SoilProfile2D, 1234L)); soilModel.StochasticSoilProfiles.Add(soilProfile2D); - var soilProfile1D = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1234L); - soilProfile1D.SoilProfile = new MacroStabilityInwardsSoilProfile1D("test 1D", 22.567, new[] - { - new MacroStabilityInwardsSoilLayer1D(30.1267) - { - Properties = - { - MaterialName = "1D Layer", - IsAquifer = true - } - } - }, - SoilProfileType.SoilProfile1D, 1234L); + var soilProfile1D = new MacroStabilityInwardsStochasticSoilProfile( + 0.2, + new MacroStabilityInwardsSoilProfile1D( + "test 1D", 22.567, new[] + { + new MacroStabilityInwardsSoilLayer1D(30.1267) + { + Properties = + { + MaterialName = "1D Layer", + IsAquifer = true + } + } + }, + SoilProfileType.SoilProfile1D, 1234L)); soilModel.StochasticSoilProfiles.Add(soilProfile1D); failuremechanism.StochasticSoilModels.AddRange(new[] { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilProfile.cs =================================================================== diff -u -r74be63b9f6ac8bc60a6754667a3bcee0485853a0 -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilProfile.cs (.../MacroStabilityInwardsStochasticSoilProfile.cs) (revision 74be63b9f6ac8bc60a6754667a3bcee0485853a0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilProfile.cs (.../MacroStabilityInwardsStochasticSoilProfile.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -40,29 +40,25 @@ /// Creates a new instance of . /// /// Probability of the stochastic soil profile. - /// Type of the stochastic soil profile. - /// Database identifier of the stochastic soil profile. - public MacroStabilityInwardsStochasticSoilProfile(double probability, SoilProfileType soilProfileType, long soilProfileId) + /// The soil profile. + /// Thrown when + /// is null. + /// Thrown when the + /// is outside the range [0, 1]. + public MacroStabilityInwardsStochasticSoilProfile(double probability, IMacroStabilityInwardsSoilProfile soilProfile) { + if (soilProfile == null) + { + throw new ArgumentNullException(nameof(soilProfile)); + } Probability = probability; - SoilProfileType = soilProfileType; - SoilProfileId = soilProfileId; + SoilProfile = soilProfile; } /// - /// Gets the type of the stochastic soil profile. - /// - public SoilProfileType SoilProfileType { get; private set; } - - /// - /// Gets the database identifier of the stochastic soil profile. - /// - public long SoilProfileId { get; } - - /// /// Gets the . /// - public IMacroStabilityInwardsSoilProfile SoilProfile { get; set; } + public IMacroStabilityInwardsSoilProfile SoilProfile { get; private set; } /// /// Gets the probability of the stochastic soil profile. @@ -118,7 +114,6 @@ if (!Equals(fromProfile)) { SoilProfile = fromProfile.SoilProfile; - SoilProfileType = fromProfile.SoilProfileType; Probability = fromProfile.Probability; return true; } @@ -132,9 +127,18 @@ public override bool Equals(object obj) { - if (ReferenceEquals(null, obj)) return false; - if (ReferenceEquals(this, obj)) return true; - if (obj.GetType() != GetType()) return false; + if (ReferenceEquals(null, obj)) + { + return false; + } + if (ReferenceEquals(this, obj)) + { + return true; + } + if (obj.GetType() != GetType()) + { + return false; + } return Equals((MacroStabilityInwardsStochasticSoilProfile) obj); } @@ -143,7 +147,6 @@ unchecked { int hashCode = Probability.GetHashCode(); - hashCode = (hashCode * 397) ^ (int) SoilProfileType; hashCode = (hashCode * 397) ^ (SoilProfile?.GetHashCode() ?? 0); return hashCode; } @@ -152,7 +155,6 @@ private bool Equals(MacroStabilityInwardsStochasticSoilProfile other) { return Probability.Equals(other.Probability) - && SoilProfileType == other.SoilProfileType && Equals(SoilProfile, other.SoilProfile); } } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsStochasticSoilProfileTransformer.cs =================================================================== diff -u -r74be63b9f6ac8bc60a6754667a3bcee0485853a0 -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsStochasticSoilProfileTransformer.cs (.../MacroStabilityInwardsStochasticSoilProfileTransformer.cs) (revision 74be63b9f6ac8bc60a6754667a3bcee0485853a0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsStochasticSoilProfileTransformer.cs (.../MacroStabilityInwardsStochasticSoilProfileTransformer.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -53,12 +53,7 @@ throw new ArgumentNullException(nameof(soilProfile)); } - return new MacroStabilityInwardsStochasticSoilProfile(stochasticSoilProfile.Probability, - SoilProfileType.SoilProfile1D, - 0) - { - SoilProfile = soilProfile - }; + return new MacroStabilityInwardsStochasticSoilProfile(stochasticSoilProfile.Probability, soilProfile); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilModelTest.cs =================================================================== diff -u -r74be63b9f6ac8bc60a6754667a3bcee0485853a0 -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilModelTest.cs (.../MacroStabilityInwardsStochasticSoilModelTest.cs) (revision 74be63b9f6ac8bc60a6754667a3bcee0485853a0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilModelTest.cs (.../MacroStabilityInwardsStochasticSoilModelTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -86,9 +86,7 @@ const string expectedSegmentSoilModelName = "someSegmentSoilModelName"; var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel(expectedSegmentSoilModelName); - var mockRepository = new MockRepository(); - var stochasticSoilProfileProbability = mockRepository.StrictMock(1.0, null, null); - mockRepository.ReplayAll(); + var stochasticSoilProfileProbability = new MacroStabilityInwardsStochasticSoilProfile(1.0, new TestMacroStabilityInwardsSoilProfile1D()); // Call stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfileProbability); @@ -97,7 +95,6 @@ Assert.AreEqual(expectedSegmentSoilModelName, stochasticSoilModel.Name); Assert.AreEqual(1, stochasticSoilModel.StochasticSoilProfiles.Count); Assert.AreEqual(stochasticSoilProfileProbability, stochasticSoilModel.StochasticSoilProfiles[0]); - mockRepository.VerifyAll(); } [Test] @@ -152,10 +149,7 @@ // Setup MacroStabilityInwardsStochasticSoilModel model = CreateEmptyModel(); MacroStabilityInwardsStochasticSoilModel otherModel = CreateEmptyModel(); - var expectedAddedProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) - { - SoilProfile = new TestSoilProfile() - }; + var expectedAddedProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, new TestSoilProfile()); otherModel.StochasticSoilProfiles.Add(expectedAddedProfile); // Call @@ -178,17 +172,13 @@ { // Setup const string profileName = "A"; - var expectedUpdatedProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) - { - SoilProfile = new MacroStabilityInwardsSoilProfile1D(profileName, -2, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5) - }; + var expectedUpdatedProfile = new MacroStabilityInwardsStochasticSoilProfile( + 0.2, new MacroStabilityInwardsSoilProfile1D(profileName, -2, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5)); MacroStabilityInwardsStochasticSoilModel model = CreateEmptyModel(); model.StochasticSoilProfiles.Add(expectedUpdatedProfile); MacroStabilityInwardsStochasticSoilModel otherModel = CreateEmptyModel(); - otherModel.StochasticSoilProfiles.Add(new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) - { - SoilProfile = new MacroStabilityInwardsSoilProfile1D(profileName, -1, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5) - }); + otherModel.StochasticSoilProfiles.Add(new MacroStabilityInwardsStochasticSoilProfile( + 0.2, new MacroStabilityInwardsSoilProfile1D(profileName, -1, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5))); // Call MacroStabilityInwardsStochasticSoilModelProfileDifference difference = model.Update(otherModel); @@ -211,18 +201,12 @@ // Setup const string profileName = "A"; var soilProfile = new MacroStabilityInwardsSoilProfile1D(profileName, -2, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5); - var expectedUpdatedProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) - { - SoilProfile = soilProfile - }; + var expectedUpdatedProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, soilProfile); MacroStabilityInwardsStochasticSoilModel model = CreateEmptyModel(); model.StochasticSoilProfiles.Add(expectedUpdatedProfile); MacroStabilityInwardsStochasticSoilModel otherModel = CreateEmptyModel(); - otherModel.StochasticSoilProfiles.Add(new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 3) - { - SoilProfile = soilProfile - }); + otherModel.StochasticSoilProfiles.Add(new MacroStabilityInwardsStochasticSoilProfile(0.5, soilProfile)); // Call MacroStabilityInwardsStochasticSoilModelProfileDifference difference = model.Update(otherModel); @@ -242,10 +226,7 @@ // Setup const string profileName = "A"; var soilProfile = new MacroStabilityInwardsSoilProfile1D(profileName, -2, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5); - var expectedRemovedProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) - { - SoilProfile = soilProfile - }; + var expectedRemovedProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, soilProfile); MacroStabilityInwardsStochasticSoilModel model = CreateEmptyModel(); model.StochasticSoilProfiles.Add(expectedRemovedProfile); @@ -269,14 +250,10 @@ // Setup const string profileName = "A"; var soilProfile = new MacroStabilityInwardsSoilProfile1D(profileName, -2, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5); - var expectedRemovedProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) - { - SoilProfile = soilProfile - }; - var newProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile2D, 3) - { - SoilProfile = new MacroStabilityInwardsSoilProfile2D(profileName, CreateLayers2D(), SoilProfileType.SoilProfile2D, -5) - }; + var expectedRemovedProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, soilProfile); + var newProfile = new MacroStabilityInwardsStochasticSoilProfile( + 0.2, + new MacroStabilityInwardsSoilProfile2D(profileName, CreateLayers2D(), SoilProfileType.SoilProfile2D, -5)); MacroStabilityInwardsStochasticSoilModel model = CreateEmptyModel(); model.StochasticSoilProfiles.Add(expectedRemovedProfile); @@ -305,14 +282,8 @@ const string equalProfileName = "nameA"; MacroStabilityInwardsStochasticSoilModel model = CreateEmptyModel(); - var stochasticProfileA = new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, -11) - { - SoilProfile = CreateMacroStabilityInwardsSoilProfile1D(equalProfileName) - }; - var stochasticProfileB = new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, -52) - { - SoilProfile = CreateMacroStabilityInwardsSoilProfile1D("nameB") - }; + var stochasticProfileA = new MacroStabilityInwardsStochasticSoilProfile(0.5, CreateMacroStabilityInwardsSoilProfile1D(equalProfileName)); + var stochasticProfileB = new MacroStabilityInwardsStochasticSoilProfile(0.5, CreateMacroStabilityInwardsSoilProfile1D("nameB")); model.StochasticSoilProfiles.Add(stochasticProfileA); model.StochasticSoilProfiles.Add(stochasticProfileB); @@ -324,17 +295,13 @@ otherModel.Geometry.Add(otherPointA); otherModel.Geometry.Add(otherPointB); - var otherStochasticProfileA = new MacroStabilityInwardsStochasticSoilProfile(0.7, SoilProfileType.SoilProfile1D, -1) - { - SoilProfile = new MacroStabilityInwardsSoilProfile1D(equalProfileName, -1, new[] + var otherStochasticProfileA = new MacroStabilityInwardsStochasticSoilProfile( + 0.7, + new MacroStabilityInwardsSoilProfile1D(equalProfileName, -1, new[] { new MacroStabilityInwardsSoilLayer1D(0) - }, SoilProfileType.SoilProfile1D, -1) - }; - var otherStochasticProfileB = new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, -2) - { - SoilProfile = CreateMacroStabilityInwardsSoilProfile1D("other profile name") - }; + }, SoilProfileType.SoilProfile1D, -1)); + var otherStochasticProfileB = new MacroStabilityInwardsStochasticSoilProfile(0.3, CreateMacroStabilityInwardsSoilProfile1D("other profile name")); otherModel.StochasticSoilProfiles.Add(otherStochasticProfileA); otherModel.StochasticSoilProfiles.Add(otherStochasticProfileB); @@ -369,17 +336,11 @@ public void Update_ModelsWithAddedProfilesWithSameNames_ThrowsInvalidOperationException() { // Setup - var addedProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() - }; + var addedProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, new TestMacroStabilityInwardsSoilProfile1D()); MacroStabilityInwardsStochasticSoilModel otherModel = CreateEmptyModel(); otherModel.StochasticSoilProfiles.Add(addedProfile); - var existingProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() - }; + var existingProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, new TestMacroStabilityInwardsSoilProfile1D()); MacroStabilityInwardsStochasticSoilModel model = CreateEmptyModel(); model.StochasticSoilProfiles.Add(existingProfile); model.StochasticSoilProfiles.Add(existingProfile); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilProfileTest.cs =================================================================== diff -u -r74be63b9f6ac8bc60a6754667a3bcee0485853a0 -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilProfileTest.cs (.../MacroStabilityInwardsStochasticSoilProfileTest.cs) (revision 74be63b9f6ac8bc60a6754667a3bcee0485853a0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsStochasticSoilProfileTest.cs (.../MacroStabilityInwardsStochasticSoilProfileTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -23,6 +23,7 @@ using Core.Common.Base; using Core.Common.TestUtil; using NUnit.Framework; +using Rhino.Mocks; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; @@ -31,21 +32,35 @@ [TestFixture] public class MacroStabilityInwardsStochasticSoilProfileTest { - private static readonly Random profileIdRandom = new Random(32); + [Test] + public void Constructor_SoilProfileNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new MacroStabilityInwardsStochasticSoilProfile(0, null); + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("soilProfile", exception.ParamName); + } + [Test] - [TestCase(0.1, SoilProfileType.SoilProfile1D, 123L)] - [TestCase(0.26, SoilProfileType.SoilProfile2D, 123L)] - public void Constructor_WithValidProbabilities_ExpectedValues(double probability, SoilProfileType soilProfileType, long soilProfileId) + public void Constructor_WithValidProbabilities_ExpectedValues() { + // Setup + var mocks = new MockRepository(); + var soilProfile = mocks.Stub(); + mocks.ReplayAll(); + + double probability = new Random().Next(0, 1); + // Call - var stochasticSoilProfileProbability = new MacroStabilityInwardsStochasticSoilProfile(probability, soilProfileType, soilProfileId); + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(probability, soilProfile); // Assert - Assert.IsInstanceOf(stochasticSoilProfileProbability); - Assert.AreEqual(probability, stochasticSoilProfileProbability.Probability); - Assert.AreEqual(soilProfileType, stochasticSoilProfileProbability.SoilProfileType); - Assert.AreEqual(soilProfileId, stochasticSoilProfileProbability.SoilProfileId); + Assert.IsInstanceOf(stochasticSoilProfile); + Assert.AreEqual(probability, stochasticSoilProfile.Probability); + Assert.AreSame(soilProfile, stochasticSoilProfile.SoilProfile); + mocks.VerifyAll(); } [Test] @@ -57,12 +72,18 @@ [TestCase(double.NaN)] public void Constructor_WithInvalidProbabilities_ThrowsArgumentOutOfRangeException(double probability) { + // Setup + var mocks = new MockRepository(); + var soilProfile = mocks.Stub(); + mocks.ReplayAll(); + // Call - TestDelegate test = () => new MacroStabilityInwardsStochasticSoilProfile(probability, SoilProfileType.SoilProfile1D, -1); + TestDelegate test = () => new MacroStabilityInwardsStochasticSoilProfile(probability, soilProfile); // Assert const string expectedMessage = "Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik [0,0, 1,0] liggen."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + mocks.VerifyAll(); } [Test] @@ -72,14 +93,19 @@ public void AddProbability_DifferentValues_ProbabilityIncreasedAsExpected(double probabilityToAdd) { // Setup + var mocks = new MockRepository(); + var soilProfile = mocks.Stub(); + mocks.ReplayAll(); + double startProbability = new Random(21).NextDouble() * 0.5; - var profile = new MacroStabilityInwardsStochasticSoilProfile(startProbability, SoilProfileType.SoilProfile1D, -1); + var profile = new MacroStabilityInwardsStochasticSoilProfile(startProbability, soilProfile); // Call profile.AddProbability(probabilityToAdd); // Assert Assert.AreEqual(startProbability + probabilityToAdd, profile.Probability); + mocks.VerifyAll(); } [Test] @@ -92,8 +118,12 @@ public void AddProbability_DifferentValuesMakingProbabilityInvalid_ThrowsArgumentOutOfRangeException(double probabilityToAdd) { // Setup + var mocks = new MockRepository(); + var soilProfile = mocks.Stub(); + mocks.ReplayAll(); + double startProbability = new Random(21).NextDouble() * 0.5; - var profile = new MacroStabilityInwardsStochasticSoilProfile(startProbability, SoilProfileType.SoilProfile1D, -1); + var profile = new MacroStabilityInwardsStochasticSoilProfile(startProbability, soilProfile); // Call TestDelegate test = () => profile.AddProbability(probabilityToAdd); @@ -102,20 +132,26 @@ const string expectedMessage = "Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik [0,0, 1,0] liggen."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); Assert.AreEqual(startProbability, profile.Probability); + mocks.VerifyAll(); } [Test] public void Update_WithNullProfile_ThrowsArgumentNullException() { // Setup - var stochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0); + var mocks = new MockRepository(); + var soilProfile = mocks.Stub(); + mocks.ReplayAll(); + var stochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile); + // Call TestDelegate test = () => stochasticProfile.Update(null); // Assert string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("fromProfile", paramName); + mocks.VerifyAll(); } [Test] @@ -128,7 +164,6 @@ // Assert Assert.IsTrue(updated); Assert.AreEqual(otherStochasticProfile.Probability, stochasticProfile.Probability); - Assert.AreEqual(otherStochasticProfile.SoilProfileType, stochasticProfile.SoilProfileType); Assert.AreSame(otherStochasticProfile.SoilProfile, stochasticProfile.SoilProfile); } @@ -138,16 +173,9 @@ // Setup const double probability = 1.0; var profile = new TestSoilProfile(); - var stochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(probability, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = profile - }; + var stochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(probability, profile); + var otherStochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(probability, profile); - var otherStochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(probability, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = profile - }; - // Precondition Assert.AreEqual(stochasticProfile, otherStochasticProfile); @@ -164,26 +192,36 @@ public void Equals_OtherType_ReturnsFalse() { // Setup - var stochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0); + var mocks = new MockRepository(); + var soilProfile = mocks.Stub(); + mocks.ReplayAll(); + var stochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile); + // Call bool areEqual = stochasticProfile.Equals(new object()); // Assert Assert.IsFalse(areEqual); + mocks.VerifyAll(); } [Test] public void Equals_Null_ReturnsFalse() { // Setup - var stochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0); + var mocks = new MockRepository(); + var soilProfile = mocks.Stub(); + mocks.ReplayAll(); + var stochasticProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile); + // Call bool areEqual = stochasticProfile.Equals(null); // Assert Assert.IsFalse(areEqual); + mocks.VerifyAll(); } [Test] @@ -203,39 +241,44 @@ public void GetHashCode_EqualStochasticSoilProfile_ReturnSameHashCode() { // Setup - var stochasticSoilProfileA = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 234); - var stochasticSoilProfileB = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 234); + var mocks = new MockRepository(); + var soilProfile = mocks.Stub(); + mocks.ReplayAll(); + var stochasticSoilProfileA = new MacroStabilityInwardsStochasticSoilProfile(0.2, soilProfile); + var stochasticSoilProfileB = new MacroStabilityInwardsStochasticSoilProfile(0.2, soilProfile); + // Call int hashCodeOne = stochasticSoilProfileA.GetHashCode(); int hashCodeTwo = stochasticSoilProfileB.GetHashCode(); // Assert Assert.AreEqual(hashCodeOne, hashCodeTwo); + mocks.VerifyAll(); } [Test] public void ToString_WithProfile_ReturnsToStringResultOfProfile() { // Setup - var profile = new TestSoilProfile(); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = profile - }; + var mocks = new MockRepository(); + var soilProfile = mocks.Stub(); + mocks.ReplayAll(); + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile); + // Call string text = stochasticSoilProfile.ToString(); // Assert - Assert.AreEqual(profile.ToString(), text); + Assert.AreEqual(soilProfile.ToString(), text); } private static TestCaseData[] StochasticProfileUnequalCombinations() { - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 0); - var otherStochasticSoilProfileA = new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 0); - var otherStochasticSoilProfileB = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile2D, 0); + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, CreateRandomProfile(22)); + var otherStochasticSoilProfileA = new MacroStabilityInwardsStochasticSoilProfile(0.5, CreateRandomProfile(22)); + var otherStochasticSoilProfileB = new MacroStabilityInwardsStochasticSoilProfile(1.0, CreateRandomProfile(22)); return new[] { @@ -252,75 +295,31 @@ private static TestCaseData[] StochasticProfileCombinations() { - MacroStabilityInwardsStochasticSoilProfile profileA = CreateRandomStochasticProfile(21); - MacroStabilityInwardsStochasticSoilProfile profileB = CreateRandomStochasticProfile(21); - MacroStabilityInwardsStochasticSoilProfile profileC = CreateRandomStochasticProfile(73); - MacroStabilityInwardsStochasticSoilProfile profileD = CreateRandomStochasticProfile(21); - var profileE = new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 25); - var profileF = new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 45); - var profileG = new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile2D, 25); - var profileH = new MacroStabilityInwardsStochasticSoilProfile(0.15, SoilProfileType.SoilProfile1D, 25); - var profileI = new MacroStabilityInwardsStochasticSoilProfile(0.15, SoilProfileType.SoilProfile1D, 25) - { - SoilProfile = CreateRandomProfile(new Random(12)) - }; - var profileJ = new MacroStabilityInwardsStochasticSoilProfile(0.15, SoilProfileType.SoilProfile1D, 25) - { - SoilProfile = CreateRandomProfile(new Random(32)) - }; + var profileA = new MacroStabilityInwardsStochasticSoilProfile(0.5, CreateRandomProfile(21)); + var profileB = new MacroStabilityInwardsStochasticSoilProfile(0.5, CreateRandomProfile(21)); + var profileC = new MacroStabilityInwardsStochasticSoilProfile(0.15, CreateRandomProfile(21)); + var profileD = new MacroStabilityInwardsStochasticSoilProfile(0.5, CreateRandomProfile(73)); return new[] { new TestCaseData(profileA, profileB, true) { - TestName = "Equals_ProfileAProfileB_True" + TestName = "Equals_SameProbabilityAndProfile_True" }, - new TestCaseData(profileB, profileD, true) - { - TestName = "Equals_ProfileBProfileD_True" - }, - new TestCaseData(profileA, profileD, true) - { - TestName = "Equals_ProfileAProfileD_True" - }, - new TestCaseData(profileB, profileC, false) - { - TestName = "Equals_ProfileBProfileC_False" - }, new TestCaseData(profileA, profileC, false) { - TestName = "Equals_ProfileAProfileC_False" - }, - new TestCaseData(profileE, profileF, true) - { - TestName = "Equals_DifferentIds_True" - }, - new TestCaseData(profileE, profileG, false) - { - TestName = "Equals_DifferentTypes_False" - }, - new TestCaseData(profileE, profileH, false) - { TestName = "Equals_DifferentProbability_False" }, - new TestCaseData(profileI, profileJ, false) + new TestCaseData(profileA, profileD, false) { TestName = "Equals_DifferentProfile_False" } }; } - private static MacroStabilityInwardsStochasticSoilProfile CreateRandomStochasticProfile(int randomSeed) + private static TestSoilProfile CreateRandomProfile(int randomSeed) { var random = new Random(randomSeed); - return new MacroStabilityInwardsStochasticSoilProfile(random.NextDouble(), random.NextEnumValue(), profileIdRandom.Next()) - { - SoilProfile = CreateRandomProfile(random) - }; - } - - private static TestSoilProfile CreateRandomProfile(Random random) - { return new TestSoilProfile(GetRandomName(random)); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs (.../MacroStabilityInwardsCalculationScenarioFactory.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs (.../MacroStabilityInwardsCalculationScenarioFactory.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -134,26 +134,24 @@ { const double bottom = 1.12; const double top = 10.56; - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, new MacroStabilityInwardsSoilProfile1D(string.Empty, 0.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D(string.Empty, 0.0, new[] + new MacroStabilityInwardsSoilLayer1D(top) { - new MacroStabilityInwardsSoilLayer1D(top) + Properties = { - Properties = - { - IsAquifer = false - } - }, - new MacroStabilityInwardsSoilLayer1D(top / 2) + IsAquifer = false + } + }, + new MacroStabilityInwardsSoilLayer1D(top / 2) + { + Properties = { - Properties = - { - IsAquifer = true - } + IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) - }; + } + }, SoilProfileType.SoilProfile1D, 0)); + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); var firstCharacteristicPointLocation = new Point3D(0.2, 0.0, bottom + 3 * top / 4); var secondCharacteristicPointLocation = new Point3D(0.3, 0.0, bottom + 2 * top / 4); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs (.../MacroStabilityInwardsInputFactory.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs (.../MacroStabilityInwardsInputFactory.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -47,9 +47,8 @@ new Point3D(0, 0, thicknessCoverageLayer), new Point3D(1.0, 0, thicknessCoverageLayer) }); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = new MacroStabilityInwardsSoilProfile1D(string.Empty, -thicknessAquiferLayer, new[] + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile( + 0.0, new MacroStabilityInwardsSoilProfile1D(string.Empty, -thicknessAquiferLayer, new[] { new MacroStabilityInwardsSoilLayer1D(thicknessCoverageLayer) { @@ -65,8 +64,7 @@ IsAquifer = true } } - }, SoilProfileType.SoilProfile1D, 0) - }; + }, SoilProfileType.SoilProfile1D, 0)); return new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) { @@ -88,19 +86,16 @@ new Point3D(0, 0, 0.0), new Point3D(1.0, 0, 0.0) }); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, new MacroStabilityInwardsSoilProfile1D(string.Empty, -thicknessAquiferLayer, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D(string.Empty, -thicknessAquiferLayer, new[] + new MacroStabilityInwardsSoilLayer1D(0.0) { - new MacroStabilityInwardsSoilLayer1D(0.0) + Properties = { - Properties = - { - IsAquifer = true - } + IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) - }; + } + }, SoilProfileType.SoilProfile1D, 0)); return new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) { @@ -123,33 +118,31 @@ new Point3D(0, 0, surfaceLineTopLevel), new Point3D(1.0, 0, surfaceLineTopLevel) }); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, new MacroStabilityInwardsSoilProfile1D(string.Empty, 0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D(string.Empty, 0, new[] + new MacroStabilityInwardsSoilLayer1D(surfaceLineTopLevel + deltaAboveSurfaceLine + 2) { - new MacroStabilityInwardsSoilLayer1D(surfaceLineTopLevel + deltaAboveSurfaceLine + 2) + Properties = { - Properties = - { - IsAquifer = false - } - }, - new MacroStabilityInwardsSoilLayer1D(surfaceLineTopLevel + deltaAboveSurfaceLine + 1) + IsAquifer = false + } + }, + new MacroStabilityInwardsSoilLayer1D(surfaceLineTopLevel + deltaAboveSurfaceLine + 1) + { + Properties = { - Properties = - { - IsAquifer = true - } - }, - new MacroStabilityInwardsSoilLayer1D(surfaceLineTopLevel + deltaAboveSurfaceLine) + IsAquifer = true + } + }, + new MacroStabilityInwardsSoilLayer1D(surfaceLineTopLevel + deltaAboveSurfaceLine) + { + Properties = { - Properties = - { - IsAquifer = false - } + IsAquifer = false } - }, SoilProfileType.SoilProfile1D, 0) - }; + } + }, SoilProfileType.SoilProfile1D, 0)); + var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) { SurfaceLine = surfaceLine, @@ -171,33 +164,31 @@ new Point3D(0, 0, 3.3), new Point3D(1.0, 0, 3.3) }); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, new MacroStabilityInwardsSoilProfile1D(string.Empty, 0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D(string.Empty, 0, new[] + new MacroStabilityInwardsSoilLayer1D(4.3) { - new MacroStabilityInwardsSoilLayer1D(4.3) + Properties = { - Properties = - { - IsAquifer = false - } - }, - new MacroStabilityInwardsSoilLayer1D(3.3) + IsAquifer = false + } + }, + new MacroStabilityInwardsSoilLayer1D(3.3) + { + Properties = { - Properties = - { - IsAquifer = true - } - }, - new MacroStabilityInwardsSoilLayer1D(1.1) + IsAquifer = true + } + }, + new MacroStabilityInwardsSoilLayer1D(1.1) + { + Properties = { - Properties = - { - IsAquifer = true - } + IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) - }; + } + }, SoilProfileType.SoilProfile1D, 0)); + var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) { SurfaceLine = surfaceLine, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Linq; using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Ringtoets.Common.Data.Calculation; @@ -146,13 +147,11 @@ HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "PUNT_KAT_18", 0, 0), SurfaceLine = surfaceLine, StochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("PK001_0001_Macrostabiliteit"), - StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0) + StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0, new MacroStabilityInwardsSoilProfile1D("W1-6_0_1D1", 0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("W1-6_0_1D1", 0, new[] - { - new MacroStabilityInwardsSoilLayer1D(0) - }, SoilProfileType.SoilProfile1D, 0) - } + new MacroStabilityInwardsSoilLayer1D(0) + }, SoilProfileType.SoilProfile1D, 0)) + } }; @@ -239,7 +238,10 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) + new MacroStabilityInwardsStochasticSoilProfile(1.0, new MacroStabilityInwardsSoilProfile1D("test", 3, new[] + { + new MacroStabilityInwardsSoilLayer1D(4), + }, SoilProfileType.SoilProfile1D, 0)) } }; var stochasticSoilModel2 = new MacroStabilityInwardsStochasticSoilModel("C") @@ -251,7 +253,15 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile2D, 2) + new MacroStabilityInwardsStochasticSoilProfile(1.0, new MacroStabilityInwardsSoilProfile2D("test", new[] + { + new MacroStabilityInwardsSoilLayer2D(new Ring(new[] + { + new Point2D(0, 0), + new Point2D(1, 0), + new Point2D(0, 0) + }), Enumerable.Empty()) + }, SoilProfileType.SoilProfile2D, 0)) } }; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs (.../TestStochasticSoilModel.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs (.../TestStochasticSoilModel.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -21,7 +21,6 @@ using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; -using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Data.TestUtil { @@ -38,14 +37,8 @@ { StochasticSoilProfiles.AddRange(new[] { - new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D("A") - }, - new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D("B") - } + new MacroStabilityInwardsStochasticSoilProfile(0.5, new TestMacroStabilityInwardsSoilProfile1D("A")), + new MacroStabilityInwardsStochasticSoilProfile(0.5, new TestMacroStabilityInwardsSoilProfile1D("B")) }); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -42,24 +42,18 @@ public void GetStochasticSoilModelsForSurfaceLine_SurfaceLineIntersectingSoilModel_ReturnSoilModel() { // Setup - var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] + var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(0.3, new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] { new MacroStabilityInwardsSoilLayer1D(-5.0), new MacroStabilityInwardsSoilLayer1D(-2.0), new MacroStabilityInwardsSoilLayer1D(1.0) - }, SoilProfileType.SoilProfile1D, 1) - }; - var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(0.7, SoilProfileType.SoilProfile1D, 2) + }, SoilProfileType.SoilProfile1D, 1)); + var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(0.7, new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-4.0), - new MacroStabilityInwardsSoilLayer1D(0.0), - new MacroStabilityInwardsSoilLayer1D(4.0) - }, SoilProfileType.SoilProfile1D, 2) - }; + new MacroStabilityInwardsSoilLayer1D(-4.0), + new MacroStabilityInwardsSoilLayer1D(0.0), + new MacroStabilityInwardsSoilLayer1D(4.0) + }, SoilProfileType.SoilProfile1D, 2)); var soilModel = new MacroStabilityInwardsStochasticSoilModel("A"); soilModel.Geometry.AddRange(new[] @@ -123,14 +117,8 @@ }); soilModel.StochasticSoilProfiles.AddRange(new[] { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = soilProfile1 - }, - new MacroStabilityInwardsStochasticSoilProfile(0.7, SoilProfileType.SoilProfile1D, 2) - { - SoilProfile = soilProfile2 - } + new MacroStabilityInwardsStochasticSoilProfile(0.3, soilProfile1), + new MacroStabilityInwardsStochasticSoilProfile(0.7, soilProfile2) }); MacroStabilityInwardsStochasticSoilModel[] availableSoilModels = { @@ -225,14 +213,8 @@ }); soilModel.StochasticSoilProfiles.AddRange(new[] { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = soilProfile1 - }, - new MacroStabilityInwardsStochasticSoilProfile(0.7, SoilProfileType.SoilProfile1D, 2) - { - SoilProfile = soilProfile2 - } + new MacroStabilityInwardsStochasticSoilProfile(0.3, soilProfile1), + new MacroStabilityInwardsStochasticSoilProfile(0.7, soilProfile2) }); MacroStabilityInwardsStochasticSoilModel[] availableSoilModels = { @@ -258,24 +240,18 @@ public void GetStochasticSoilModelsForSurfaceLine_SurfaceLineOverlappingSoilModels_ReturnSoilModels() { // Setup - var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) + var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(1.0, new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-5.0), - new MacroStabilityInwardsSoilLayer1D(-2.0), - new MacroStabilityInwardsSoilLayer1D(1.0) - }, SoilProfileType.SoilProfile1D, 1) - }; - var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsSoilLayer1D(-5.0), + new MacroStabilityInwardsSoilLayer1D(-2.0), + new MacroStabilityInwardsSoilLayer1D(1.0) + }, SoilProfileType.SoilProfile1D, 1)); + var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(1.0, new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-4.0), - new MacroStabilityInwardsSoilLayer1D(0.0), - new MacroStabilityInwardsSoilLayer1D(4.0) - }, SoilProfileType.SoilProfile1D, 2) - }; + new MacroStabilityInwardsSoilLayer1D(-4.0), + new MacroStabilityInwardsSoilLayer1D(0.0), + new MacroStabilityInwardsSoilLayer1D(4.0) + }, SoilProfileType.SoilProfile1D, 2)); const double y = 1.1; var soilModel1 = new MacroStabilityInwardsStochasticSoilModel("A"); @@ -417,24 +393,18 @@ public void GenerateCalculationItemsStructure_SurfaceLineIntersectingSoilModel_ReturnOneGroupWithTwoCalculations() { // Setup - var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1) + var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(0.3, new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-5.0), - new MacroStabilityInwardsSoilLayer1D(-2.0), - new MacroStabilityInwardsSoilLayer1D(1.0) - }, SoilProfileType.SoilProfile1D, 1) - }; - var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(0.7, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsSoilLayer1D(-5.0), + new MacroStabilityInwardsSoilLayer1D(-2.0), + new MacroStabilityInwardsSoilLayer1D(1.0) + }, SoilProfileType.SoilProfile1D, 1)); + var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(0.7, new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-4.0), - new MacroStabilityInwardsSoilLayer1D(0.0), - new MacroStabilityInwardsSoilLayer1D(4.0) - }, SoilProfileType.SoilProfile1D, 2) - }; + new MacroStabilityInwardsSoilLayer1D(-4.0), + new MacroStabilityInwardsSoilLayer1D(0.0), + new MacroStabilityInwardsSoilLayer1D(4.0) + }, SoilProfileType.SoilProfile1D, 2)); var soilModel = new MacroStabilityInwardsStochasticSoilModel("A"); soilModel.Geometry.AddRange(new[] @@ -567,14 +537,8 @@ }); soilModel.StochasticSoilProfiles.AddRange(new[] { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = soilProfile1 - }, - new MacroStabilityInwardsStochasticSoilProfile(0.7, SoilProfileType.SoilProfile1D, 2) - { - SoilProfile = soilProfile2 - } + new MacroStabilityInwardsStochasticSoilProfile(0.3, soilProfile1), + new MacroStabilityInwardsStochasticSoilProfile(0.7, soilProfile2) }); MacroStabilityInwardsStochasticSoilModel[] availableSoilModels = { @@ -618,24 +582,18 @@ public void GenerateCalculationItemsStructure_SurfaceLineOverlappingSoilModel_ReturnOneGroupWithProfilesFromBothSoilModels() { // Setup - var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) + var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(1.0, new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-5.0), - new MacroStabilityInwardsSoilLayer1D(-2.0), - new MacroStabilityInwardsSoilLayer1D(1.0) - }, SoilProfileType.SoilProfile1D, 1) - }; - var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsSoilLayer1D(-5.0), + new MacroStabilityInwardsSoilLayer1D(-2.0), + new MacroStabilityInwardsSoilLayer1D(1.0) + }, SoilProfileType.SoilProfile1D, 1)); + var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(1.0, new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-4.0), - new MacroStabilityInwardsSoilLayer1D(0.0), - new MacroStabilityInwardsSoilLayer1D(4.0) - }, SoilProfileType.SoilProfile1D, 2) - }; + new MacroStabilityInwardsSoilLayer1D(-4.0), + new MacroStabilityInwardsSoilLayer1D(0.0), + new MacroStabilityInwardsSoilLayer1D(4.0) + }, SoilProfileType.SoilProfile1D, 2)); const double y = 1.1; var soilModel1 = new MacroStabilityInwardsStochasticSoilModel("A"); @@ -711,24 +669,18 @@ public void GenerateCalculationItemsStructure_SurfaceLinesEachIntersectingSoilModel_ReturnTwoGroupsWithProfilesFromIntersectingSoilModels() { // Setup - var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) + var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(1.0, new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-5.0), - new MacroStabilityInwardsSoilLayer1D(-2.0), - new MacroStabilityInwardsSoilLayer1D(1.0) - }, SoilProfileType.SoilProfile1D, 1) - }; - var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsSoilLayer1D(-5.0), + new MacroStabilityInwardsSoilLayer1D(-2.0), + new MacroStabilityInwardsSoilLayer1D(1.0) + }, SoilProfileType.SoilProfile1D, 1)); + var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(1.0, new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-4.0), - new MacroStabilityInwardsSoilLayer1D(0.0), - new MacroStabilityInwardsSoilLayer1D(4.0) - }, SoilProfileType.SoilProfile1D, 2) - }; + new MacroStabilityInwardsSoilLayer1D(-4.0), + new MacroStabilityInwardsSoilLayer1D(0.0), + new MacroStabilityInwardsSoilLayer1D(4.0) + }, SoilProfileType.SoilProfile1D, 2)); const double y = 1.1; var soilModel1 = new MacroStabilityInwardsStochasticSoilModel("A"); @@ -826,24 +778,18 @@ public void GenerateCalculationItemsStructure_OneSurfaceLineIntersectingSoilModelOneSurfaceLineNoIntersection_ReturnOneGroupsWithProfilesAndLogOneWarning() { // Setup - var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) + var soilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(1.0, new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-5.0), - new MacroStabilityInwardsSoilLayer1D(-2.0), - new MacroStabilityInwardsSoilLayer1D(1.0) - }, SoilProfileType.SoilProfile1D, 1) - }; - var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsSoilLayer1D(-5.0), + new MacroStabilityInwardsSoilLayer1D(-2.0), + new MacroStabilityInwardsSoilLayer1D(1.0) + }, SoilProfileType.SoilProfile1D, 1)); + var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(1.0, new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-4.0), - new MacroStabilityInwardsSoilLayer1D(0.0), - new MacroStabilityInwardsSoilLayer1D(4.0) - }, SoilProfileType.SoilProfile1D, 2) - }; + new MacroStabilityInwardsSoilLayer1D(-4.0), + new MacroStabilityInwardsSoilLayer1D(0.0), + new MacroStabilityInwardsSoilLayer1D(4.0) + }, SoilProfileType.SoilProfile1D, 2)); const double y = 1.1; var soilModel1 = new MacroStabilityInwardsStochasticSoilModel("A"); @@ -956,14 +902,8 @@ }); soilModel.StochasticSoilProfiles.AddRange(new[] { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = soilProfile1 - }, - new MacroStabilityInwardsStochasticSoilProfile(0.7, SoilProfileType.SoilProfile1D, 2) - { - SoilProfile = soilProfile2 - } + new MacroStabilityInwardsStochasticSoilProfile(0.3, soilProfile1), + new MacroStabilityInwardsStochasticSoilProfile(0.7, soilProfile2) }); var availableSoilModels = new[] { @@ -1032,18 +972,10 @@ }); soilModel.StochasticSoilProfiles.AddRange(new[] { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = soilProfile1 - }, - new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 2) - { - SoilProfile = soilProfile2 - }, - new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 3) - { - SoilProfile = soilProfile3 - } + new MacroStabilityInwardsStochasticSoilProfile(0.3, soilProfile1), + new MacroStabilityInwardsStochasticSoilProfile(0.2, soilProfile2), + new MacroStabilityInwardsStochasticSoilProfile(0.5, soilProfile3) + }); var availableSoilModels = new[] { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs =================================================================== diff -u -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -344,19 +344,16 @@ var random = new Random(22); MacroStabilityInwardsSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, new MacroStabilityInwardsSoilProfile1D(string.Empty, random.NextDouble(), new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D(string.Empty, random.NextDouble(), new[] + new MacroStabilityInwardsSoilLayer1D(random.NextDouble()) { - new MacroStabilityInwardsSoilLayer1D(random.NextDouble()) + Properties = { - Properties = - { - IsAquifer = true - } + IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) - }; + } + }, SoilProfileType.SoilProfile1D, 0)); var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("StochasticSoilModelName"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); @@ -820,10 +817,7 @@ var properties = new MacroStabilityInwardsInputContextProperties(context, handler); - inputParameters.StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() - }; + inputParameters.StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, new TestMacroStabilityInwardsSoilProfile1D()); // Call properties.SurfaceLine = newSurfaceLine; @@ -844,10 +838,7 @@ mocks.ReplayAll(); MacroStabilityInwardsSurfaceLine testSurfaceLine = ValidSurfaceLine(0, 2); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() - }; + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, new TestMacroStabilityInwardsSoilProfile1D()); var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("StochasticSoilModelName"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); @@ -892,10 +883,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var soilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() - }; + var soilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, new TestMacroStabilityInwardsSoilProfile1D()); var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("StochasticSoilModelName"); stochasticSoilModel.StochasticSoilProfiles.Add(soilProfile); var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) @@ -947,17 +935,11 @@ mocks.ReplayAll(); MacroStabilityInwardsSurfaceLine testSurfaceLine = ValidSurfaceLine(0, 2); - var stochasticSoilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() - }; + var stochasticSoilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(0.0, new TestMacroStabilityInwardsSoilProfile1D()); var stochasticSoilModel1 = new MacroStabilityInwardsStochasticSoilModel("StochasticSoilModel1Name"); stochasticSoilModel1.StochasticSoilProfiles.Add(stochasticSoilProfile1); - var stochasticSoilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() - }; + var stochasticSoilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(0.0, new TestMacroStabilityInwardsSoilProfile1D()); var stochasticSoilModel2 = new MacroStabilityInwardsStochasticSoilModel("StochasticSoilModel2Name"); stochasticSoilModel1.StochasticSoilProfiles.Add(stochasticSoilProfile2); @@ -1074,7 +1056,7 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1) + new MacroStabilityInwardsStochasticSoilProfile(0.2, new TestMacroStabilityInwardsSoilProfile1D()) } }, new MacroStabilityInwardsStochasticSoilModel("C") @@ -1086,7 +1068,7 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsStochasticSoilProfile(0.3, new TestMacroStabilityInwardsSoilProfile1D()) } }, new MacroStabilityInwardsStochasticSoilModel("E") @@ -1098,7 +1080,7 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 3) + new MacroStabilityInwardsStochasticSoilProfile(0.3, new TestMacroStabilityInwardsSoilProfile1D()) } } }; @@ -1171,7 +1153,7 @@ { StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) + new MacroStabilityInwardsStochasticSoilProfile(1.0, new TestMacroStabilityInwardsSoilProfile1D()) } }; var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput) @@ -1604,10 +1586,7 @@ private static MacroStabilityInwardsStochasticSoilModel ValidStochasticSoilModel(double xMin, double xMax) { var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("StochasticSoilModelName"); - stochasticSoilModel.StochasticSoilProfiles.Add(new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 1234) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() - }); + stochasticSoilModel.StochasticSoilProfiles.Add(new MacroStabilityInwardsStochasticSoilProfile(0.0, new TestMacroStabilityInwardsSoilProfile1D())); stochasticSoilModel.Geometry.Add(new Point2D(xMin, 1.0)); stochasticSoilModel.Geometry.Add(new Point2D(xMax, 0.0)); return stochasticSoilModel; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs =================================================================== diff -u -rc3590f48e7da0ab48b1ccd7f58a7e623565b566c -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision c3590f48e7da0ab48b1ccd7f58a7e623565b566c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -77,10 +77,7 @@ { new MacroStabilityInwardsSoilLayer1D(10) }, SoilProfileType.SoilProfile1D, 0); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = soilProfile - }; + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, soilProfile); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); // Call @@ -103,10 +100,7 @@ { new MacroStabilityInwardsSoilLayer1D(10) }, SoilProfileType.SoilProfile1D, 0); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = soilProfile - }; + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, soilProfile); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilProfilePropertiesTest.cs =================================================================== diff -u -rc3590f48e7da0ab48b1ccd7f58a7e623565b566c -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilProfilePropertiesTest.cs (.../StochasticSoilProfilePropertiesTest.cs) (revision c3590f48e7da0ab48b1ccd7f58a7e623565b566c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilProfilePropertiesTest.cs (.../StochasticSoilProfilePropertiesTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -30,6 +30,7 @@ using NUnit.Framework; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; +using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Forms.Test.PropertyClasses @@ -54,7 +55,7 @@ public void Constructor_ValidStochasticSoilProfile_ExpectedValues() { // Setup - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile2D, 1234L); + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, new TestMacroStabilityInwardsSoilProfile1D()); // Call var properties = new StochasticSoilProfileProperties(stochasticSoilProfile); @@ -116,10 +117,7 @@ }; var soilProfile = new MacroStabilityInwardsSoilProfile1D("name", -5.0, layers, SoilProfileType.SoilProfile1D, 0); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1234L) - { - SoilProfile = soilProfile - }; + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, soilProfile); var properties = new StochasticSoilProfileProperties(stochasticSoilProfile); // Call @@ -149,10 +147,7 @@ }; var soilProfile = new MacroStabilityInwardsSoilProfile2D("name", layers, SoilProfileType.SoilProfile2D, 1234L); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1234L) - { - SoilProfile = soilProfile - }; + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, soilProfile); var properties = new StochasticSoilProfileProperties(stochasticSoilProfile); // Call @@ -173,13 +168,10 @@ { // Setup var layer = new MacroStabilityInwardsSoilLayer1D(-2); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.142, SoilProfileType.SoilProfile1D, 0) + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.142, new MacroStabilityInwardsSoilProfile1D("", -5.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("", -5.0, new[] - { - layer - }, SoilProfileType.SoilProfile1D, 0) - }; + layer + }, SoilProfileType.SoilProfile1D, 0)); // Call var properties = new StochasticSoilProfileProperties(stochasticSoilProfile); @@ -234,13 +226,10 @@ new Point2D(3.830, 1.040506) }), new Ring[0]); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.142, SoilProfileType.SoilProfile2D, 0) + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.142, new MacroStabilityInwardsSoilProfile2D("", new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile2D("", new[] - { - layer - }, SoilProfileType.SoilProfile2D, 0) - }; + layer + }, SoilProfileType.SoilProfile2D, 0)); // Call var properties = new StochasticSoilProfileProperties(stochasticSoilProfile); @@ -283,10 +272,7 @@ { // Setup var soilProfile = new UnsupportedSoilProfile(); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1234L) - { - SoilProfile = soilProfile - }; + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.2, soilProfile); // Call var properties = new StochasticSoilProfileProperties(stochasticSoilProfile); @@ -315,10 +301,7 @@ }; var soilProfile = new MacroStabilityInwardsSoilProfile1D(expectedName, -5.0, layers, SoilProfileType.SoilProfile1D, 0); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(probability, SoilProfileType.SoilProfile1D, 1234L) - { - SoilProfile = soilProfile - }; + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(probability, soilProfile); // Call var properties = new StochasticSoilProfileProperties(stochasticSoilProfile); @@ -361,10 +344,7 @@ }; var soilProfile = new MacroStabilityInwardsSoilProfile2D(expectedName, layers, SoilProfileType.SoilProfile2D, 0); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(probability, SoilProfileType.SoilProfile2D, 0) - { - SoilProfile = soilProfile - }; + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(probability, soilProfile); // Call var properties = new StochasticSoilProfileProperties(stochasticSoilProfile); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -103,10 +103,7 @@ var assessmentSection = mockRepository.Stub(); var handler = mockRepository.Stub(); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() - }; + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, new TestMacroStabilityInwardsSoilProfile1D()); var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("Model") { Geometry = Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -59,10 +59,7 @@ var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) { - StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 2) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() - } + StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, new TestMacroStabilityInwardsSoilProfile1D()) }; var inputContext = new MacroStabilityInwardsInputContext(input, calculationItem, @@ -106,10 +103,7 @@ var assessmentSection = mockRepository.Stub(); var handler = mockRepository.Stub(); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() - }; + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, new TestMacroStabilityInwardsSoilProfile1D()); var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("Model") { Geometry = Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -178,7 +178,7 @@ public void StochasticSoilProfile_AlwaysOnChange_NotifyObserverAndCalculationPropertyChanged() { // Setup - var newProfile = new MacroStabilityInwardsStochasticSoilProfile(0, 0, 0); + var newProfile = new MacroStabilityInwardsStochasticSoilProfile(0, new TestMacroStabilityInwardsSoilProfile1D()); var newValue = new DataGridViewComboBoxItemWrapper(newProfile); var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs =================================================================== diff -u -r0c5fdf3803fc373c20aa5e12fd180247797e15e2 -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 0c5fdf3803fc373c20aa5e12fd180247797e15e2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -1021,12 +1021,7 @@ MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfileToChange = calculation.InputParameters.StochasticSoilProfile; var updatedProfile = new MacroStabilityInwardsStochasticSoilProfile( - 0.5, - stochasticSoilProfileToChange.SoilProfileType, - stochasticSoilProfileToChange.SoilProfileId) - { - SoilProfile = stochasticSoilProfileToChange.SoilProfile - }; + 0.5, stochasticSoilProfileToChange.SoilProfile); dataGridView.Invalidated += (sender, args) => refreshed++; // When @@ -1414,15 +1409,12 @@ new Point2D(10.0, 0.0) })); - var stochasticSoilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1) + var stochasticSoilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(0.3, new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 1", -10.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-5.0), - new MacroStabilityInwardsSoilLayer1D(-2.0), - new MacroStabilityInwardsSoilLayer1D(1.0) - }, SoilProfileType.SoilProfile1D, 1) - }; + new MacroStabilityInwardsSoilLayer1D(-5.0), + new MacroStabilityInwardsSoilLayer1D(-2.0), + new MacroStabilityInwardsSoilLayer1D(1.0) + }, SoilProfileType.SoilProfile1D, 1)); var stochasticSoilModelA = new MacroStabilityInwardsStochasticSoilModel("Model A") { @@ -1434,27 +1426,22 @@ StochasticSoilProfiles = { stochasticSoilProfile1, - new MacroStabilityInwardsStochasticSoilProfile(0.7, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsStochasticSoilProfile(0.7, new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 2", -8.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-4.0), - new MacroStabilityInwardsSoilLayer1D(0.0), - new MacroStabilityInwardsSoilLayer1D(4.0) - }, SoilProfileType.SoilProfile1D, 2) - } + new MacroStabilityInwardsSoilLayer1D(-4.0), + new MacroStabilityInwardsSoilLayer1D(0.0), + new MacroStabilityInwardsSoilLayer1D(4.0) + }, SoilProfileType.SoilProfile1D, 2)) + } }; - var stochasticSoilProfile5 = new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1) + var stochasticSoilProfile5 = new MacroStabilityInwardsStochasticSoilProfile(0.3, new MacroStabilityInwardsSoilProfile1D("Profile 5", -10.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 5", -10.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-5.0), - new MacroStabilityInwardsSoilLayer1D(-2.0), - new MacroStabilityInwardsSoilLayer1D(1.0) - }, SoilProfileType.SoilProfile1D, 1) - }; + new MacroStabilityInwardsSoilLayer1D(-5.0), + new MacroStabilityInwardsSoilLayer1D(-2.0), + new MacroStabilityInwardsSoilLayer1D(1.0) + }, SoilProfileType.SoilProfile1D, 1)); var stochasticSoilModelE = new MacroStabilityInwardsStochasticSoilModel("Model E") { @@ -1481,24 +1468,18 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1) + new MacroStabilityInwardsStochasticSoilProfile(0.3, new MacroStabilityInwardsSoilProfile1D("Profile 3", -10.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 3", -10.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-5.0), - new MacroStabilityInwardsSoilLayer1D(-2.0), - new MacroStabilityInwardsSoilLayer1D(1.0) - }, SoilProfileType.SoilProfile1D, 1) - }, - new MacroStabilityInwardsStochasticSoilProfile(0.7, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsSoilLayer1D(-5.0), + new MacroStabilityInwardsSoilLayer1D(-2.0), + new MacroStabilityInwardsSoilLayer1D(1.0) + }, SoilProfileType.SoilProfile1D, 1)), + new MacroStabilityInwardsStochasticSoilProfile(0.7, new MacroStabilityInwardsSoilProfile1D("Profile 4", -8.0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Profile 4", -8.0, new[] - { - new MacroStabilityInwardsSoilLayer1D(-4.0), - new MacroStabilityInwardsSoilLayer1D(0.0), - new MacroStabilityInwardsSoilLayer1D(4.0) - }, SoilProfileType.SoilProfile1D, 2) - } + new MacroStabilityInwardsSoilLayer1D(-4.0), + new MacroStabilityInwardsSoilLayer1D(0.0), + new MacroStabilityInwardsSoilLayer1D(4.0) + }, SoilProfileType.SoilProfile1D, 2)) } }, stochasticSoilModelE Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -32,6 +32,7 @@ using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.Views; +using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Forms.Test.Views @@ -165,9 +166,7 @@ { InputParameters = { - StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.1, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = new MacroStabilityInwardsSoilProfile1D( + StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.1, new MacroStabilityInwardsSoilProfile1D( "profile", -1, new[] @@ -177,8 +176,7 @@ new MacroStabilityInwardsSoilLayer1D(0) }, SoilProfileType.SoilProfile1D, - 1) - } + 1)) } }; @@ -289,8 +287,7 @@ { InputParameters = { - SurfaceLine = surfaceLine, - StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 1) + SurfaceLine = surfaceLine } }; @@ -325,28 +322,6 @@ } [Test] - public void Data_WithoutSoilProfile_SoilLayerTableEmpty() - { - // Setup - using (var view = new MacroStabilityInwardsInputView()) - { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) - { - InputParameters = - { - StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 1) - } - }; - - // Call - view.Data = calculation; - - // Assert - AssertEmptySoilLayerTable(view); - } - } - - [Test] public void UpdateObserver_CalculationNameUpdated_ChartTitleUpdated() { // Setup @@ -469,15 +444,12 @@ { MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); MacroStabilityInwardsStochasticSoilProfile soilProfile = GetStochasticSoilProfile(); - var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 1) + var soilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(0.5, new MacroStabilityInwardsSoilProfile1D("profile", -2, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("profile", -2, new[] - { - new MacroStabilityInwardsSoilLayer1D(0), - new MacroStabilityInwardsSoilLayer1D(2), - new MacroStabilityInwardsSoilLayer1D(3) - }, SoilProfileType.SoilProfile1D, 1) - }; + new MacroStabilityInwardsSoilLayer1D(0), + new MacroStabilityInwardsSoilLayer1D(2), + new MacroStabilityInwardsSoilLayer1D(3) + }, SoilProfileType.SoilProfile1D, 1)); var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) { @@ -703,15 +675,12 @@ private static MacroStabilityInwardsStochasticSoilProfile GetStochasticSoilProfile() { - return new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 1) + return new MacroStabilityInwardsStochasticSoilProfile(0.5, new MacroStabilityInwardsSoilProfile1D("profile", -1, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("profile", -1, new[] - { - new MacroStabilityInwardsSoilLayer1D(1), - new MacroStabilityInwardsSoilLayer1D(3), - new MacroStabilityInwardsSoilLayer1D(5) - }, SoilProfileType.SoilProfile1D, 1) - }; + new MacroStabilityInwardsSoilLayer1D(1), + new MacroStabilityInwardsSoilLayer1D(3), + new MacroStabilityInwardsSoilLayer1D(5) + }, SoilProfileType.SoilProfile1D, 1)); } private static MacroStabilityInwardsSurfaceLine GetSurfaceLineWithGeometry() Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -380,13 +380,10 @@ new Point3D(3.0, 0.0, 1.0), new Point3D(3.0, -5.0, 0.0) }); - var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 1) + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0, new MacroStabilityInwardsSoilProfile1D("Ondergrondschematisatie", 0, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("Ondergrondschematisatie", 0, new[] - { - new MacroStabilityInwardsSoilLayer1D(0) - }, SoilProfileType.SoilProfile1D, 0) - }; + new MacroStabilityInwardsSoilLayer1D(0) + }, SoilProfileType.SoilProfile1D, 0)); var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("Ondergrondmodel"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs =================================================================== diff -u -re46922a39166f62578f01b338db68a820a5fd448 -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs (.../MacroStabilityInwardsStochasticSoilModelTransformerTest.cs) (revision e46922a39166f62578f01b338db68a820a5fd448) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs (.../MacroStabilityInwardsStochasticSoilModelTransformerTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -102,13 +102,10 @@ CollectionAssert.AreEqual(soilModel.Geometry, transformedModel.Geometry); Assert.AreEqual(1, transformedModel.StochasticSoilProfiles.Count); - var expectedStochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1, SoilProfileType.SoilProfile1D, 2) + var expectedStochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1, new MacroStabilityInwardsSoilProfile1D("test", 3, new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("test", 3, new [] - { - new MacroStabilityInwardsSoilLayer1D(4) - }, SoilProfileType.SoilProfile1D, 1) - }; + new MacroStabilityInwardsSoilLayer1D(4) + }, SoilProfileType.SoilProfile1D, 1)); AssertStochasticSoilProfile(expectedStochasticSoilProfile, transformedModel.StochasticSoilProfiles.First()); } @@ -136,28 +133,25 @@ CollectionAssert.AreEqual(soilModel.Geometry, transformedModel.Geometry); Assert.AreEqual(1, transformedModel.StochasticSoilProfiles.Count); - var expectedStochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1, SoilProfileType.SoilProfile2D, 2) + var expectedStochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1, new MacroStabilityInwardsSoilProfile2D("test", new[] { - SoilProfile = new MacroStabilityInwardsSoilProfile2D("test", new[] + new MacroStabilityInwardsSoilLayer2D(new Ring(new[] { - new MacroStabilityInwardsSoilLayer2D(new Ring(new[] + new Point2D(0.0, 0.0), + new Point2D(1.0, 0.0), + new Point2D(1.0, 0.0), + new Point2D(0.0, 0.0) + }), new[] + { + new Ring(new[] { - new Point2D(0.0, 0.0), - new Point2D(1.0, 0.0), - new Point2D(1.0, 0.0), - new Point2D(0.0, 0.0) - }), new[] - { - new Ring(new[] - { - new Point2D(1.0, 1.0), - new Point2D(2.0, 1.0), - new Point2D(2.0, 1.0), - new Point2D(1.0, 1.0) - }), - }) - }, SoilProfileType.SoilProfile2D, 1) - }; + new Point2D(1.0, 1.0), + new Point2D(2.0, 1.0), + new Point2D(2.0, 1.0), + new Point2D(1.0, 1.0) + }), + }) + }, SoilProfileType.SoilProfile2D, 1)); AssertStochasticSoilProfile(expectedStochasticSoilProfile, transformedModel.StochasticSoilProfiles.First()); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs =================================================================== diff -u -r86e6c6985b6841357f600bff63c169a92b528640 -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs) (revision 86e6c6985b6841357f600bff63c169a92b528640) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -537,33 +537,27 @@ model.StochasticSoilProfiles.AddRange(new[] { - new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 0) - { - SoilProfile = new MacroStabilityInwardsSoilProfile1D( - "A", - 0.0, - new[] - { - new MacroStabilityInwardsSoilLayer1D(0.0) - }, - SoilProfileType.SoilProfile1D, - 0) - }, - new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile2D, 0) - { - SoilProfile = new MacroStabilityInwardsSoilProfile2D( - "B", - new[] - { - new MacroStabilityInwardsSoilLayer2D(new Ring(new[] - { - new Point2D(3, 2), - new Point2D(4, 5) - }), Enumerable.Empty()) - }, - SoilProfileType.SoilProfile2D, - 0) - } + new MacroStabilityInwardsStochasticSoilProfile(0.5, new MacroStabilityInwardsSoilProfile1D( + "A", + 0.0, + new[] + { + new MacroStabilityInwardsSoilLayer1D(0.0) + }, + SoilProfileType.SoilProfile1D, + 0)), + new MacroStabilityInwardsStochasticSoilProfile(0.5, new MacroStabilityInwardsSoilProfile2D( + "B", + new[] + { + new MacroStabilityInwardsSoilLayer2D(new Ring(new[] + { + new Point2D(3, 2), + new Point2D(4, 5) + }), Enumerable.Empty()) + }, + SoilProfileType.SoilProfile2D, + 0)) }); return model; } @@ -580,41 +574,32 @@ foreach (string profileName in profileNames) { model.StochasticSoilProfiles.Add( - new MacroStabilityInwardsStochasticSoilProfile(1.0 / profileNames.Length, SoilProfileType.SoilProfile1D, -1) - { - SoilProfile = new TestMacroStabilityInwardsSoilProfile1D(profileName) - }); + new MacroStabilityInwardsStochasticSoilProfile(1.0 / profileNames.Length, new TestMacroStabilityInwardsSoilProfile1D(profileName))); } return model; } private static MacroStabilityInwardsStochasticSoilProfile CloneAndSlightlyModify2DProfile(MacroStabilityInwardsStochasticSoilProfile profile) { var soilProfile = (MacroStabilityInwardsSoilProfile2D) profile.SoilProfile; - return new MacroStabilityInwardsStochasticSoilProfile(profile.Probability, profile.SoilProfileType, profile.SoilProfileId) - { - SoilProfile = new MacroStabilityInwardsSoilProfile2D( - soilProfile.Name, - soilProfile.Layers.Select(s => new MacroStabilityInwardsSoilLayer2D( - new Ring(s.OuterRing.Points.Select(p => new Point2D(p.Y - 1, p.Y))), - s.Holes)), - soilProfile.SoilProfileType, - soilProfile.MacroStabilityInwardsSoilProfileId) - }; + return new MacroStabilityInwardsStochasticSoilProfile(profile.Probability, new MacroStabilityInwardsSoilProfile2D( + soilProfile.Name, + soilProfile.Layers.Select(s => new MacroStabilityInwardsSoilLayer2D( + new Ring(s.OuterRing.Points.Select(p => new Point2D(p.Y - 1, p.Y))), + s.Holes)), + soilProfile.SoilProfileType, + soilProfile.MacroStabilityInwardsSoilProfileId)); } private static MacroStabilityInwardsStochasticSoilProfile CloneAndSlightlyModify1DProfile(MacroStabilityInwardsStochasticSoilProfile profile) { var soilProfile = (MacroStabilityInwardsSoilProfile1D) profile.SoilProfile; - return new MacroStabilityInwardsStochasticSoilProfile(profile.Probability, profile.SoilProfileType, profile.SoilProfileId) - { - SoilProfile = new MacroStabilityInwardsSoilProfile1D( - soilProfile.Name, - soilProfile.Bottom - 0.2, - soilProfile.Layers, - soilProfile.SoilProfileType, - soilProfile.MacroStabilityInwardsSoilProfileId) - }; + return new MacroStabilityInwardsStochasticSoilProfile(profile.Probability, new MacroStabilityInwardsSoilProfile1D( + soilProfile.Name, + soilProfile.Bottom - 0.2, + soilProfile.Layers, + soilProfile.SoilProfileType, + soilProfile.MacroStabilityInwardsSoilProfileId)); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -572,7 +572,7 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1) + new MacroStabilityInwardsStochasticSoilProfile(0.2, new TestMacroStabilityInwardsSoilProfile1D()) } }, new MacroStabilityInwardsStochasticSoilModel("C") @@ -584,7 +584,7 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsStochasticSoilProfile(0.3, new TestMacroStabilityInwardsSoilProfile1D()) } } }; @@ -640,7 +640,7 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1) + new MacroStabilityInwardsStochasticSoilProfile(0.2, new TestMacroStabilityInwardsSoilProfile1D()) } }, new MacroStabilityInwardsStochasticSoilModel("C") @@ -652,7 +652,7 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsStochasticSoilProfile(0.3, new TestMacroStabilityInwardsSoilProfile1D()) } }, new MacroStabilityInwardsStochasticSoilModel("E") @@ -664,7 +664,7 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 3) + new MacroStabilityInwardsStochasticSoilProfile(0.3, new TestMacroStabilityInwardsSoilProfile1D()) } } }; @@ -728,7 +728,7 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1) + new MacroStabilityInwardsStochasticSoilProfile(0.2, new TestMacroStabilityInwardsSoilProfile1D()) } }; @@ -870,7 +870,7 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1) + new MacroStabilityInwardsStochasticSoilProfile(0.2, new TestMacroStabilityInwardsSoilProfile1D()) } }, new MacroStabilityInwardsStochasticSoilModel("C") @@ -882,7 +882,7 @@ }, StochasticSoilProfiles = { - new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsStochasticSoilProfile(0.3, new TestMacroStabilityInwardsSoilProfile1D()) } } }; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs =================================================================== diff -u -r41ae2ae5761506a2e5e51266b382c3c73354f3cb -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs (.../MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs) (revision 41ae2ae5761506a2e5e51266b382c3c73354f3cb) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs (.../MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; +using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Plugin.Test.PropertyInfos @@ -64,7 +65,7 @@ var mocks = new MockRepository(); mocks.ReplayAll(); - var context = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 1234L); + var context = new MacroStabilityInwardsStochasticSoilProfile(0.0, new TestMacroStabilityInwardsSoilProfile1D()); // Call IObjectProperties objectProperties = info.CreateInstance(context); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -175,14 +175,8 @@ { new MacroStabilityInwardsSoilLayer1D(10) }, SoilProfileType.SoilProfile1D, 0); - var stochasticSoilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = soilProfile1 - }; - var stochasticSoilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = soilProfile2 - }; + var stochasticSoilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(1.0, soilProfile1); + var stochasticSoilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(1.0, soilProfile2); var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("Name"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile1); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs (.../StochasticSoilModelTreeNodeInfoTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs (.../StochasticSoilModelTreeNodeInfoTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -108,20 +108,18 @@ public void ChildNodeObjects_Always_ReturnsChildrenOfData() { // Setup - var stochasticSoilProfile1 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("soilProfile1", 0, new List + var stochasticSoilProfile1 = new MacroStabilityInwardsStochasticSoilProfile( + 1.0, + new MacroStabilityInwardsSoilProfile1D("soilProfile1", 0, new List { new MacroStabilityInwardsSoilLayer1D(10) - }, SoilProfileType.SoilProfile1D, 0) - }; - var stochasticSoilProfile2 = new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) - { - SoilProfile = new MacroStabilityInwardsSoilProfile1D("soilProfile2", 0, new List + }, SoilProfileType.SoilProfile1D, 0)); + var stochasticSoilProfile2 = new MacroStabilityInwardsStochasticSoilProfile( + 1.0, + new MacroStabilityInwardsSoilProfile1D("soilProfile2", 0, new List { new MacroStabilityInwardsSoilLayer1D(10) - }, SoilProfileType.SoilProfile1D, 0) - }; + }, SoilProfileType.SoilProfile1D, 0)); var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("Name"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile1); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs (.../StochasticSoilProfileTreeNodeInfoTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs (.../StochasticSoilProfileTreeNodeInfoTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -92,8 +92,7 @@ { soilLayer }, SoilProfileType.SoilProfile2D, 0); - var stochasticSoilProfile = mocks.StrictMock(0.1, SoilProfileType.SoilProfile1D, 1234L); - stochasticSoilProfile.SoilProfile = soilProfile; + var stochasticSoilProfile = mocks.StrictMock(0.1, soilProfile); mocks.ReplayAll(); // Call @@ -112,8 +111,7 @@ { soilLayer }, SoilProfileType.SoilProfile1D, 0); - var stochasticSoilProfile = mocks.StrictMock(0.1, SoilProfileType.SoilProfile1D, 1234L); - stochasticSoilProfile.SoilProfile = soilProfile; + var stochasticSoilProfile = mocks.StrictMock(0.1, soilProfile); mocks.ReplayAll(); // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -493,7 +493,7 @@ // Call TestDelegate test = () => MacroStabilityInwardsDataSynchronizationService.RemoveStochasticSoilProfileFromInput( null, - new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, -1)); + new MacroStabilityInwardsStochasticSoilProfile(0.5, new TestMacroStabilityInwardsSoilProfile1D())); // Assert var exception = Assert.Throws(test); @@ -624,7 +624,7 @@ // Call TestDelegate test = () => MacroStabilityInwardsDataSynchronizationService.ClearStochasticSoilProfileDependentData( null, - new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, -1)); + new MacroStabilityInwardsStochasticSoilProfile(0.5, new TestMacroStabilityInwardsSoilProfile1D())); // Assert var exception = Assert.Throws(test); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs (.../MacroStabilityInwardsInputServiceTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs (.../MacroStabilityInwardsInputServiceTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) @@ -22,6 +22,7 @@ using NUnit.Framework; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; +using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Service.Test @@ -93,7 +94,7 @@ public void SyncStochasticSoilProfileWithStochasticSoilModel_SingleStochasticSoilProfileInStochasticSoilModel_SetsStochasticSoilProfile() { // Setup - var soilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1); + var soilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.3, new TestMacroStabilityInwardsSoilProfile1D()); var soilModel = new MacroStabilityInwardsStochasticSoilModel("A"); soilModel.StochasticSoilProfiles.Add(soilProfile); @@ -117,8 +118,8 @@ var soilModel = new MacroStabilityInwardsStochasticSoilModel("A"); soilModel.StochasticSoilProfiles.AddRange(new[] { - new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 1), - new MacroStabilityInwardsStochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 2) + new MacroStabilityInwardsStochasticSoilProfile(0.0, new TestMacroStabilityInwardsSoilProfile1D()), + new MacroStabilityInwardsStochasticSoilProfile(1.0, new TestMacroStabilityInwardsSoilProfile1D()) }); var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) { @@ -136,7 +137,7 @@ public void SyncStochasticSoilProfileWithStochasticSoilModel_SingleStochasticSoilProfileInSoilModelAlreadySet_StochasticSoilProfileDoesNotChange() { // Setup - var soilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1); + var soilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.3, new TestMacroStabilityInwardsSoilProfile1D()); var soilModel = new MacroStabilityInwardsStochasticSoilModel("A"); soilModel.StochasticSoilProfiles.Add(soilProfile);