Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r9eeb8da5cfe4e31661b3993be05558595d033743 -r0d77ad7956f44fb1b01421ecdfa9b042f2239081 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision 9eeb8da5cfe4e31661b3993be05558595d033743) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision 0d77ad7956f44fb1b01421ecdfa9b042f2239081) @@ -33,7 +33,6 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.Structures; -using Ringtoets.Common.IO.FileImporters; using Ringtoets.Common.Service; using Ringtoets.Common.Service.TestUtil; using Ringtoets.HydraRing.Calculation.Calculator.Factory; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -raf098f58dacced93e730d8c8e49e9fc0165d758b -r0d77ad7956f44fb1b01421ecdfa9b042f2239081 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision af098f58dacced93e730d8c8e49e9fc0165d758b) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 0d77ad7956f44fb1b01421ecdfa9b042f2239081) @@ -31,7 +31,6 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Hydraulics; -using Ringtoets.Common.IO.FileImporters; using Ringtoets.Common.Service; using Ringtoets.Common.Service.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data; @@ -45,6 +44,7 @@ using Ringtoets.HydraRing.Calculation.TestUtil; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; using Ringtoets.Integration.Data; +using Ringtoets.Integration.TestUtil; namespace Ringtoets.GrassCoverErosionInwards.Integration.Test { @@ -183,10 +183,7 @@ { string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) - { - importer.Import(assessmentSection, validFilePath); - } + DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); } private static DikeProfile CreateDikeProfile() Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r6787ede2e334d4c01c9aab34ecf951a10a07c7c4 -r0d77ad7956f44fb1b01421ecdfa9b042f2239081 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision 6787ede2e334d4c01c9aab34ecf951a10a07c7c4) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision 0d77ad7956f44fb1b01421ecdfa9b042f2239081) @@ -30,7 +30,6 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.Structures; -using Ringtoets.Common.IO.FileImporters; using Ringtoets.Common.Service; using Ringtoets.Common.Service.TestUtil; using Ringtoets.HeightStructures.Data; @@ -41,6 +40,7 @@ using Ringtoets.HydraRing.Calculation.Data.Input.Structures; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; using Ringtoets.Integration.Data; +using Ringtoets.Integration.TestUtil; namespace Ringtoets.HeightStructures.Integration.Test { @@ -100,10 +100,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - using (var importer = new HydraulicBoundaryDatabaseImporter()) - { - importer.Import(assessmentSection, validFilePath); - } + DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new TestHeightStructuresCalculation @@ -164,10 +161,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - using (var importer = new HydraulicBoundaryDatabaseImporter()) - { - importer.Import(assessmentSection, validFilePath); - } + DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new TestHeightStructuresCalculation @@ -209,10 +203,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - using (var importer = new HydraulicBoundaryDatabaseImporter()) - { - importer.Import(assessmentSection, validFilePath); - } + DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new TestHeightStructuresCalculation @@ -266,10 +257,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - using (var importer = new HydraulicBoundaryDatabaseImporter()) - { - importer.Import(assessmentSection, validFilePath); - } + DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new StructuresCalculation