Index: src/Deltares.Geotechnics.IO.Tests/SurfaceLinesImporterTest.cs =================================================================== diff -u -r14 -r54 --- src/Deltares.Geotechnics.IO.Tests/SurfaceLinesImporterTest.cs (.../SurfaceLinesImporterTest.cs) (revision 14) +++ src/Deltares.Geotechnics.IO.Tests/SurfaceLinesImporterTest.cs (.../SurfaceLinesImporterTest.cs) (revision 54) @@ -1,10 +1,8 @@ using System.IO; using System.Linq; using System.Text; -using Deltares.DeltaModel; using Deltares.Geometry; using Deltares.Geotechnics.IO.Importers; -using Deltares.Standard; using Deltares.Standard.Language; using Deltares.Standard.Logging; using NUnit.Framework; @@ -57,28 +55,19 @@ [Values(surfaceLinesFilename, "surfacelinesDAM.csv")] string fileName, [Values(false, true)] bool geometryMustContainPoint) { - var deltaModel = new DeltaModel.DeltaModel(); - var testDeltaModelFactory = new TestDeltaModelFactory(deltaModel, geometryMustContainPoint); + var surfaceLinesImporter = new SurfaceLinesImporter(); + var surfaceLines = surfaceLinesImporter.ReadSurfacesLines(Path.Combine(testDataFolder, fileName)); + Assert.AreEqual(32, surfaceLines.Count, "Read incorrect number of surface lines"); - var surfaceLinesImporter = new SurfaceLinesImporter - { - FileName = Path.Combine(testDataFolder, fileName), Factory = testDeltaModelFactory - }; - surfaceLinesImporter.Import(); - Assert.AreEqual(32, deltaModel.SurfaceLines.Count, "Read incorrect number of surface lines"); + var surfaceLine = surfaceLines.FirstOrDefault(x => x.Name.Equals("dijkring10_dwp36_9")); - var surfaceLineGeometry = deltaModel.SurfaceLines.FirstOrDefault(x => x.Name.Equals("dijkring10_dwp36_9")); - var surfaceLine = deltaModel.SchematizedSurfaceLines.FirstOrDefault(x => x.Name.Equals("dijkring10_dwp36_9")); - Assert.IsNotNull(surfaceLine); - Assert.IsNotNull(surfaceLineGeometry); Assert.AreEqual(geometryMustContainPoint, surfaceLine.CharacteristicPoints.GeometryMustContainPoint); - Assert.AreSame(surfaceLine.Geometry, surfaceLineGeometry); Assert.AreSame(surfaceLine.Geometry, surfaceLine.CharacteristicPoints.Geometry); - Assert.AreEqual(0.0, surfaceLineGeometry.Points[0].X, tolerance); - Assert.AreEqual(1.06, surfaceLineGeometry.Points[0].Z, tolerance); - Assert.AreEqual(100.0, surfaceLineGeometry.Points[30].X, tolerance); - Assert.AreEqual(-0.61, surfaceLineGeometry.Points[30].Z, tolerance); + Assert.AreEqual(0.0, surfaceLine.Geometry.Points[0].X, tolerance); + Assert.AreEqual(1.06, surfaceLine.Geometry.Points[0].Z, tolerance); + Assert.AreEqual(100.0, surfaceLine.Geometry.Points[30].X, tolerance); + Assert.AreEqual(-0.61, surfaceLine.Geometry.Points[30].Z, tolerance); } /// @@ -128,36 +117,8 @@ Assert.IsNotNull(surfacelines.FirstOrDefault(sl => sl.Name == "TheGoodOne")); Assert.IsNull(surfacelines.FirstOrDefault(sl => sl.Name == "TheBadOne")); } - + [Test] - public void ReadSurfacesLines_WithDeltaModelFactory_SurfaceLinesDontShowInDeltaModel() - { - var surfaceLinesImporter = new SurfaceLinesImporter(); - var deltaModel = new DeltaModel.DeltaModel(); - var deltaModelFactory = new DeltaModelFactory(deltaModel); - - surfaceLinesImporter.ReadSurfacesLines(Path.Combine(testDataFolder, "TheGoodAndTheBad_surfaceline.csv"), deltaModelFactory); - Assert.AreEqual(1, deltaModel.SurfaceLines.Count); - Assert.IsNotNull(deltaModel.SurfaceLines.FirstOrDefault(sl => sl.Name == "TheGoodOne")); - Assert.IsNull(deltaModel.SurfaceLines.FirstOrDefault(sl => sl.Name == "TheBadOne")); - } - - [Test] - public void ReadSurfacesLines_WithDeltaModelFactory_AddingCharacteristicPointsLocalizesPoint() - { - var surfaceLinesImporter = new SurfaceLinesImporter(); - var deltaModel = new DeltaModel.DeltaModel(); - var deltaModelFactory = new DeltaModelFactory(deltaModel); - - surfaceLinesImporter.ReadSurfacesLines(Path.Combine(testDataFolder, "TheGoodAndTheBad_surfaceline.csv"), deltaModelFactory); - Assert.AreEqual(1, deltaModel.SurfaceLines.Count); - var testSurfaceLine = deltaModel.SurfaceLines[0]; - CollectionAssert.IsNotEmpty(testSurfaceLine.Points); - - Assert.NotNull(testSurfaceLine.GetLocalPoint(new GeometryPoint(101.0, 0.0, 0.0))); - } - - [Test] public void SurfaceLine_Imp0rt_CheckIfCoordinateConverterHasBeenInitialized() { var surfaceLinesImporter = new SurfaceLinesImporter();