Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r16aaa945951f39aae43afb02993721a4a4a2b671 -r708e9cf90cb58b98f95bdab8cdf5a3a17a1b27a6 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 16aaa945951f39aae43afb02993721a4a4a2b671) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 708e9cf90cb58b98f95bdab8cdf5a3a17a1b27a6) @@ -81,6 +81,8 @@ private StabilityStoneCoverPlugin plugin; private TreeNodeInfo info; + private readonly string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, Path.Combine("HydraRingCalculation", "HRD ijsselmeer.sqlite")); + [Test] public void Initialized_Always_ExpectedPropertiesSet() { @@ -817,18 +819,16 @@ public void ContextMenuStrip_TwoCalculationsClickOnValidateAllInGroup_ValidationMessagesLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - var failureMechanism = new StabilityStoneCoverFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); + failureMechanism, mocks, validFilePath); var calculationA = new StabilityStoneCoverWaveConditionsCalculation { Name = "A", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(), LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -843,7 +843,7 @@ Name = "B", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(), LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -898,14 +898,20 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_NoValidationErrorsLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + var failureMechanism = new StabilityStoneCoverFailureMechanism + { + Contribution = 5 + }; + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( + failureMechanism, mocks, validFilePath); + var calculation = new StabilityStoneCoverWaveConditionsCalculation { Name = "A", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(), LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -918,15 +924,8 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new StabilityStoneCoverFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); - var nodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(group, failureMechanism.WaveConditionsCalculationGroup, failureMechanism, @@ -965,14 +964,20 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_NoValidationErrorsLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + var failureMechanism = new StabilityStoneCoverFailureMechanism + { + Contribution = 5 + }; + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( + failureMechanism, mocks, validFilePath); + var calculation = new StabilityStoneCoverWaveConditionsCalculation { Name = "A", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(), LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -985,15 +990,8 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new StabilityStoneCoverFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = false; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "InvalidPreprocessorDirectory"; @@ -1036,14 +1034,20 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_NoValidationErrorsLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + var failureMechanism = new StabilityStoneCoverFailureMechanism + { + Contribution = 5 + }; + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( + failureMechanism, mocks, validFilePath); + var calculation = new StabilityStoneCoverWaveConditionsCalculation { Name = "A", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(), LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -1056,15 +1060,8 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new StabilityStoneCoverFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = TestHelper.GetScratchPadPath(); @@ -1107,14 +1104,20 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_ValidationErrorsLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + var failureMechanism = new StabilityStoneCoverFailureMechanism + { + Contribution = 5 + }; + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( + failureMechanism, mocks, validFilePath); + var calculation = new StabilityStoneCoverWaveConditionsCalculation { Name = "A", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(), LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -1127,15 +1130,8 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new StabilityStoneCoverFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "InvalidPreprocessorDirectory"; @@ -1179,21 +1175,19 @@ public void ContextMenuStrip_TwoCalculationsClickOnCalculateAllInGroup_MessagesLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - var failureMechanism = new StabilityStoneCoverFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); + failureMechanism, mocks, validFilePath); var observerA = mocks.StrictMock(); observerA.Expect(o => o.UpdateObserver()); var observerB = mocks.StrictMock(); observerB.Expect(o => o.UpdateObserver()); var group = new CalculationGroup(); - StabilityStoneCoverWaveConditionsCalculation calculationA = GetValidCalculation(); + StabilityStoneCoverWaveConditionsCalculation calculationA = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); calculationA.Name = "A"; - StabilityStoneCoverWaveConditionsCalculation calculationB = GetValidCalculation(); + StabilityStoneCoverWaveConditionsCalculation calculationB = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); calculationB.Name = "B"; calculationA.Attach(observerA); calculationB.Attach(observerB); @@ -1225,7 +1219,7 @@ gui.Stub(g => g.MainWindow).Return(mainWindow); var calculatorFactory = mocks.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(hrdPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()); + calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Path.GetDirectoryName(validFilePath), string.Empty)).Return(new TestWaveConditionsCosineCalculator()); mocks.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -1260,15 +1254,13 @@ public void ContextMenuStrip_NoCalculations_ClearAllOutputItemDisabled() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - var group = new CalculationGroup(); var failureMechanism = new StabilityStoneCoverFailureMechanism(); failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); + failureMechanism, mocks, validFilePath); var nodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(group, failureMechanism.WaveConditionsCalculationGroup, @@ -1307,16 +1299,14 @@ public void ContextMenuStrip_TwoCalculationsWithoutOutput_ClearAllOutputItemDisabled() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - var failureMechanism = new StabilityStoneCoverFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); + failureMechanism, mocks, validFilePath); var group = new CalculationGroup(); - StabilityStoneCoverWaveConditionsCalculation calculationA = GetValidCalculation(); - StabilityStoneCoverWaveConditionsCalculation calculationB = GetValidCalculation(); + StabilityStoneCoverWaveConditionsCalculation calculationA = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); + StabilityStoneCoverWaveConditionsCalculation calculationB = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); group.Children.Add(calculationA); group.Children.Add(calculationB); @@ -1340,7 +1330,7 @@ gui.Stub(g => g.MainWindow).Return(mainWindow); var calculatorFactory = mocks.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(hrdPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()); + calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Path.GetDirectoryName(validFilePath), string.Empty)).Return(new TestWaveConditionsCosineCalculator()); mocks.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -1361,11 +1351,9 @@ public void ContextMenuStrip_TwoCalculationsWithOutputClickOnClearAllOutput_OutputRemovedForCalculationsAfterConfirmation(bool confirm) { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - var failureMechanism = new StabilityStoneCoverFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); + failureMechanism, mocks, validFilePath); var observerA = mocks.StrictMock(); var observerB = mocks.StrictMock(); @@ -1376,11 +1364,11 @@ } var group = new CalculationGroup(); - StabilityStoneCoverWaveConditionsCalculation calculationA = GetValidCalculation(); + StabilityStoneCoverWaveConditionsCalculation calculationA = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); calculationA.Output = new StabilityStoneCoverWaveConditionsOutput( Enumerable.Empty(), Enumerable.Empty()); - StabilityStoneCoverWaveConditionsCalculation calculationB = GetValidCalculation(); + StabilityStoneCoverWaveConditionsCalculation calculationB = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); calculationB.Output = new StabilityStoneCoverWaveConditionsOutput( Enumerable.Empty(), Enumerable.Empty()); @@ -1422,7 +1410,7 @@ gui.Stub(g => g.MainWindow).Return(mainWindow); var calculatorFactory = mocks.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(hrdPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()); + calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Path.GetDirectoryName(validFilePath), string.Empty)).Return(new TestWaveConditionsCosineCalculator()); mocks.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -1883,24 +1871,13 @@ base.TearDown(); } - private static TestHydraulicBoundaryLocation CreateHydraulicBoundaryLocationWithNormativeOutput() + private static StabilityStoneCoverWaveConditionsCalculation GetValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation) { - return new TestHydraulicBoundaryLocation - { - DesignWaterLevelCalculation3 = - { - Output = new TestHydraulicBoundaryLocationOutput(12) - } - }; - } - - private static StabilityStoneCoverWaveConditionsCalculation GetValidCalculation() - { return new StabilityStoneCoverWaveConditionsCalculation { InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = hydraulicBoundaryLocation, ForeshoreProfile = new TestForeshoreProfile(true), UseForeshore = true, UseBreakWater = true, Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r80c49f33c35b73d7778f8beded83ad330208e690 -r708e9cf90cb58b98f95bdab8cdf5a3a17a1b27a6 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 80c49f33c35b73d7778f8beded83ad330208e690) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 708e9cf90cb58b98f95bdab8cdf5a3a17a1b27a6) @@ -84,6 +84,8 @@ private WaveImpactAsphaltCoverPlugin plugin; private TreeNodeInfo info; + private readonly string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, Path.Combine("HydraRingCalculation", "HRD ijsselmeer.sqlite")); + [Test] public void Initialized_Always_ExpectedPropertiesSet() { @@ -833,18 +835,18 @@ public void ContextMenuStrip_TwoCalculationsClickOnValidateAllInGroup_ValidationMessagesLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); + failureMechanism, mocks, validFilePath); + HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(); + var calculationA = new WaveImpactAsphaltCoverWaveConditionsCalculation { Name = "A", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = hydraulicBoundaryLocation, LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -859,7 +861,7 @@ Name = "B", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = hydraulicBoundaryLocation, LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -914,14 +916,20 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_NoValidationErrorsLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism + { + Contribution = 5 + }; + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( + failureMechanism, mocks, validFilePath); + var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation { Name = "A", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(), LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -934,15 +942,8 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); - var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, failureMechanism.WaveConditionsCalculationGroup, failureMechanism, @@ -981,14 +982,20 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_NoValidationErrorsLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism + { + Contribution = 5 + }; + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( + failureMechanism, mocks, validFilePath); + var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation { Name = "A", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(), LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -1001,15 +1008,8 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = false; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "InvalidPreprocessorDirectory"; @@ -1052,14 +1052,20 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_NoValidationErrorsLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism + { + Contribution = 5 + }; + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( + failureMechanism, mocks, validFilePath); + var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation { Name = "A", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(), LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -1072,15 +1078,8 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = TestHelper.GetScratchPadPath(); @@ -1123,14 +1122,20 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_ValidationErrorsLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism + { + Contribution = 5 + }; + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( + failureMechanism, mocks, validFilePath); + var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation { Name = "A", InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(), LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, @@ -1143,15 +1148,8 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "InvalidPreprocessorDirectory"; @@ -1195,21 +1193,21 @@ public void ContextMenuStrip_TwoCalculationsClickOnCalculateAllInGroup_MessagesLogged() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); + failureMechanism, mocks, validFilePath); var observerA = mocks.StrictMock(); observerA.Expect(o => o.UpdateObserver()); var observerB = mocks.StrictMock(); observerB.Expect(o => o.UpdateObserver()); + HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(); + var group = new CalculationGroup(); - WaveImpactAsphaltCoverWaveConditionsCalculation calculationA = GetValidCalculation(); + WaveImpactAsphaltCoverWaveConditionsCalculation calculationA = GetValidCalculation(hydraulicBoundaryLocation); calculationA.Name = "A"; - WaveImpactAsphaltCoverWaveConditionsCalculation calculationB = GetValidCalculation(); + WaveImpactAsphaltCoverWaveConditionsCalculation calculationB = GetValidCalculation(hydraulicBoundaryLocation); calculationB.Name = "B"; calculationA.Attach(observerA); calculationB.Attach(observerB); @@ -1242,7 +1240,7 @@ .Cast() .Sum(c => c.InputParameters.GetWaterLevels(assessmentSection.GetNormativeAssessmentLevel(c.InputParameters.HydraulicBoundaryLocation)).Count()); var calculatorFactory = mocks.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(hrdPath, string.Empty)) + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Path.GetDirectoryName(validFilePath), string.Empty)) .Return(new TestWaveConditionsCosineCalculator()) .Repeat .Times(nrOfCalculators); @@ -1278,11 +1276,9 @@ public void ContextMenuStrip_NoCalculations_ClearAllOutputItemDisabled() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); + failureMechanism, mocks, validFilePath); var group = new CalculationGroup(); @@ -1322,15 +1318,15 @@ public void ContextMenuStrip_TwoCalculationsWithoutOutput_ClearAllOutputItemDisabled() { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); + failureMechanism, mocks, validFilePath); + HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(); + var group = new CalculationGroup(); - WaveImpactAsphaltCoverWaveConditionsCalculation calculationA = GetValidCalculation(); - WaveImpactAsphaltCoverWaveConditionsCalculation calculationB = GetValidCalculation(); + WaveImpactAsphaltCoverWaveConditionsCalculation calculationA = GetValidCalculation(hydraulicBoundaryLocation); + WaveImpactAsphaltCoverWaveConditionsCalculation calculationB = GetValidCalculation(hydraulicBoundaryLocation); group.Children.Add(calculationA); group.Children.Add(calculationB); @@ -1372,11 +1368,9 @@ public void ContextMenuStrip_TwoCalculationsWithOutputClickOnClearAllOutput_OutputRemovedForCalculationsAfterConfirmation(bool confirm) { // Setup - string hrdPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(hrdPath, "HRD ijsselmeer.sqlite")); + failureMechanism, mocks, validFilePath); var observerA = mocks.StrictMock(); var observerB = mocks.StrictMock(); @@ -1386,10 +1380,12 @@ observerB.Expect(o => o.UpdateObserver()); } + HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(); + var group = new CalculationGroup(); - WaveImpactAsphaltCoverWaveConditionsCalculation calculationA = GetValidCalculation(); + WaveImpactAsphaltCoverWaveConditionsCalculation calculationA = GetValidCalculation(hydraulicBoundaryLocation); calculationA.Output = new WaveImpactAsphaltCoverWaveConditionsOutput(Enumerable.Empty()); - WaveImpactAsphaltCoverWaveConditionsCalculation calculationB = GetValidCalculation(); + WaveImpactAsphaltCoverWaveConditionsCalculation calculationB = GetValidCalculation(hydraulicBoundaryLocation); calculationB.Output = new WaveImpactAsphaltCoverWaveConditionsOutput(Enumerable.Empty()); group.Children.Add(calculationA); group.Children.Add(calculationB); @@ -1884,24 +1880,13 @@ base.TearDown(); } - private static TestHydraulicBoundaryLocation CreateHydraulicBoundaryLocationWithNormativeOutput() + private static WaveImpactAsphaltCoverWaveConditionsCalculation GetValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation) { - return new TestHydraulicBoundaryLocation - { - DesignWaterLevelCalculation3 = - { - Output = new TestHydraulicBoundaryLocationOutput(12) - } - }; - } - - private static WaveImpactAsphaltCoverWaveConditionsCalculation GetValidCalculation() - { return new WaveImpactAsphaltCoverWaveConditionsCalculation { InputParameters = { - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocationWithNormativeOutput(), + HydraulicBoundaryLocation = hydraulicBoundaryLocation, ForeshoreProfile = new TestForeshoreProfile(true), UseForeshore = true, UseBreakWater = true,