Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -rc17d99770f62f3634817a245fd3da0fbd938ecc3 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision c17d99770f62f3634817a245fd3da0fbd938ecc3) @@ -101,7 +101,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new TestClosingStructuresCalculationScenario @@ -163,7 +163,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new TestClosingStructuresCalculationScenario @@ -206,7 +206,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new TestClosingStructuresCalculationScenario @@ -262,7 +262,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -rc17d99770f62f3634817a245fd3da0fbd938ecc3 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision c17d99770f62f3634817a245fd3da0fbd938ecc3) @@ -167,7 +167,7 @@ { string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); } private static DikeProfile CreateDikeProfile() Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -rc17d99770f62f3634817a245fd3da0fbd938ecc3 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision c17d99770f62f3634817a245fd3da0fbd938ecc3) @@ -101,7 +101,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new TestHeightStructuresCalculationScenario @@ -162,7 +162,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new TestHeightStructuresCalculationScenario @@ -204,7 +204,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new TestHeightStructuresCalculationScenario @@ -258,7 +258,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new StructuresCalculation Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs =================================================================== diff -u -r34b2f632821f287ca83dfd611a583b129384cb96 -rc17d99770f62f3634817a245fd3da0fbd938ecc3 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs (.../HydraulicLocationConfigurationDatabaseImporterTest.cs) (revision 34b2f632821f287ca83dfd611a583b129384cb96) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs (.../HydraulicLocationConfigurationDatabaseImporterTest.cs) (revision c17d99770f62f3634817a245fd3da0fbd938ecc3) @@ -262,7 +262,7 @@ { // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validHrdFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validHrdFilePath); HydraulicBoundaryData hydraulicBoundaryData = assessmentSection.HydraulicBoundaryData; hydraulicBoundaryData.Locations.Add(new TestHydraulicBoundaryLocation()); @@ -446,7 +446,7 @@ { // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validHrdFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validHrdFilePath); HydraulicBoundaryData hydraulicBoundaryData = assessmentSection.HydraulicBoundaryData; string filePath = Path.Combine(testDataPath, $"{fileName}.sqlite"); @@ -479,7 +479,7 @@ { // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validHrdFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validHrdFilePath); HydraulicBoundaryData hydraulicBoundaryData = assessmentSection.HydraulicBoundaryData; string filePath = Path.Combine(testDataPath, "hlcdWithValidScenarioInformation.sqlite"); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseImportHandlerTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -rc17d99770f62f3634817a245fd3da0fbd938ecc3 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseImportHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseImportHandlerTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseImportHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseImportHandlerTest.cs) (revision c17d99770f62f3634817a245fd3da0fbd938ecc3) @@ -160,7 +160,7 @@ string newHlcdFilePath = Path.Combine(testDataDirectory, "hlcdWithScenarioInformation.sqlite"); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, Path.Combine(testDataDirectory, "complete.sqlite")); HydraulicBoundaryData hydraulicBoundaryData = assessmentSection.HydraulicBoundaryData; Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/DataImportHelper.cs =================================================================== diff -u -r34b2f632821f287ca83dfd611a583b129384cb96 -rc17d99770f62f3634817a245fd3da0fbd938ecc3 --- Riskeer/Integration/test/Riskeer.Integration.TestUtil/DataImportHelper.cs (.../DataImportHelper.cs) (revision 34b2f632821f287ca83dfd611a583b129384cb96) +++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/DataImportHelper.cs (.../DataImportHelper.cs) (revision c17d99770f62f3634817a245fd3da0fbd938ecc3) @@ -30,6 +30,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.IO.FileImporters; using Riskeer.Common.IO.FileImporters.MessageProviders; @@ -156,11 +157,11 @@ } /// - /// Imports the for the given . + /// Imports the for the given . /// /// The to import on. - /// This will import 18 Hydraulic boundary locations. - public static void ImportHydraulicBoundaryDatabase(AssessmentSection assessmentSection) + /// This will import 18 hydraulic boundary locations. + public static void ImportHydraulicBoundaryData(AssessmentSection assessmentSection) { using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(typeof(DataImportHelper).Assembly, false, @@ -170,18 +171,18 @@ { string filePath = Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "HRD dutch coast south.sqlite"); - ImportHydraulicBoundaryDatabase(assessmentSection, filePath); + ImportHydraulicBoundaryData(assessmentSection, filePath); } } /// - /// Imports the for the given . + /// Imports the for the given . /// /// The to import on. /// The filePath to import from. /// Thrown when /// is null. - public static void ImportHydraulicBoundaryDatabase(AssessmentSection assessmentSection, string filePath) + public static void ImportHydraulicBoundaryData(AssessmentSection assessmentSection, string filePath) { if (assessmentSection == null) { Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -rc17d99770f62f3634817a245fd3da0fbd938ecc3 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision c17d99770f62f3634817a245fd3da0fbd938ecc3) @@ -98,7 +98,7 @@ Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex].FormattedValue); // Import hydraulic boundary locations and ensure the corresponding combobox items are updated - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection); assessmentSection.HydraulicBoundaryData.Locations.NotifyObservers(); Assert.AreEqual(19, ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[hydraulicBoundaryLocationsColumnIndex]).Items.Count); Index: Riskeer/Piping/test/Riskeer.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -rc17d99770f62f3634817a245fd3da0fbd938ecc3 --- Riskeer/Piping/test/Riskeer.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/Piping/test/Riskeer.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision c17d99770f62f3634817a245fd3da0fbd938ecc3) @@ -101,7 +101,7 @@ Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex].FormattedValue); // Import hydraulic boundary locations and ensure the corresponding combobox items are updated - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection); assessmentSection.HydraulicBoundaryData.Locations.NotifyObservers(); Assert.AreEqual(19, ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[hydraulicBoundaryLocationsColumnIndex]).Items.Count); Index: Riskeer/Piping/test/Riskeer.Piping.Integration.Test/ProbabilisticPipingCalculationActivityIntegrationTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -rc17d99770f62f3634817a245fd3da0fbd938ecc3 --- Riskeer/Piping/test/Riskeer.Piping.Integration.Test/ProbabilisticPipingCalculationActivityIntegrationTest.cs (.../ProbabilisticPipingCalculationActivityIntegrationTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/Piping/test/Riskeer.Piping.Integration.Test/ProbabilisticPipingCalculationActivityIntegrationTest.cs (.../ProbabilisticPipingCalculationActivityIntegrationTest.cs) (revision c17d99770f62f3634817a245fd3da0fbd938ecc3) @@ -101,7 +101,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); var calculation = ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput( @@ -150,7 +150,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); var calculation = ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput( @@ -188,7 +188,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); var calculation = ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput( @@ -246,7 +246,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); var calculation = ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput( @@ -316,7 +316,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); var calculation = ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput( @@ -376,7 +376,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); var calculation = ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput( Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -rc17d99770f62f3634817a245fd3da0fbd938ecc3 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision c17d99770f62f3634817a245fd3da0fbd938ecc3) @@ -100,7 +100,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new TestStabilityPointStructuresCalculationScenario @@ -163,7 +163,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new TestStabilityPointStructuresCalculationScenario @@ -208,7 +208,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new TestStabilityPointStructuresCalculationScenario @@ -265,7 +265,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new StructuresCalculation