Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs =================================================================== diff -u -r6823 -r6873 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 6823) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 6873) @@ -59,17 +59,15 @@ [Category("Slow")] public void CanImportDikeData() { - string dikeRingId = dataPluginImporter.GetDikeRingIdList(); - dataPluginImporter.ImportDataForDikeRings(null); + dataPluginImporter.ImportDataForDike(null); Info dikeInfo = dataPluginImporter.GetDikeRingInfo(); Assert.That(dikeInfo.Name, Is.EqualTo("dijkring10")); } [Test] public void CanRetrieveLocationData() { - string dikeRingId = dataPluginImporter.GetDikeRingIdList(); - dataPluginImporter.ImportDataForDikeRings(null); + dataPluginImporter.ImportDataForDike(null); IEnumerable locationIdList = dataPluginImporter.GetLocationIdList(); Assert.That(locationIdList.Count(), Is.EqualTo(24)); @@ -88,8 +86,7 @@ [Test] public void CanRetrieveSegmentData() { - string dikeRingId = dataPluginImporter.GetDikeRingIdList(); - dataPluginImporter.ImportDataForDikeRings(null); + dataPluginImporter.ImportDataForDike(null); IEnumerable segmentIdList = dataPluginImporter.GetSegmentIdList(); Assert.That(segmentIdList.Count(), Is.EqualTo(24)); @@ -114,7 +111,7 @@ const double cToleranceCoordinate = 0.001; // Check if surfacelines available - dataPluginImporter.ImportDataForDikeRings(null); + dataPluginImporter.ImportDataForDike(null); IEnumerable surfaceLineIdList = dataPluginImporter.GetSurfaceLineIdList(); Assert.That(surfaceLineIdList.Count(), Is.EqualTo(13)); @@ -150,7 +147,7 @@ const double cToleranceCoordinate = 0.001; // Check if soilprofiles available - dataPluginImporter.ImportDataForDikeRings(null); + dataPluginImporter.ImportDataForDike(null); IEnumerable soilProfile1DIdList = dataPluginImporter.GetSoilProfile1DIdList(); Assert.That(soilProfile1DIdList.Count(), Is.EqualTo(26)); @@ -171,7 +168,7 @@ { const double cToleranceDimension = 0.001; - dataPluginImporter.ImportDataForDikeRings(null); + dataPluginImporter.ImportDataForDike(null); List scenarioList = dataPluginImporter.GetScenarioList(location18_6Id).ToList(); Assert.That(scenarioList.Count(), Is.EqualTo(1));