Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs =================================================================== diff -u -r50597fbeb76b752bc250107dfa91b696bb6c4995 -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs (.../StochasticSoilModelReplaceDataStrategyTest.cs) (revision 50597fbeb76b752bc250107dfa91b696bb6c4995) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs (.../StochasticSoilModelReplaceDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) @@ -67,7 +67,7 @@ var strategy = new StochasticSoilModelReplaceDataStrategy(new PipingFailureMechanism()); // Call - TestDelegate test = () => strategy.UpdateModelWithImportedData(new StochasticSoilModelCollection(), null, string.Empty); + TestDelegate test = () => strategy.UpdateModelWithImportedData(null, string.Empty); // Assert string paramName = Assert.Throws(test).ParamName; @@ -81,28 +81,14 @@ var strategy = new StochasticSoilModelReplaceDataStrategy(new PipingFailureMechanism()); // Call - TestDelegate test = () => strategy.UpdateModelWithImportedData(new StochasticSoilModelCollection(), new List(), null); + TestDelegate test = () => strategy.UpdateModelWithImportedData(new List(), null); // Assert string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("sourceFilePath", paramName); } [Test] - public void UpdateModelWithImportedData_TargetCollectionNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new StochasticSoilModelReplaceDataStrategy(new PipingFailureMechanism()); - - // Call - TestDelegate test = () => strategy.UpdateModelWithImportedData(null, new List(), string.Empty); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("targetDataCollection", paramName); - } - - [Test] public void UpdateModelWithImportedData_WithoutCurrentModelAndModelsImported_NewModelsAdded() { // Setup @@ -116,8 +102,7 @@ var strategy = new StochasticSoilModelReplaceDataStrategy(pipingFailureMechanism); // Call - IEnumerable affectedObjects = strategy.UpdateModelWithImportedData(pipingFailureMechanism.StochasticSoilModels, - importedStochasticSoilModels, + IEnumerable affectedObjects = strategy.UpdateModelWithImportedData(importedStochasticSoilModels, "path"); // Assert @@ -142,7 +127,7 @@ var strategy = new StochasticSoilModelReplaceDataStrategy(failureMechanism); // Call - IEnumerable affectedObjects = strategy.UpdateModelWithImportedData(failureMechanism.StochasticSoilModels, new List(), sourceFilePath); + IEnumerable affectedObjects = strategy.UpdateModelWithImportedData(new List(), sourceFilePath); // Assert CollectionAssert.IsEmpty(failureMechanism.StochasticSoilModels); @@ -167,12 +152,10 @@ var readModel = new TestStochasticSoilModel("read"); // Call - IEnumerable affectedObjects = strategy.UpdateModelWithImportedData( - pipingFailureMechanism.StochasticSoilModels, - new[] - { - readModel - }, sourceFilePath); + IEnumerable affectedObjects = strategy.UpdateModelWithImportedData(new[] + { + readModel + }, sourceFilePath); // Assert Assert.AreSame(readModel, pipingFailureMechanism.StochasticSoilModels[0]); @@ -204,7 +187,7 @@ }, sourceFilePath); // Call - IEnumerable affectedObjects = strategy.UpdateModelWithImportedData(targetCollection, new List(), sourceFilePath).ToArray(); + IEnumerable affectedObjects = strategy.UpdateModelWithImportedData(new List(), sourceFilePath).ToArray(); // Assert Assert.IsFalse(calculation.HasOutput); @@ -231,7 +214,7 @@ var targetCollection = new StochasticSoilModelCollection(); // Call - TestDelegate test = () => strategy.UpdateModelWithImportedData(targetCollection, importedStochasticSoilModels, "path"); + TestDelegate test = () => strategy.UpdateModelWithImportedData(importedStochasticSoilModels, "path"); // Assert var exception = Assert.Throws(test);