Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs =================================================================== diff -u -ra42bae106b7a5afd5ffb2a405c1265828a323588 -r8d2c93e2bc5f1993b9e8e9037f015e7d366ec636 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision a42bae106b7a5afd5ffb2a405c1265828a323588) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 8d2c93e2bc5f1993b9e8e9037f015e7d366ec636) @@ -152,15 +152,11 @@ string validFilePath = Path.Combine(testDataPath, validFile); const string locationName = "punt_flw_ 1"; - const string calculationName = "locationName"; - const string calculationNotConvergedMessage = "calculationNotConvergedMessage"; const string ringId = "ringId"; const double norm = 30; var mockRepository = new MockRepository(); var calculationMessageProviderMock = mockRepository.Stub(); - calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); - calculationMessageProviderMock.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(calculationNotConvergedMessage); mockRepository.ReplayAll(); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, locationName, 0, 0) @@ -173,21 +169,17 @@ var testFactory = (TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance; var testCalculator = testFactory.DesignWaterLevelCalculator; - // Call var service = new DesignWaterLevelCalculationService(); + testCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + + // Call service.Calculate(hydraulicBoundaryLocation, validFilePath, ringId, norm, calculationMessageProviderMock); - service.Cancel(); // Assert - Assert.AreEqual(testDataPath, testCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(ringId, testCalculator.RingId); - - var expectedInput = CreateInput(hydraulicBoundaryLocation, norm); - AssertInput(expectedInput, testCalculator.ReceivedInputs.First()); Assert.IsTrue(testCalculator.IsCanceled); } mockRepository.VerifyAll(); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -ra42bae106b7a5afd5ffb2a405c1265828a323588 -r8d2c93e2bc5f1993b9e8e9037f015e7d366ec636 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision a42bae106b7a5afd5ffb2a405c1265828a323588) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 8d2c93e2bc5f1993b9e8e9037f015e7d366ec636) @@ -152,15 +152,11 @@ string validFilePath = Path.Combine(testDataPath, validFile); const string locationName = "punt_flw_ 1"; - const string calculationName = "locationName"; - const string calculationNotConvergedMessage = "calculationNotConvergedMessage"; const string ringId = "ringId"; const double norm = 30; var mockRepository = new MockRepository(); - var calculationMessageProviderMock = mockRepository.StrictMock(); - calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); - calculationMessageProviderMock.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(calculationNotConvergedMessage); + var calculationMessageProviderMock = mockRepository.Stub(); mockRepository.ReplayAll(); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, locationName, 0, 0) @@ -174,19 +170,16 @@ var testCalculator = testFactory.WaveHeightCalculator; var service = new WaveHeightCalculationService(); + testCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + + // Call service.Calculate(hydraulicBoundaryLocation, validFilePath, ringId, norm, calculationMessageProviderMock); - service.Cancel(); // Assert - Assert.AreEqual(testDataPath, testCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(ringId, testCalculator.RingId); - - var expectedInput = CreateInput(hydraulicBoundaryLocation, norm); - AssertInput(expectedInput, testCalculator.ReceivedInputs.First()); Assert.IsTrue(testCalculator.IsCanceled); } mockRepository.VerifyAll(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs =================================================================== diff -u -re90324ad44fdf6e7af3a755239246727123a1591 -r8d2c93e2bc5f1993b9e8e9037f015e7d366ec636 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision e90324ad44fdf6e7af3a755239246727123a1591) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 8d2c93e2bc5f1993b9e8e9037f015e7d366ec636) @@ -31,6 +31,7 @@ using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.GrassCoverErosionInwards.Data; +using Ringtoets.HydraRing.Calculation.Calculator; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.Parsers; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; @@ -507,7 +508,7 @@ } [Test] - public void Calculate_CancelWithValidOvertoppingCalculationInput_CancelsCalculator() + public void Calculate_CancelWithValidOvertoppingCalculationInput_CancelsCalculatorAndHasNullOutput() { // Setup var grassCoverErosionInwardsFailureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -537,21 +538,23 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + service.CalculateDikeHeight(calculation, assessmentSectionStub, failureMechanismSection, grassCoverErosionInwardsFailureMechanism.GeneralInput, grassCoverErosionInwardsFailureMechanism.Contribution, testDataPath); - service.Cancel(); // Assert Assert.IsTrue(calculator.IsCanceled); + Assert.IsNull(calculation.Output); } } [Test] - public void Calculate_CancelWithValidDikeCalculationInput_CancelsCalculator() + public void Calculate_CancelWithValidDikeCalculationInput_CancelsCalculatorAndHasNullOutput() { // Setup var grassCoverErosionInwardsFailureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -582,15 +585,16 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); service.CalculateDikeHeight(calculation, assessmentSectionStub, failureMechanismSection, grassCoverErosionInwardsFailureMechanism.GeneralInput, grassCoverErosionInwardsFailureMechanism.Contribution, testDataPath); - service.Cancel(); // Assert + Assert.IsNull(calculation.Output); Assert.IsTrue(calculator.IsCanceled); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -ra42bae106b7a5afd5ffb2a405c1265828a323588 -r8d2c93e2bc5f1993b9e8e9037f015e7d366ec636 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision a42bae106b7a5afd5ffb2a405c1265828a323588) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 8d2c93e2bc5f1993b9e8e9037f015e7d366ec636) @@ -440,7 +440,7 @@ } [Test] - public void Calculate_CanceledCalculationWithValidInput_CancelsCalculator() + public void Calculate_CanceledCalculationWithValidInput_CancelsCalculatorAndHasNullOutput() { // Setup GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultValidationInput(); @@ -454,15 +454,17 @@ { var testWaveConditionsCosineCalculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; var grassCoverErosionOutwardsWaveConditionsCalculationService = new GrassCoverErosionOutwardsWaveConditionsCalculationService(); + testWaveConditionsCosineCalculator.CalculationFinishedHandler += (s, e) => grassCoverErosionOutwardsWaveConditionsCalculationService.Cancel(); + // Call grassCoverErosionOutwardsWaveConditionsCalculationService.Calculate(calculation, grassCoverErosionOutwardsFailureMechanism, assessmentSectionStub, validFilePath); - grassCoverErosionOutwardsWaveConditionsCalculationService.Cancel(); // Assert + Assert.IsNull(calculation.Output); Assert.IsTrue(testWaveConditionsCosineCalculator.IsCanceled); } mockRepository.VerifyAll(); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs =================================================================== diff -u -re90324ad44fdf6e7af3a755239246727123a1591 -r8d2c93e2bc5f1993b9e8e9037f015e7d366ec636 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision e90324ad44fdf6e7af3a755239246727123a1591) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 8d2c93e2bc5f1993b9e8e9037f015e7d366ec636) @@ -357,7 +357,7 @@ } [Test] - public void Calculate_CancelCalculationWithValidInput_CancelsCalculator() + public void Calculate_CancelCalculationWithValidInput_CancelsCalculatorAndHasNullOutput() { // Setup var heightStructuresFailureMechanism = new HeightStructuresFailureMechanism(); @@ -386,6 +386,7 @@ { var testStructuresOvertoppingCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresOvertoppingCalculator; var service = new HeightStructuresCalculationService(); + testStructuresOvertoppingCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call service.Calculate(calculation, @@ -394,9 +395,9 @@ heightStructuresFailureMechanism.GeneralInput, heightStructuresFailureMechanism.Contribution, testDataPath); - service.Cancel(); // Assert + Assert.IsNull(calculation.Output); Assert.IsTrue(testStructuresOvertoppingCalculator.IsCanceled); } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs =================================================================== diff -u -r839b7622ac7d27765a7807ad067574c8f244d91e -r8d2c93e2bc5f1993b9e8e9037f015e7d366ec636 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 839b7622ac7d27765a7807ad067574c8f244d91e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 8d2c93e2bc5f1993b9e8e9037f015e7d366ec636) @@ -19,7 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; +using System.Runtime.CompilerServices; using Ringtoets.HydraRing.Calculation.Calculator; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics; @@ -126,6 +128,7 @@ public class TestHydraRingCalculator { + public event EventHandler CalculationFinishedHandler; public readonly List ReceivedInputs = new List(); public bool IsCanceled = false; public string RingId { get; set; } @@ -139,11 +142,21 @@ throw new HydraRingFileParserException(); } ReceivedInputs.Add(input); + + CalculationFinished(EventArgs.Empty); } public void Cancel() { IsCanceled = true; } + + private void CalculationFinished(EventArgs e) + { + if (CalculationFinishedHandler != null) + { + CalculationFinishedHandler(this, e); + } + } } } \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -ra42bae106b7a5afd5ffb2a405c1265828a323588 -r8d2c93e2bc5f1993b9e8e9037f015e7d366ec636 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision a42bae106b7a5afd5ffb2a405c1265828a323588) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 8d2c93e2bc5f1993b9e8e9037f015e7d366ec636) @@ -475,10 +475,10 @@ { var testCalculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; var service = new WaveConditionsCalculationService(); + testCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call service.PublicCalculate(a, b, c, norm, input, hlcdDirectory, ringId, name); - service.Cancel(); // Assert Assert.IsTrue(testCalculator.IsCanceled); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -ra42bae106b7a5afd5ffb2a405c1265828a323588 -r8d2c93e2bc5f1993b9e8e9037f015e7d366ec636 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision a42bae106b7a5afd5ffb2a405c1265828a323588) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 8d2c93e2bc5f1993b9e8e9037f015e7d366ec636) @@ -481,7 +481,7 @@ } [Test] - public void Calculate_CancelCalculationWithValidInput_CancelsCalculator() + public void Calculate_CancelCalculationWithValidInput_CancelsCalculatorAndHasNullOutput() { // Setup StabilityStoneCoverWaveConditionsCalculation calculation = GetValidCalculation(); @@ -495,13 +495,15 @@ { var testWaveConditionsCosineCalculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; var stabilityStoneCoverWaveConditionsCalculationService = new StabilityStoneCoverWaveConditionsCalculationService(); + testWaveConditionsCosineCalculator.CalculationFinishedHandler += (s, e) => stabilityStoneCoverWaveConditionsCalculationService.Cancel(); + // Call stabilityStoneCoverWaveConditionsCalculationService.Calculate(calculation, assessmentSectionStub, stabilityStoneCoverFailureMechanism.GeneralInput, validFilePath); - stabilityStoneCoverWaveConditionsCalculationService.Cancel(); // Assert + Assert.IsNull(calculation.Output); Assert.IsTrue(testWaveConditionsCosineCalculator.IsCanceled); } mockRepository.VerifyAll(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -ra42bae106b7a5afd5ffb2a405c1265828a323588 -r8d2c93e2bc5f1993b9e8e9037f015e7d366ec636 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision a42bae106b7a5afd5ffb2a405c1265828a323588) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 8d2c93e2bc5f1993b9e8e9037f015e7d366ec636) @@ -78,10 +78,7 @@ using (new HydraRingCalculatorFactoryConfig()) { // Call - Action call = () => - { - isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, testFilePath); - }; + Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, testFilePath); }; // Assert TestHelper.AssertLogMessages(call, messages => @@ -108,10 +105,7 @@ using (new HydraRingCalculatorFactoryConfig()) { // Call - Action call = () => - { - isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, testFilePath); - }; + Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, testFilePath); }; // Assert TestHelper.AssertLogMessages(call, messages => @@ -138,10 +132,7 @@ using (new HydraRingCalculatorFactoryConfig()) { // Call - Action call = () => - { - isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); - }; + Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); }; // Assert TestHelper.AssertLogMessages(call, messages => @@ -161,17 +152,14 @@ { // Setup WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultValidationInput(); - calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevel = (RoundedDouble)double.NaN; + calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevel = (RoundedDouble) double.NaN; var isValid = true; using (new HydraRingCalculatorFactoryConfig()) { // Call - Action call = () => - { - isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); - }; + Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); }; // Assert TestHelper.AssertLogMessages(call, messages => @@ -193,18 +181,15 @@ { // Setup WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultValidationInput(); - calculation.InputParameters.LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetment; - calculation.InputParameters.UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetment; + calculation.InputParameters.LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment; + calculation.InputParameters.UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment; var isValid = true; using (new HydraRingCalculatorFactoryConfig()) { // Call - Action call = () => - { - isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); - }; + Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); }; // Assert TestHelper.AssertLogMessages(call, messages => @@ -236,10 +221,7 @@ using (new HydraRingCalculatorFactoryConfig()) { // Call - Action call = () => - { - isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); - }; + Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); }; // Assert TestHelper.AssertLogMessages(call, messages => @@ -254,6 +236,7 @@ Assert.IsFalse(isValid); } } + [Test] [TestCase(double.PositiveInfinity)] [TestCase(double.NegativeInfinity)] @@ -373,7 +356,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var testWaveConditionsCosineCalculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; + var testWaveConditionsCosineCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; // Call new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(calculation, @@ -391,7 +374,6 @@ int waterLevelIndex = 0; foreach (WaveConditionsCosineCalculationInput actualInput in testWaveConditionsInputs) { - GeneralWaveConditionsInput generalInput = waveImpactAsphaltCoverFailureMechanism.GeneralInput; var input = calculation.InputParameters; @@ -400,7 +382,7 @@ input.HydraulicBoundaryLocation.Id, assessmentSectionStub.FailureMechanismContribution.Norm, input.ForeshoreProfile.Geometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)), - new HydraRingBreakWater((int)input.BreakWater.Type, input.BreakWater.Height), + new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height), calculation.InputParameters.WaterLevels.ElementAt(waterLevelIndex++), generalInput.A, generalInput.B, @@ -440,7 +422,7 @@ } [Test] - public void Calculate_CancelCalculationWithValidInput_CancelsCalculator() + public void Calculate_CancelCalculationWithValidInput_CancelsCalculatorAndHasNullOutput() { // Setup WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultValidationInput(); @@ -452,18 +434,18 @@ using (new HydraRingCalculatorFactoryConfig()) { - var testWaveConditionsCosineCalculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; + var testWaveConditionsCosineCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; var waveImpactAsphaltCoverWaveConditionsCalculationService = new WaveImpactAsphaltCoverWaveConditionsCalculationService(); + testWaveConditionsCosineCalculator.CalculationFinishedHandler += (s, e) => waveImpactAsphaltCoverWaveConditionsCalculationService.Cancel(); - // Call waveImpactAsphaltCoverWaveConditionsCalculationService.Calculate(calculation, assessmentSectionStub, waveImpactAsphaltCoverFailureMechanism.GeneralInput, validFilePath); - waveImpactAsphaltCoverWaveConditionsCalculationService.Cancel(); // Assert + Assert.IsNull(calculation.Output); Assert.IsTrue(testWaveConditionsCosineCalculator.IsCanceled); } mockRepository.VerifyAll(); @@ -507,7 +489,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; + var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; calculator.EndInFailure = true; // Call @@ -529,7 +511,6 @@ ForeshoreWithoutBreakWater } - private static IAssessmentSection CreateAssessmentSectionStub(IFailureMechanism failureMechanism, MockRepository mockRepository) { var assessmentSectionStub = mockRepository.Stub(); @@ -549,16 +530,16 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, "locationName", 0, 0) { - DesignWaterLevel = (RoundedDouble)9.3 + DesignWaterLevel = (RoundedDouble) 9.3 }, ForeshoreProfile = CreateForeshoreProfile(), UseForeshore = true, UseBreakWater = true, StepSize = WaveConditionsInputStepSize.Half, - LowerBoundaryRevetment = (RoundedDouble)4, - UpperBoundaryRevetment = (RoundedDouble)10, - UpperBoundaryWaterLevels = (RoundedDouble)8, - LowerBoundaryWaterLevels = (RoundedDouble)7.1 + LowerBoundaryRevetment = (RoundedDouble) 4, + UpperBoundaryRevetment = (RoundedDouble) 10, + UpperBoundaryWaterLevels = (RoundedDouble) 8, + LowerBoundaryWaterLevels = (RoundedDouble) 7.1 } }; return calculation; @@ -567,8 +548,8 @@ private static WaveImpactAsphaltCoverWaveConditionsCalculation GetDefaultValidationInput() { WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetValidCalculation(); - calculation.InputParameters.LowerBoundaryWaterLevels = (RoundedDouble)5; - calculation.InputParameters.UpperBoundaryWaterLevels = (RoundedDouble)5.4; + calculation.InputParameters.LowerBoundaryWaterLevels = (RoundedDouble) 5; + calculation.InputParameters.UpperBoundaryWaterLevels = (RoundedDouble) 5.4; return calculation; }