Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs =================================================================== diff -u -r801944e042197afab2cf3bb57359970479e286b3 -r78382ec129ddc7537096860680cef36f3796700d --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) @@ -353,7 +353,7 @@ { // Setup MacroStabilityInwardsFailureMechanism failureMechanism = null; - var soilModel = new StochasticSoilModel("A"); + var soilModel = new MacroStabilityInwardsStochasticSoilModel("A"); // Call TestDelegate call = () => MacroStabilityInwardsDataSynchronizationService.RemoveStochasticSoilModel(failureMechanism, soilModel); @@ -368,7 +368,7 @@ { // Setup var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - StochasticSoilModel soilModel = null; + MacroStabilityInwardsStochasticSoilModel soilModel = null; // Call TestDelegate call = () => MacroStabilityInwardsDataSynchronizationService.RemoveStochasticSoilModel(failureMechanism, soilModel); @@ -383,7 +383,7 @@ { // Setup MacroStabilityInwardsFailureMechanism failureMechanism = MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsFailureMechanismWithAllCalculationConfigurations(); - StochasticSoilModel soilModel = failureMechanism.StochasticSoilModels[1]; + MacroStabilityInwardsStochasticSoilModel soilModel = failureMechanism.StochasticSoilModels[1]; MacroStabilityInwardsCalculation[] calculationsWithSoilModel = failureMechanism.Calculations .Cast() .Where(c => ReferenceEquals(c.InputParameters.StochasticSoilModel, soilModel)) @@ -493,7 +493,7 @@ // Call TestDelegate test = () => MacroStabilityInwardsDataSynchronizationService.RemoveStochasticSoilProfileFromInput( null, - new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, -1)); + new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, -1)); // Assert var exception = Assert.Throws(test); @@ -521,12 +521,12 @@ IEnumerable calculations = failureMechanism .Calculations .Cast(); - StochasticSoilProfile profileToDelete = null; + MacroStabilityInwardsStochasticSoilProfile profileToDelete = null; foreach (MacroStabilityInwardsCalculationScenario calculationScenario in calculations) { MacroStabilityInwardsInput input = calculationScenario.InputParameters; - StochasticSoilProfile currentProfile = input.StochasticSoilProfile; + MacroStabilityInwardsStochasticSoilProfile currentProfile = input.StochasticSoilProfile; if (profileToDelete == null) { profileToDelete = currentProfile; @@ -552,14 +552,14 @@ IEnumerable calculations = failureMechanism .Calculations .Cast(); - StochasticSoilProfile profileToDelete = null; + MacroStabilityInwardsStochasticSoilProfile profileToDelete = null; var expectedInputs = new List(); foreach (MacroStabilityInwardsCalculationScenario calculationScenario in calculations) { MacroStabilityInwardsInput input = calculationScenario.InputParameters; - StochasticSoilProfile currentProfile = input.StochasticSoilProfile; + MacroStabilityInwardsStochasticSoilProfile currentProfile = input.StochasticSoilProfile; if (profileToDelete == null) { profileToDelete = currentProfile; @@ -590,12 +590,12 @@ var expectedAffectedObjects = new List(); - StochasticSoilProfile profileToDelete = null; + MacroStabilityInwardsStochasticSoilProfile profileToDelete = null; foreach (MacroStabilityInwardsCalculationScenario calculationScenario in calculations) { MacroStabilityInwardsInput input = calculationScenario.InputParameters; - StochasticSoilProfile currentProfile = input.StochasticSoilProfile; + MacroStabilityInwardsStochasticSoilProfile currentProfile = input.StochasticSoilProfile; if (profileToDelete == null) { profileToDelete = currentProfile; @@ -624,7 +624,7 @@ // Call TestDelegate test = () => MacroStabilityInwardsDataSynchronizationService.ClearStochasticSoilProfileDependentData( null, - new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, -1)); + new MacroStabilityInwardsStochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, -1)); // Assert var exception = Assert.Throws(test); @@ -652,12 +652,12 @@ IEnumerable calculations = failureMechanism .Calculations .Cast(); - StochasticSoilProfile profileToDelete = null; + MacroStabilityInwardsStochasticSoilProfile profileToDelete = null; foreach (MacroStabilityInwardsCalculationScenario calculationScenario in calculations) { MacroStabilityInwardsInput input = calculationScenario.InputParameters; - StochasticSoilProfile currentProfile = input.StochasticSoilProfile; + MacroStabilityInwardsStochasticSoilProfile currentProfile = input.StochasticSoilProfile; if (profileToDelete == null) { profileToDelete = currentProfile; @@ -683,14 +683,14 @@ IEnumerable calculations = failureMechanism .Calculations .Cast(); - StochasticSoilProfile profileToDelete = null; + MacroStabilityInwardsStochasticSoilProfile profileToDelete = null; var expectedInputs = new List(); foreach (MacroStabilityInwardsCalculationScenario calculationScenario in calculations) { MacroStabilityInwardsInput input = calculationScenario.InputParameters; - StochasticSoilProfile currentProfile = input.StochasticSoilProfile; + MacroStabilityInwardsStochasticSoilProfile currentProfile = input.StochasticSoilProfile; if (profileToDelete == null) { profileToDelete = currentProfile; @@ -721,12 +721,12 @@ var expectedAffectedObjects = new List(); - StochasticSoilProfile profileToDelete = null; + MacroStabilityInwardsStochasticSoilProfile profileToDelete = null; foreach (MacroStabilityInwardsCalculationScenario calculationScenario in calculations) { MacroStabilityInwardsInput input = calculationScenario.InputParameters; - StochasticSoilProfile currentProfile = input.StochasticSoilProfile; + MacroStabilityInwardsStochasticSoilProfile currentProfile = input.StochasticSoilProfile; if (profileToDelete == null) { profileToDelete = currentProfile;