Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs =================================================================== diff -u -rf59a022b5a9865fb288c02861489d744e019487d -r9cd1f99915772a8d9990c31e281b70dd663b4e2d --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision f59a022b5a9865fb288c02861489d744e019487d) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d) @@ -309,15 +309,11 @@ public void Calculate_InvalidInFlowModelType_ThrowsInvalidEnumArgumentException() { // Setup - var failureMechanism = new ClosingStructuresFailureMechanism(); - var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, - mockRepository); - var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); + var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new TestClosingStructuresCalculation { InputParameters = @@ -333,9 +329,6 @@ // Call TestDelegate call = () => service.Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -384,9 +377,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -468,9 +458,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -550,9 +537,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -634,9 +618,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -714,9 +695,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -795,9 +773,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -870,9 +845,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, preprocessorDirectory); @@ -935,9 +907,6 @@ { Action call = () => new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -994,9 +963,6 @@ { new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); } @@ -1059,9 +1025,6 @@ { new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); } @@ -1126,9 +1089,6 @@ { new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); }