Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs
===================================================================
diff -u -r875 -r2135
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../branches/CalcualtionIncluded/src/Dam/Tests/CsvImporterTest.cs) (revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../trunk/src/Dam/Tests/CsvImporterTest.cs) (revision 2135)
@@ -1,15 +1,25 @@
-//-----------------------------------------------------------------------
-//
-// Copyright (c) 2010 Deltares. All rights reserved.
-//
-// B.S.T.I.M. The
-// tom.the@deltares.nl
-// 18-05-2010
-// Test of csv importer
-//-----------------------------------------------------------------------
-using Deltares.Geotechnics;
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
using Deltares.Geotechnics.SurfaceLines;
-using Deltares.Standard;
using Deltares.Standard.Logging;
namespace Deltares.Dam.Tests
@@ -234,10 +244,6 @@
Assert.AreEqual("ophoogmateriaalberm", dike.Locations[0].ShoulderEmbankmentMaterial);
Assert.AreEqual(0.31, dike.Locations[0].DampingFactorPL3);
Assert.AreEqual(0.41, dike.Locations[0].DampingFactorPL4);
- Assert.AreEqual(432.1, dike.Locations[0].SheetPilePoint.X);
- Assert.AreEqual(0.0, dike.Locations[0].SheetPilePoint.Y);
- Assert.AreEqual(654.3, dike.Locations[0].SheetPilePoint.Z);
- Assert.AreEqual(22.0, dike.Locations[0].SheetPileLength);
Assert.AreEqual(true, dike.Locations[0].IsUseOriginalPLLineAssignments, "dike.Locations[0].IsUseOriginalPLLineAssignments");
Assert.AreEqual(13, dike.SurfaceLines2[0].CharacteristicPoints.Count(cp => cp.CharacteristicPointType != CharacteristicPointType.None));
Assert.IsNotNull(dike.SurfaceLines2[0].CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide));
@@ -277,7 +283,6 @@
public void SegmentsOfImportedDikeHaveCorrectMostProbabableSoilProfile()
{
var waterBoard = ImportDirector.Construct(importFolder, null);
- var dike = waterBoard.Dikes[0];
Assert.AreEqual("1DP1", waterBoard.Segments[0].GetMostProbableProfile(FailureMechanismSystemType.StabilityInside).Name);
Assert.AreEqual("1DP2", waterBoard.Segments[0].GetMostProbableProfile(FailureMechanismSystemType.Piping).Name);
}
@@ -305,30 +310,6 @@
Assert.IsNotNull(dike);
}
- [Test]
- public void CanImportDetrimentFactorForLocation()
- {
- File.Delete(importFolder + "\\locations.csv");
- using (var writer = File.CreateText(importFolder + "\\locations.csv"))
- {
- writer.WriteLine("location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;head_pl2;head_pl3;grass_quality;direction;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;detrimentfactor");
- writer.WriteLine("LOC1;D1;1;414.950;91.850;14.0;PL1A;0.1;4.0;3.0;4.3;1.0;ophoogmateriaaldijk;ophoogmateriaalberm;0.31;0.41;432.1;0.0;654.3;22.0;true;1.275");
- }
-
- var dike = ImportDirector.Construct(importFolder, null);
-
- Assert.AreEqual(1.275, dike.Locations[0].DetrimentFactor,0.001);
- }
-
- [Test]
- public void TestDefaultValueDetrimentFactorForLocation()
- {
- var waterBoard = ImportDirector.Construct(importFolder, null);
- var dike = waterBoard.Dikes[0];
-
- Assert.AreEqual(0.95, dike.Locations[0].DetrimentFactor);
- }
-
[TestFixtureTearDown]
public void FixtureTearDown()
{