Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs =================================================================== diff -u -r95e76a7e90e94621a5e9773c2a365fa8e3b6dd31 -rcb903e8cdb76e9733979fe508ee097107c022a28 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs (.../HeightStructuresCalculationTest.cs) (revision 95e76a7e90e94621a5e9773c2a365fa8e3b6dd31) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs (.../HeightStructuresCalculationTest.cs) (revision cb903e8cdb76e9733979fe508ee097107c022a28) @@ -33,47 +33,28 @@ [Test] public void Constructor_NullGeneralInput_ThrowsArgumentNullException() { - // Setup - var probabilityAssessmentInput = new ProbabilityAssessmentInput(); - // Call - TestDelegate test = () => new HeightStructuresCalculation(null, probabilityAssessmentInput); + TestDelegate test = () => new HeightStructuresCalculation(null); // Assert var exception = Assert.Throws(test); Assert.AreEqual("generalInputParameters", exception.ParamName); } [Test] - public void Constructor_NullProbabilityAssessmentInput_ThrowsArgumentNullException() - { - // Setup - var generalInput = new GeneralHeightStructuresInput(); - - // Call - TestDelegate test = () => new HeightStructuresCalculation(generalInput, null); - - // Assert - var exception = Assert.Throws(test); - Assert.AreEqual("probabilityAssessmentInput", exception.ParamName); - } - - [Test] public void Constructor_DefaultPropertyValuesAreSet() { // Setup var generalInput = new GeneralHeightStructuresInput(); - var probabilityAssessmentInput = new ProbabilityAssessmentInput(); // Call - var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput); + var calculation = new HeightStructuresCalculation(generalInput); // Assert Assert.IsInstanceOf(calculation); Assert.IsInstanceOf(calculation); Assert.AreEqual("Nieuwe berekening", calculation.Name); Assert.IsNotNull(calculation.InputParameters); - Assert.AreEqual(probabilityAssessmentInput, calculation.ProbabilityAssessmentInput); Assert.IsNull(calculation.Comments); Assert.IsFalse(calculation.HasOutput); AssertDemoInput(calculation.InputParameters); @@ -84,8 +65,7 @@ { // Setup var generalInput = new GeneralHeightStructuresInput(); - var probabilityAssessmentInput = new ProbabilityAssessmentInput(); - var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput) + var calculation = new HeightStructuresCalculation(generalInput) { Output = new TestHeightStructuresOutput() }; @@ -102,8 +82,7 @@ { // Setup var generalInput = new GeneralHeightStructuresInput(); - var probabilityAssessmentInput = new ProbabilityAssessmentInput(); - var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput) + var calculation = new HeightStructuresCalculation(generalInput) { Output = null }; @@ -117,8 +96,7 @@ { // Setup var generalInput = new GeneralHeightStructuresInput(); - var probabilityAssessmentInput = new ProbabilityAssessmentInput(); - var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput) + var calculation = new HeightStructuresCalculation(generalInput) { Output = new TestHeightStructuresOutput() }; @@ -132,8 +110,7 @@ { // Setup var generalInput = new GeneralHeightStructuresInput(); - var probabilityAssessmentInput = new ProbabilityAssessmentInput(); - var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput); + var calculation = new HeightStructuresCalculation(generalInput); // Call ICalculationInput input = calculation.GetObservableInput(); @@ -147,8 +124,7 @@ { // Setup var generalInput = new GeneralHeightStructuresInput(); - var probabilityAssessmentInput = new ProbabilityAssessmentInput(); - var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput) + var calculation = new HeightStructuresCalculation(generalInput) { Output = new TestHeightStructuresOutput() };