Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -rccd7b3eae46ccd07b9990cdd9b57c048636ca85c -r105bf942dafea23515d9d10b37dc23ba370ad0a4 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision ccd7b3eae46ccd07b9990cdd9b57c048636ca85c) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 105bf942dafea23515d9d10b37dc23ba370ad0a4) @@ -144,7 +144,7 @@ // Call TestDelegate test = () => new WaveHeightCalculationService().Calculate(null, - new HydraulicBoundaryLocationCalculation(), + new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()), testDataPath, validPreprocessorDirectory, 1, @@ -181,9 +181,12 @@ [Test] public void Calculate_MessageProviderNull_ThrowArgumentNullException() { + // Setup + var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); + // Call - TestDelegate test = () => new WaveHeightCalculationService().Calculate(new TestHydraulicBoundaryLocation(), - new HydraulicBoundaryLocationCalculation(), + TestDelegate test = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, + new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation), string.Empty, string.Empty, 1, @@ -215,8 +218,8 @@ var calculationMessageProvider = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var location = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); - var calculation = new HydraulicBoundaryLocationCalculation + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) { InputParameters = { @@ -226,8 +229,8 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { - Action call = () => new WaveHeightCalculationService().Calculate(location, - calculation, + Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, + hydraulicBoundaryLocationCalculation, validFilePath, validPreprocessorDirectory, norm, @@ -247,8 +250,8 @@ AssessmentLevelCalculationInput expectedInput = CreateInput(100, norm); AssertInput(expectedInput, calculator.ReceivedInputs.Single()); Assert.IsFalse(calculator.IsCanceled); - Assert.IsNotNull(calculation.Output); - Assert.AreEqual(readIllustrationPoints, calculation.Output.HasGeneralResult); + Assert.IsNotNull(hydraulicBoundaryLocationCalculation.Output); + Assert.AreEqual(readIllustrationPoints, hydraulicBoundaryLocationCalculation.Output.HasGeneralResult); } mockRepository.VerifyAll(); @@ -277,14 +280,14 @@ var calculationMessageProvider = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var location = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); - var calculation = new HydraulicBoundaryLocationCalculation(); + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - new WaveHeightCalculationService().Calculate(location, - calculation, + new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, + hydraulicBoundaryLocationCalculation, validFilePath, preprocessorDirectory, 1.0 / 30, @@ -318,8 +321,8 @@ calculationMessageProvider.Expect(mp => mp.GetCalculatedNotConvergedMessage("punt_flw_ 1")).Return(failedConvergenceMessage); mockRepository.ReplayAll(); - var location = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); - var calculation = new HydraulicBoundaryLocationCalculation + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) { InputParameters = { @@ -329,8 +332,8 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { - Action call = () => new WaveHeightCalculationService().Calculate(location, - calculation, + Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, + hydraulicBoundaryLocationCalculation, validFilePath, validPreprocessorDirectory, 1.0 / 30, @@ -348,8 +351,8 @@ CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]); }); Assert.IsFalse(calculator.IsCanceled); - Assert.IsNotNull(calculation.Output); - Assert.AreEqual(readIllustrationPoints, calculation.Output.HasGeneralResult); + Assert.IsNotNull(hydraulicBoundaryLocationCalculation.Output); + Assert.AreEqual(readIllustrationPoints, hydraulicBoundaryLocationCalculation.Output.HasGeneralResult); } mockRepository.VerifyAll(); @@ -372,8 +375,8 @@ var calculationMessageProvider = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var location = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); - var calculation = new HydraulicBoundaryLocationCalculation + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) { InputParameters = { @@ -384,8 +387,8 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - Action call = () => new WaveHeightCalculationService().Calculate(location, - calculation, + Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, + hydraulicBoundaryLocationCalculation, validFilePath, validPreprocessorDirectory, 1.0 / 30, @@ -407,8 +410,8 @@ Assert.IsInstanceOf(tupleArray[1].Item3); }); - Assert.IsNotNull(calculation.Output); - Assert.IsFalse(calculation.Output.HasGeneralResult); + Assert.IsNotNull(hydraulicBoundaryLocationCalculation.Output); + Assert.IsFalse(hydraulicBoundaryLocationCalculation.Output.HasGeneralResult); } mockRepository.VerifyAll(); @@ -431,8 +434,8 @@ var calculationMessageProvider = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var location = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); - var calculation = new HydraulicBoundaryLocationCalculation + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) { InputParameters = { @@ -443,8 +446,8 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - Action call = () => new WaveHeightCalculationService().Calculate(location, - calculation, + Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, + hydraulicBoundaryLocationCalculation, validFilePath, validPreprocessorDirectory, 1.0 / 30, @@ -466,8 +469,8 @@ "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]); }); - Assert.IsNotNull(calculation.Output); - Assert.IsFalse(calculation.Output.HasGeneralResult); + Assert.IsNotNull(hydraulicBoundaryLocationCalculation.Output); + Assert.IsFalse(hydraulicBoundaryLocationCalculation.Output.HasGeneralResult); } mockRepository.VerifyAll(); @@ -493,14 +496,14 @@ calculationMessageProvider.Stub(mp => mp.GetCalculatedNotConvergedMessage("punt_flw_ 1")).Return(string.Empty); mockRepository.ReplayAll(); - var location = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); - var calculation = new HydraulicBoundaryLocationCalculation(); + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - TestDelegate call = () => new WaveHeightCalculationService().Calculate(location, - calculation, + TestDelegate call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, + hydraulicBoundaryLocationCalculation, validFilePath, validPreprocessorDirectory, 1.0 / 30, @@ -532,8 +535,8 @@ var calculationMessageProvider = mockRepository.Stub(); mockRepository.ReplayAll(); - var location = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); - var calculation = new HydraulicBoundaryLocationCalculation + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) { InputParameters = { @@ -544,8 +547,8 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - Action call = () => new WaveHeightCalculationService().Calculate(location, - calculation, + Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, + hydraulicBoundaryLocationCalculation, validFilePath, validPreprocessorDirectory, 1.0 / 30, @@ -562,7 +565,7 @@ "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]); }); - Assert.IsFalse(calculation.Output.HasGeneralResult); + Assert.IsFalse(hydraulicBoundaryLocationCalculation.Output.HasGeneralResult); } mockRepository.VerifyAll(); @@ -585,14 +588,14 @@ var calculationMessageProvider = mockRepository.Stub(); mockRepository.ReplayAll(); - var location = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); - var calculation = new HydraulicBoundaryLocationCalculation(); + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - Action call = () => new WaveHeightCalculationService().Calculate(location, - calculation, + Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, + hydraulicBoundaryLocationCalculation, validFilePath, validPreprocessorDirectory, 1.0 / 30, @@ -626,8 +629,8 @@ var calculationMessageProvider = mockRepository.Stub(); mockRepository.ReplayAll(); - var location = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); - var calculation = new HydraulicBoundaryLocationCalculation(); + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation); const double norm = 1.0 / 30; @@ -637,8 +640,8 @@ calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call - service.Calculate(location, - calculation, + service.Calculate(hydraulicBoundaryLocation, + hydraulicBoundaryLocationCalculation, validFilePath, validPreprocessorDirectory, norm, @@ -689,8 +692,8 @@ mockRepository.ReplayAll(); - var location = new HydraulicBoundaryLocation(100, locationName, 0.0, 0.0); - var calculation = new HydraulicBoundaryLocationCalculation(); + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, locationName, 0.0, 0.0); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -701,8 +704,8 @@ { try { - new WaveHeightCalculationService().Calculate(location, - calculation, + new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, + hydraulicBoundaryLocationCalculation, validFilePath, validPreprocessorDirectory, norm,