Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r8cd8f3750865e184255dc2a57758e92d356d3bbe --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 8cd8f3750865e184255dc2a57758e92d356d3bbe) @@ -64,7 +64,7 @@ CollectionAssert.IsEmpty(hydraulicBoundaryData.Locations); Assert.IsNull(hydraulicBoundaryData.FilePath); Assert.IsNull(hydraulicBoundaryData.Version); - Assert.IsFalse(hydraulicBoundaryData.HydraulicLocationConfigurationSettings.CanUsePreprocessor); + Assert.IsNotNull(hydraulicBoundaryData.HydraulicLocationConfigurationSettings); CollectionAssert.IsEmpty(assessmentSection.SpecificFailureMechanisms); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r68fbd8dc20f9cf7449e4395c28e353b6d6968dbb -r8cd8f3750865e184255dc2a57758e92d356d3bbe --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 68fbd8dc20f9cf7449e4395c28e353b6d6968dbb) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 8cd8f3750865e184255dc2a57758e92d356d3bbe) @@ -50,7 +50,6 @@ public class StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest { private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation"); - private static readonly string validPreprocessorDirectory = TestHelper.GetScratchPadPath(); private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); [Test] @@ -517,10 +516,12 @@ } [Test] - public void Run_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_CreateWaveConditionsCosineCalculatorAsExpected() + [TestCase(true)] + [TestCase(false)] + public void Run_HydraulicBoundaryDataSet_CreateWaveConditionsCosineCalculatorAsExpected(bool usePreprocessorClosure) { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(usePreprocessorClosure); StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryData.Locations.First()); CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity( @@ -553,86 +554,6 @@ } [Test] - public void Run_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_CreateWaveConditionsCosineCalculatorAsExpected() - { - // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryData.Locations.First()); - - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.UsePreprocessor = true; - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.PreprocessorDirectory = validPreprocessorDirectory; - - CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity( - calculation, - new StabilityStoneCoverFailureMechanism(), - assessmentSection); - - var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( - HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryData), - (HydraRingCalculationSettings) invocation.Arguments[0]); - }) - .Return(new TestWaveConditionsCosineCalculator()) - .Repeat - .Times(GetWaterLevels(calculation, assessmentSection).Count() * 2); - mockRepository.ReplayAll(); - - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - // Call - activity.Run(); - } - - // Assert - mockRepository.VerifyAll(); - } - - [Test] - public void Run_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_CreateWaveConditionsCosineCalculatorAsExpected() - { - // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryData.Locations.First()); - - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.UsePreprocessor = false; - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory"; - - CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity( - calculation, - new StabilityStoneCoverFailureMechanism(), - assessmentSection); - - var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( - HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryData), - (HydraRingCalculationSettings) invocation.Arguments[0]); - }) - .Return(new TestWaveConditionsCosineCalculator()) - .Repeat - .Times(GetWaterLevels(calculation, assessmentSection).Count() * 2); - mockRepository.ReplayAll(); - - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - // Call - activity.Run(); - } - - // Assert - mockRepository.VerifyAll(); - } - - [Test] [TestCase(true)] [TestCase(false)] public void Finish_VariousCalculationEndStates_NotifiesObserversOfCalculation(bool endInFailure) @@ -694,7 +615,7 @@ }; } - private static IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput() + private static IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput(bool usePreprocessorClosure = false) { var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0); @@ -709,8 +630,10 @@ } } }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData); + HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData, + usePreprocessorClosure); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] { hydraulicBoundaryLocation Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r68fbd8dc20f9cf7449e4395c28e353b6d6968dbb -r8cd8f3750865e184255dc2a57758e92d356d3bbe --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 68fbd8dc20f9cf7449e4395c28e353b6d6968dbb) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 8cd8f3750865e184255dc2a57758e92d356d3bbe) @@ -50,7 +50,6 @@ public class WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest { private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation"); - private static readonly string validPreprocessorDirectory = TestHelper.GetScratchPadPath(); private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); [Test] @@ -429,10 +428,12 @@ } [Test] - public void Run_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_CreateWaveConditionsCosineCalculatorAsExpected() + [TestCase(true)] + [TestCase(false)] + public void Run_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_CreateWaveConditionsCosineCalculatorAsExpected(bool usePreprocessorClosure) { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(usePreprocessorClosure); WaveImpactAsphaltCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryData.Locations.First()); CalculatableActivity activity = WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity( @@ -465,85 +466,6 @@ } [Test] - public void Run_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_CreateWaveConditionsCosineCalculatorAsExpected() - { - // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - WaveImpactAsphaltCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryData.Locations.First()); - - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.UsePreprocessor = true; - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.PreprocessorDirectory = validPreprocessorDirectory; - - CalculatableActivity activity = WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity( - calculation, - new WaveImpactAsphaltCoverFailureMechanism(), - assessmentSection); - - var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( - HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryData), - (HydraRingCalculationSettings) invocation.Arguments[0]); - }) - .Return(new TestWaveConditionsCosineCalculator()) - .Repeat - .Times(GetWaterLevels(calculation, assessmentSection).Count()); - mockRepository.ReplayAll(); - - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - // Call - activity.Run(); - } - - // Assert - mockRepository.VerifyAll(); - } - - [Test] - public void Run_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_CreateWaveConditionsCosineCalculatorAsExpected() - { - // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - WaveImpactAsphaltCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryData.Locations.First()); - - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.UsePreprocessor = false; - assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory"; - - CalculatableActivity activity = WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation, - new WaveImpactAsphaltCoverFailureMechanism(), - assessmentSection); - - var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( - HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryData), - (HydraRingCalculationSettings) invocation.Arguments[0]); - }) - .Return(new TestWaveConditionsCosineCalculator()) - .Repeat - .Times(GetWaterLevels(calculation, assessmentSection).Count()); - mockRepository.ReplayAll(); - - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - // Call - activity.Run(); - } - - // Assert - mockRepository.VerifyAll(); - } - - [Test] [TestCase(true)] [TestCase(false)] public void Finish_VariousCalculationEndStates_NotifiesObserversOfCalculation(bool endInFailure) @@ -605,7 +527,7 @@ }; } - private static IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput() + private static IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput(bool usePreprocessorClosure = false) { var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0); @@ -620,7 +542,9 @@ } } }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData); + + HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData, + usePreprocessorClosure); assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] {