Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r03dedfcdc1cd61d80f3707a97cb8f3aa1ebe647b -r0d25a92fb182347591a75c5467ac9d602e58a022 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 03dedfcdc1cd61d80f3707a97cb8f3aa1ebe647b) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 0d25a92fb182347591a75c5467ac9d602e58a022) @@ -63,8 +63,9 @@ private const int validateMenuItemIndex = 7; private const int calculateMenuItemIndex = 8; private const int clearOutputMenuItemIndex = 10; - private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "HydraulicBoundaryDatabaseImporter"); + private readonly string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite")); + private MockRepository mocks; private WaveImpactAsphaltCoverPlugin plugin; private TreeNodeInfo info; @@ -477,8 +478,6 @@ public void ContextMenuStrip_Always_AddCustomItems() { // Setup - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase { @@ -659,8 +658,6 @@ public void GivenValidInput_ThenValidationItemEnabled() { // Given - string validHydroDatabasePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); failureMechanism.AddSection(new FailureMechanismSection("A", new[] { @@ -671,7 +668,7 @@ var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase { - FilePath = validHydroDatabasePath + FilePath = validFilePath }); var parent = new CalculationGroup(); @@ -988,16 +985,14 @@ public void GivenCalculation_WhenValidating_ThenCalculationValidated(bool validCalculation) { // Given - string validHydroDatabasePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); failureMechanism.AddSection(new FailureMechanismSection("A", new[] { new Point2D(0, 0), new Point2D(1, 1) })); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydroDatabasePath); + failureMechanism, mocks, validFilePath); var parent = new CalculationGroup(); var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation @@ -1077,7 +1072,7 @@ Contribution = 5 }; IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(testDataPath, "complete.sqlite")); + failureMechanism, mocks, validFilePath); var parent = new CalculationGroup(); var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation @@ -1150,7 +1145,7 @@ }; IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(testDataPath, "complete.sqlite")); + failureMechanism, mocks, validFilePath); assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = false; @@ -1226,7 +1221,7 @@ Contribution = 5 }; IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(testDataPath, "complete.sqlite")); + failureMechanism, mocks, validFilePath); assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; @@ -1302,7 +1297,7 @@ Contribution = 5 }; IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, Path.Combine(testDataPath, "complete.sqlite")); + failureMechanism, mocks, validFilePath); assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; @@ -1484,8 +1479,6 @@ public void GivenValidInput_ThenCalculationItemEnabled() { // Given - string validHydroDatabasePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); failureMechanism.AddSection(new FailureMechanismSection("A", new[] { @@ -1496,7 +1489,7 @@ var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase { - FilePath = validHydroDatabasePath + FilePath = validFilePath }); var parent = new CalculationGroup(); @@ -1547,16 +1540,14 @@ public void GivenValidCalculation_WhenCalculating_ThenCalculationReturnsResult() { // Given - string validHydroDatabasePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); failureMechanism.AddSection(new FailureMechanismSection("A", new[] { new Point2D(0, 0), new Point2D(1, 1) })); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydroDatabasePath); + failureMechanism, mocks, validFilePath); var parent = new CalculationGroup(); WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetValidCalculation(); @@ -1598,7 +1589,7 @@ IEnumerable waterLevels = calculation.InputParameters.GetWaterLevels(normativeAssessmentLevel); int nrOfCalculators = waterLevels.Count(); var calculatorFactory = mocks.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)) + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Path.GetDirectoryName(validFilePath), string.Empty)) .Return(new TestWaveConditionsCosineCalculator()) .Repeat .Times(nrOfCalculators);