Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/Ringtoets.StabilityPointStructures.Integration.Test.csproj
===================================================================
diff -u -r4aca01a706f23d3ba928d2c5fd405681bc3ba55d -rc1fee53d1cae65631b953788506a92735472a4bb
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/Ringtoets.StabilityPointStructures.Integration.Test.csproj (.../Ringtoets.StabilityPointStructures.Integration.Test.csproj) (revision 4aca01a706f23d3ba928d2c5fd405681bc3ba55d)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/Ringtoets.StabilityPointStructures.Integration.Test.csproj (.../Ringtoets.StabilityPointStructures.Integration.Test.csproj) (revision c1fee53d1cae65631b953788506a92735472a4bb)
@@ -65,6 +65,10 @@
{11F1F874-45AF-43E4-8AE5-15A5C9593E28}
Ringtoets.Integration.Data
+
+ {174BA68D-6176-4AC5-8DFD-98CDD2C4D971}
+ Ringtoets.Integration.TestUtil
+
{3D4B9740-8348-4434-8D77-B611FC6EE57F}
Ringtoets.StabilityPointStructures.Data
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r6787ede2e334d4c01c9aab34ecf951a10a07c7c4 -rc1fee53d1cae65631b953788506a92735472a4bb
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision 6787ede2e334d4c01c9aab34ecf951a10a07c7c4)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision c1fee53d1cae65631b953788506a92735472a4bb)
@@ -30,14 +30,14 @@
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;
using Ringtoets.HydraRing.Calculation.Data.Input;
using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.Integration.Data;
+using Ringtoets.Integration.TestUtil;
using Ringtoets.StabilityPointStructures.Data;
using Ringtoets.StabilityPointStructures.Data.TestUtil;
using Ringtoets.StabilityPointStructures.Service;
@@ -99,10 +99,7 @@
var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
- using (var importer = new HydraulicBoundaryDatabaseImporter())
- {
- importer.Import(assessmentSection, validFilePath);
- }
+ DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath);
var failureMechanism = new StabilityPointStructuresFailureMechanism();
var calculation = new TestStabilityPointStructuresCalculation
@@ -165,10 +162,7 @@
var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
- using (var importer = new HydraulicBoundaryDatabaseImporter())
- {
- importer.Import(assessmentSection, validFilePath);
- }
+ DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath);
var failureMechanism = new StabilityPointStructuresFailureMechanism();
var calculation = new TestStabilityPointStructuresCalculation
@@ -213,10 +207,7 @@
var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
- using (var importer = new HydraulicBoundaryDatabaseImporter())
- {
- importer.Import(assessmentSection, validFilePath);
- }
+ DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath);
var failureMechanism = new StabilityPointStructuresFailureMechanism();
var calculation = new TestStabilityPointStructuresCalculation
@@ -273,10 +264,7 @@
var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
- using (var importer = new HydraulicBoundaryDatabaseImporter())
- {
- importer.Import(assessmentSection, validFilePath);
- }
+ DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath);
var failureMechanism = new StabilityPointStructuresFailureMechanism();
var calculation = new StructuresCalculation