Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r6239 -r6240
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 6239)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 6240)
@@ -41,6 +41,24 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs
===================================================================
diff -u -r6239 -r6240
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs (.../DesignCalculatorTests.cs) (revision 6239)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs (.../DesignCalculatorTests.cs) (revision 6240)
@@ -22,7 +22,6 @@
using System.Globalization;
using System.IO;
using System.Threading;
-using Deltares.DamEngine.Io.XmlInput;
using Deltares.DamEngine.Io.XmlOutput;
using Deltares.DamEngine.TestHelpers;
using NUnit.Framework;
@@ -40,21 +39,9 @@
// Set Analysis type to "No Adaption"
// Set model to Piping Sellmeijer Revised (WBI)
// Select first location (100)
- // NOTE: The PipingVoorbeeld1 tests are now read from the file "InputPipingAll.xml"
- // The file is created with DAM UI project .\data\Tutorials\DAMDesign\Piping\PipingAll\PipingAll.damx
- // SVN rev.6179
- // The first location "Profiel 1" is used for the PipingVoorbeeld1 tests
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
- // const string fileName = @"TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedNoPipingInputFile.xml";
- // string inputString = File.ReadAllText(fileName);
- const string fileNamePipingAll = @"TestFiles\InputPipingAll.xml";
- const string pipingModelBligh = "Bligh";
- string inputString = File.ReadAllText(fileNamePipingAll);
- string[] locations = ["Profiel 1"];
- inputString = XmlAdapter.SelectLocations(inputString, locations);
- inputString = XmlAdapter.ChangeValueInXml(inputString, "PipingModelType", pipingModelBligh);
- inputString = XmlAdapter.ChangeValueInXml(inputString, "AnalysisType", "NoAdaption");
- inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability.ToString());
+ const string fileName = @"TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedNoPipingInputFile.xml";
+ string inputString = File.ReadAllText(fileName);
Output output = GeneralHelper.RunAfterInputValidation(inputString, false);