Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs =================================================================== diff -u -rda4a311b2ac60defe1a27a61c8d151f47268a941 -r3c535420f957462c1d525a532dad033434bf2ab7 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs) (revision da4a311b2ac60defe1a27a61c8d151f47268a941) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs) (revision 3c535420f957462c1d525a532dad033434bf2ab7) @@ -95,8 +95,8 @@ // Setup var importedStochasticSoilModels = new[] { - new TestMacroStabilityInwardsStochasticSoilModel("A"), - new TestMacroStabilityInwardsStochasticSoilModel("B") + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("A"), + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("B") }; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.StochasticSoilModels.AddRange(importedStochasticSoilModels, sourceFilePath); @@ -121,8 +121,8 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.StochasticSoilModels.AddRange(new[] { - new TestMacroStabilityInwardsStochasticSoilModel("A"), - new TestMacroStabilityInwardsStochasticSoilModel("B") + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("A"), + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("B") }, sourceFilePath); var strategy = new MacroStabilityInwardsStochasticSoilModelReplaceDataStrategy(failureMechanism); @@ -142,15 +142,15 @@ public void UpdateModelWithImportedData_WithCurrentModelAndImportedModel_ModelReplaced() { // Setup - var existingModel = new TestMacroStabilityInwardsStochasticSoilModel("existing"); + MacroStabilityInwardsStochasticSoilModel existingModel = MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("existing"); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.StochasticSoilModels.AddRange(new[] { existingModel }, sourceFilePath); var strategy = new MacroStabilityInwardsStochasticSoilModelReplaceDataStrategy(failureMechanism); - var readModel = new TestMacroStabilityInwardsStochasticSoilModel("read"); + MacroStabilityInwardsStochasticSoilModel readModel = MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("read"); // Call IEnumerable affectedObjects = strategy.UpdateModelWithImportedData(new[] @@ -170,7 +170,7 @@ public void UpdateModelWithImportedData_CalculationWithOutputAssignedRemovedSoilModelAndProfile_CalculationUpdatedAndCalculationAndInputReturned() { // Setup - var existingModel = new TestMacroStabilityInwardsStochasticSoilModel(); + MacroStabilityInwardsStochasticSoilModel existingModel = MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel(); var calculation = new MacroStabilityInwardsCalculationScenario(); calculation.InputParameters.StochasticSoilModel = existingModel; calculation.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[0]; @@ -208,8 +208,8 @@ // Setup var importedStochasticSoilModels = new[] { - new TestMacroStabilityInwardsStochasticSoilModel("B"), - new TestMacroStabilityInwardsStochasticSoilModel("B") + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("B"), + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("B") }; var strategy = new MacroStabilityInwardsStochasticSoilModelReplaceDataStrategy(new MacroStabilityInwardsFailureMechanism());