Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs =================================================================== diff -u -r140635b34616f25ca853982955976632b6000c52 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision 140635b34616f25ca853982955976632b6000c52) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -313,8 +313,7 @@ // Call TestDelegate test = () => MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( null, - Enumerable.Empty(), - new GeneralMacroStabilityInwardsInput()); + Enumerable.Empty()); // Assert string parameter = Assert.Throws(test).ParamName; @@ -327,29 +326,14 @@ // Call TestDelegate test = () => MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( Enumerable.Empty(), - null, - new GeneralMacroStabilityInwardsInput()); + null); // Assert string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("soilModels", parameter); } [Test] - public void GenerateCalculationItemsStructure_WithoutGeneralInput_ThrowsArgumentNullException() - { - // Call - TestDelegate test = () => MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( - Enumerable.Empty(), - Enumerable.Empty(), - null); - - // Assert - string parameter = Assert.Throws(test).ParamName; - Assert.AreEqual("generalInput", parameter); - } - - [Test] public void GenerateCalculationItemsStructure_WithSurfaceLinesWithEmptySoilModels_LogFourWarnings() { // Setup @@ -372,8 +356,7 @@ { result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - Enumerable.Empty(), - new GeneralMacroStabilityInwardsInput()).ToArray(); + Enumerable.Empty()).ToArray(); }; // Assert @@ -438,8 +421,7 @@ // Call IEnumerable result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -500,8 +482,7 @@ { result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); }; // Assert @@ -566,8 +547,7 @@ { result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); }; // Assert @@ -639,8 +619,7 @@ // Call IEnumerable result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -735,8 +714,7 @@ // Call IEnumerable result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); // Assert Assert.AreEqual(2, result.Count()); @@ -848,8 +826,7 @@ { result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); }; // Assert @@ -923,13 +900,10 @@ surfaceLine }; - var generalInput = new GeneralMacroStabilityInwardsInput(); - // Call IEnumerable result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - generalInput).ToArray(); + availableSoilModels).ToArray(); // Assert var group = result.First(sl => sl.Name == surfaceLine.Name) as CalculationGroup; @@ -998,8 +972,7 @@ // Call IEnumerable result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); // Assert var group = result.First(sl => sl.Name == surfaceLine.Name) as CalculationGroup;