Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExportSurfaceLineTest.cs =================================================================== diff -u -r4047 -r4070 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExportSurfaceLineTest.cs (.../CsvExportSurfaceLineTest.cs) (revision 4047) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExportSurfaceLineTest.cs (.../CsvExportSurfaceLineTest.cs) (revision 4070) @@ -19,14 +19,14 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Deltares.Dam.Data.CsvImporters; -using Deltares.Geotechnics.GeotechnicalGeometry; using System.Collections.Generic; using System.IO; -using NUnit.Framework; using Deltares.Dam.Data; +using Deltares.Dam.Data.CsvImporters; using Deltares.Dam.TestHelper.TestUtils; +using Deltares.Geotechnics.GeotechnicalGeometry; using Deltares.Geotechnics.SurfaceLines; +using NUnit.Framework; namespace Deltares.Dam.Tests { @@ -43,7 +43,9 @@ fileNameSurfaceLines = importFolder + "\\ExportSurfaceLine.csv"; if (!Directory.Exists(importFolder)) + { Directory.CreateDirectory(importFolder); + } } [Test] @@ -52,7 +54,7 @@ // Write surfaceline using (SurfaceLine2 orgSurfaceLine = FactoryForSurfaceLineTests.CreateSurfaceLineTutorial1()) { - string orgSurfaceLineString = orgSurfaceLine.ToString(); + var orgSurfaceLineString = orgSurfaceLine.ToString(); var csvExportSurfaceLineIdentifiers = new CsvExportSurfaceLineIdentifiers { LocationId = "Tutorial1", @@ -62,34 +64,43 @@ CalculationModel = "Model" }; var csvExportSurfaceLine = new CsvExportSurfaceLine(csvExportSurfaceLineIdentifiers, orgSurfaceLine); - var creator = new CsvExporter(fileNameSurfaceLines, new List { csvExportSurfaceLine }) + var creator = new CsvExporter(fileNameSurfaceLines, new List { + csvExportSurfaceLine + }) + { WriteHeaderInFirstLine = true }; creator.WriteFile(); // Read surfacelines var csvImporterSurfaceLines = new CsvImporterSurfaceLines(fileNameSurfaceLines); - foreach (var surfaceLineRecord in csvImporterSurfaceLines.ImportedItems) + foreach (CsvImporterSurfaceLines.SurfaceLineRecord surfaceLineRecord in csvImporterSurfaceLines.ImportedItems) { using (var surfaceLine = new SurfaceLine2 + { + Name = "SL1", + Geometry = new LocalizedGeometryPointString(), + CharacteristicPoints = + { + GeometryMustContainPoint = true + } + }) { - Name = "SL1", - Geometry = new LocalizedGeometryPointString(), - CharacteristicPoints = { GeometryMustContainPoint = true } - }) - { - for (int i = 0; i < surfaceLineRecord.Xcoors.Count; i++) + for (var i = 0; i < surfaceLineRecord.Xcoors.Count; i++) { // empty points will not be added if (surfaceLineRecord.Xcoors[i] != -1 || surfaceLineRecord.Ycoors[i] != -1 || surfaceLineRecord.Zcoors[i] != -1) + { surfaceLine.EnsurePointOfType(surfaceLineRecord.Xcoors[i], surfaceLineRecord.Ycoors[i], surfaceLineRecord.Zcoors[i], null); + } } + surfaceLine.Name = surfaceLineRecord.SurfaceLineId; Assert.AreEqual(orgSurfaceLineString, surfaceLine.ToString()); } } } } } -} +} \ No newline at end of file