Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r73114a1d1b9584c215af6cf47aa309d80cda16a4 -rf8f4f06311e58fd749631bdb933d8f8468ce56f8 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 73114a1d1b9584c215af6cf47aa309d80cda16a4) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision f8f4f06311e58fd749631bdb933d8f8468ce56f8) @@ -701,25 +701,15 @@ } [Test] - [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[] + public void Finish_ValidCalculation_NotifiesObserversOfCalculation() { - nameof(Finish_InvalidCalculation_DoesNotSetOutputAndNotifyObservers) - })] - public void Finish_InvalidCalculation_DoesNotSetOutputAndNotifyObservers(bool endInFailure, - string lastErrorFileContent) - { // Setup var mockRepository = new MockRepository(); var observer = mockRepository.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var calculator = new TestWaveConditionsCosineCalculator - { - EndInFailure = endInFailure, - LastErrorFileContent = lastErrorFileContent - }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(calculator).Repeat.Times(3); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3); mockRepository.ReplayAll(); AssessmentSectionStub assessmentSection = CreateAssessmentSection(); @@ -748,62 +738,9 @@ activity.Finish(); // Assert - Assert.IsNull(calculation.Output); mockRepository.VerifyAll(); } - [Test] - public void Finish_ValidCalculation_SetsOutputAndNotifyObserversOfCalculation() - { - // Setup - var mockRepository = new MockRepository(); - var observer = mockRepository.StrictMock(); - observer.Expect(o => o.UpdateObserver()); - - var calculatorFactory = mockRepository.StrictMock(); - var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator - { - WaveHeight = new Random(39).NextDouble() - }; - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(waveConditionsCosineCalculator).Repeat.Times(3); - mockRepository.ReplayAll(); - - AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); - ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); - - GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - - calculation.Attach(observer); - - CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation, - failureMechanism, - assessmentSection); - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - activity.Run(); - } - - // Call - activity.Finish(); - - // Assert - Assert.IsNotNull(calculation.Output); - Assert.AreEqual(3, calculation.Output.Items.Count()); - foreach (WaveConditionsOutput waveConditionsOutput in calculation.Output.Items) - { - Assert.AreEqual(waveConditionsCosineCalculator.WaveHeight, waveConditionsOutput.WaveHeight, waveConditionsOutput.WaveHeight.GetAccuracy()); - } - - mockRepository.VerifyAll(); - } - private static void ConfigureAssessmentSectionWithHydraulicBoundaryOutput(IAssessmentSection assessmentSection) { assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r070a656de458de1f93b626b631fc5afe72fb4761 -rf8f4f06311e58fd749631bdb933d8f8468ce56f8 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 070a656de458de1f93b626b631fc5afe72fb4761) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision f8f4f06311e58fd749631bdb933d8f8468ce56f8) @@ -679,25 +679,15 @@ } [Test] - [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[] + public void Finish_ValidCalculation_NotifiesObserversOfCalculation() { - nameof(Finish_InvalidCalculation_DoesNotSetOutputAndNotifyObservers) - })] - public void Finish_InvalidCalculation_DoesNotSetOutputAndNotifyObservers(bool endInFailure, - string lastErrorFileContent) - { // Setup var mockRepository = new MockRepository(); var observer = mockRepository.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var calculator = new TestWaveConditionsCosineCalculator - { - EndInFailure = endInFailure, - LastErrorFileContent = lastErrorFileContent - }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(calculator).Repeat.Times(3); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(6); mockRepository.ReplayAll(); IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); @@ -720,62 +710,9 @@ activity.Finish(); // Assert - Assert.IsNull(calculation.Output); mockRepository.VerifyAll(); } - [Test] - public void Finish_ValidCalculation_SetsOutputAndNotifyObserversOfCalculation() - { - // Setup - var mockRepository = new MockRepository(); - var observer = mockRepository.StrictMock(); - observer.Expect(o => o.UpdateObserver()); - - var calculatorFactory = mockRepository.StrictMock(); - var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator - { - WaveHeight = new Random(39).NextDouble() - }; - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(waveConditionsCosineCalculator).Repeat.Times(6); - mockRepository.ReplayAll(); - - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - - StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - - calculation.Attach(observer); - - CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity( - calculation, - new StabilityStoneCoverFailureMechanism(), - assessmentSection); - - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - activity.Run(); - } - - // Call - activity.Finish(); - - // Assert - Assert.IsNotNull(calculation.Output); - Assert.AreEqual(3, calculation.Output.BlocksOutput.Count()); - foreach (WaveConditionsOutput waveConditionsOutput in calculation.Output.BlocksOutput) - { - Assert.AreEqual(waveConditionsCosineCalculator.WaveHeight, waveConditionsOutput.WaveHeight, waveConditionsOutput.WaveHeight.GetAccuracy()); - } - - Assert.AreEqual(3, calculation.Output.ColumnsOutput.Count()); - foreach (WaveConditionsOutput waveConditionsOutput in calculation.Output.ColumnsOutput) - { - Assert.AreEqual(waveConditionsCosineCalculator.WaveHeight, waveConditionsOutput.WaveHeight, waveConditionsOutput.WaveHeight.GetAccuracy()); - } - - mockRepository.VerifyAll(); - } - private static StabilityStoneCoverWaveConditionsCalculation CreateValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation) { return new StabilityStoneCoverWaveConditionsCalculation Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r707d6a1b8f8e5b9219ae7821cc0dde61623e76cd -rf8f4f06311e58fd749631bdb933d8f8468ce56f8 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 707d6a1b8f8e5b9219ae7821cc0dde61623e76cd) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision f8f4f06311e58fd749631bdb933d8f8468ce56f8) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; using System.Drawing; using System.IO; using System.Linq; @@ -522,13 +523,12 @@ var failureMechanism = new StabilityStoneCoverFailureMechanism(); IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - var group = new CalculationGroup(); HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(); StabilityStoneCoverWaveConditionsCalculation calculationA = GetValidCalculation(hydraulicBoundaryLocation); StabilityStoneCoverWaveConditionsCalculation calculationB = GetValidCalculation(hydraulicBoundaryLocation); - group.Children.Add(calculationA); - group.Children.Add(calculationB); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + List calculations = failureMechanism.WaveConditionsCalculationGroup.Children; + calculations.Add(calculationA); + calculations.Add(calculationB); var nodeData = new StabilityStoneCoverFailureMechanismContext(failureMechanism, assessmentSection); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityFactoryTest.cs =================================================================== diff -u -r3af700006b3a91867ab1a9bb3526ff6715561847 -rf8f4f06311e58fd749631bdb933d8f8468ce56f8 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityFactoryTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityFactoryTest.cs) (revision 3af700006b3a91867ab1a9bb3526ff6715561847) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityFactoryTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityFactoryTest.cs) (revision f8f4f06311e58fd749631bdb933d8f8468ce56f8) @@ -36,6 +36,7 @@ using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; +using Ringtoets.Revetment.Data; using Ringtoets.StabilityStoneCover.Data; namespace Ringtoets.StabilityStoneCover.Service.Test @@ -100,9 +101,11 @@ assessmentSection); // Assert + CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(StabilityStoneCoverWaveConditionsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.ElementAt(0), calculation1); - AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2); + RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Single().Output.Result; + AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.ElementAt(0), calculation1, assessmentLevel); + AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel); } [Test] @@ -177,7 +180,9 @@ // Assert Assert.IsInstanceOf(activity); - AssertStabilityStoneCoverWaveConditionsCalculationActivity(activity, calculation); + AssertStabilityStoneCoverWaveConditionsCalculationActivity(activity, + calculation, + assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Single().Output.Result); } [Test] @@ -236,12 +241,8 @@ { // Setup StabilityStoneCoverFailureMechanism failureMechanism = CreateFailureMechanism(); - - var mocks = new MockRepository(); AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - mocks.ReplayAll(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); SetHydraulicBoundaryLocationToAssessmentSection(assessmentSection, hydraulicBoundaryLocation); StabilityStoneCoverWaveConditionsCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation); @@ -264,9 +265,9 @@ CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(StabilityStoneCoverWaveConditionsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.First(), calculation1); - AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2); - mocks.VerifyAll(); + RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Single().Output.Result; + AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.First(), calculation1, assessmentLevel); + AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel); } private static void SetHydraulicBoundaryLocationToAssessmentSection(AssessmentSectionStub assessmentSection, TestHydraulicBoundaryLocation hydraulicBoundaryLocation) @@ -323,12 +324,13 @@ } private static void AssertStabilityStoneCoverWaveConditionsCalculationActivity(Activity activity, - StabilityStoneCoverWaveConditionsCalculation calculation) + StabilityStoneCoverWaveConditionsCalculation calculation, + RoundedDouble assessmentLevel) { var mocks = new MockRepository(); var testCalculator = new TestWaveConditionsCosineCalculator(); var calculatorFactory = mocks.StrictMock(); - const int nrOfCalculations = 6; + int nrOfCalculations = calculation.InputParameters.GetWaterLevels(assessmentLevel).Count() * 2; calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, "")) .Return(testCalculator).Repeat.Times(nrOfCalculations); mocks.ReplayAll(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r9a62e7ebcbf96a0455143740fc883704b2cc6eea -rf8f4f06311e58fd749631bdb933d8f8468ce56f8 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 9a62e7ebcbf96a0455143740fc883704b2cc6eea) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision f8f4f06311e58fd749631bdb933d8f8468ce56f8) @@ -586,25 +586,15 @@ } [Test] - [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[] + public void Finish_ValidCalculation_NotifiesObserversOfCalculation() { - nameof(Finish_InvalidCalculation_DoesNotSetOutputAndNotifyObservers) - })] - public void Finish_InvalidCalculation_DoesNotSetOutputAndNotifyObservers(bool endInFailure, - string lastErrorFileContent) - { // Setup var mockRepository = new MockRepository(); var observer = mockRepository.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var calculator = new TestWaveConditionsCosineCalculator - { - EndInFailure = endInFailure, - LastErrorFileContent = lastErrorFileContent - }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(calculator).Repeat.Times(3); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3); mockRepository.ReplayAll(); IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); @@ -627,56 +617,9 @@ activity.Finish(); // Assert - Assert.IsNull(calculation.Output); mockRepository.VerifyAll(); } - [Test] - public void Finish_ValidCalculation_SetsOutputAndNotifyObserversOfCalculation() - { - // Setup - var mockRepository = new MockRepository(); - var observer = mockRepository.StrictMock(); - observer.Expect(o => o.UpdateObserver()); - - var calculatorFactory = mockRepository.StrictMock(); - var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator - { - WaveHeight = new Random(39).NextDouble() - }; - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(waveConditionsCosineCalculator).Repeat.Times(3); - mockRepository.ReplayAll(); - - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - - WaveImpactAsphaltCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - - calculation.Attach(observer); - - CalculatableActivity activity = WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity( - calculation, - new WaveImpactAsphaltCoverFailureMechanism(), - assessmentSection); - - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - activity.Run(); - } - - // Call - activity.Finish(); - - // Assert - Assert.IsNotNull(calculation.Output); - Assert.AreEqual(3, calculation.Output.Items.Count()); - foreach (WaveConditionsOutput waveConditionsOutput in calculation.Output.Items) - { - Assert.AreEqual(waveConditionsCosineCalculator.WaveHeight, waveConditionsOutput.WaveHeight, waveConditionsOutput.WaveHeight.GetAccuracy()); - } - - mockRepository.VerifyAll(); - } - private static WaveImpactAsphaltCoverWaveConditionsCalculation CreateValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation) { return new WaveImpactAsphaltCoverWaveConditionsCalculation Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rc0d93bd3f90940662535cb59061c59549554f5d1 -rf8f4f06311e58fd749631bdb933d8f8468ce56f8 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision c0d93bd3f90940662535cb59061c59549554f5d1) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision f8f4f06311e58fd749631bdb933d8f8468ce56f8) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; using System.Drawing; using System.IO; using System.Linq; @@ -522,13 +523,12 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - var group = new CalculationGroup(); HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(); WaveImpactAsphaltCoverWaveConditionsCalculation calculationA = GetValidCalculation(hydraulicBoundaryLocation); WaveImpactAsphaltCoverWaveConditionsCalculation calculationB = GetValidCalculation(hydraulicBoundaryLocation); - group.Children.Add(calculationA); - group.Children.Add(calculationB); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + List calculations = failureMechanism.WaveConditionsCalculationGroup.Children; + calculations.Add(calculationA); + calculations.Add(calculationB); var nodeData = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, assessmentSection); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs =================================================================== diff -u -r2fe63f6d4b56e03ed35308f2205195f398b87d4c -rf8f4f06311e58fd749631bdb933d8f8468ce56f8 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs) (revision 2fe63f6d4b56e03ed35308f2205195f398b87d4c) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs) (revision f8f4f06311e58fd749631bdb933d8f8468ce56f8) @@ -36,6 +36,7 @@ using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; +using Ringtoets.Revetment.Data; using Ringtoets.WaveImpactAsphaltCover.Data; namespace Ringtoets.WaveImpactAsphaltCover.Service.Test @@ -100,9 +101,11 @@ assessmentSection); // Assert + CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(WaveImpactAsphaltCoverWaveConditionsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.ElementAt(0), calculation1); - AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2); + RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Single().Output.Result; + AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.ElementAt(0), calculation1, assessmentLevel); + AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel); } [Test] @@ -115,8 +118,8 @@ // Call TestDelegate test = () => WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(null, - new WaveImpactAsphaltCoverFailureMechanism(), - assessmentSection); + new WaveImpactAsphaltCoverFailureMechanism(), + assessmentSection); // Assert var exception = Assert.Throws(test); @@ -134,8 +137,8 @@ // Call TestDelegate test = () => WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(new WaveImpactAsphaltCoverWaveConditionsCalculation(), - null, - assessmentSection); + null, + assessmentSection); // Assert var exception = Assert.Throws(test); @@ -172,12 +175,14 @@ // Call CalculatableActivity activity = WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation, - failureMechanism, - assessmentSection); + failureMechanism, + assessmentSection); // Assert Assert.IsInstanceOf(activity); - AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activity, calculation); + AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activity, + calculation, + assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Single().Output.Result); } [Test] @@ -190,8 +195,8 @@ // Call TestDelegate test = () => WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(null, - new WaveImpactAsphaltCoverFailureMechanism(), - assessmentSection); + new WaveImpactAsphaltCoverFailureMechanism(), + assessmentSection); // Assert var exception = Assert.Throws(test); @@ -209,8 +214,8 @@ // Call TestDelegate test = () => WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(new CalculationGroup(), - null, - assessmentSection); + null, + assessmentSection); // Assert var exception = Assert.Throws(test); @@ -223,8 +228,8 @@ { // Call TestDelegate test = () => WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(new CalculationGroup(), - new WaveImpactAsphaltCoverFailureMechanism(), - null); + new WaveImpactAsphaltCoverFailureMechanism(), + null); // Assert var exception = Assert.Throws(test); @@ -236,12 +241,8 @@ { // Setup WaveImpactAsphaltCoverFailureMechanism failureMechanism = CreateFailureMechanism(); - - var mocks = new MockRepository(); AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - mocks.ReplayAll(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); SetHydraulicBoundaryLocationToAssessmentSection(assessmentSection, hydraulicBoundaryLocation); WaveImpactAsphaltCoverWaveConditionsCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation); @@ -264,9 +265,9 @@ CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(WaveImpactAsphaltCoverWaveConditionsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.First(), calculation1); - AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2); - mocks.VerifyAll(); + RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Single().Output.Result; + AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.First(), calculation1, assessmentLevel); + AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel); } private static void SetHydraulicBoundaryLocationToAssessmentSection(AssessmentSectionStub assessmentSection, TestHydraulicBoundaryLocation hydraulicBoundaryLocation) @@ -323,12 +324,13 @@ } private static void AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(Activity activity, - WaveImpactAsphaltCoverWaveConditionsCalculation calculation) + WaveImpactAsphaltCoverWaveConditionsCalculation calculation, + RoundedDouble assessmentLevel) { var mocks = new MockRepository(); var testCalculator = new TestWaveConditionsCosineCalculator(); var calculatorFactory = mocks.StrictMock(); - const int nrOfCalculations = 3; + int nrOfCalculations = calculation.InputParameters.GetWaterLevels(assessmentLevel).Count(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, "")) .Return(testCalculator).Repeat.Times(nrOfCalculations); mocks.ReplayAll();