Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/OperationalTests.cs
===================================================================
diff -u -r1631 -r1635
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/OperationalTests.cs (.../OperationalTests.cs) (revision 1631)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/OperationalTests.cs (.../OperationalTests.cs) (revision 1635)
@@ -22,6 +22,7 @@
using System.IO;
using Deltares.DamEngine.Data.General;
using Deltares.DamEngine.Io;
+using Deltares.DamEngine.TestHelpers;
using NUnit.Framework;
namespace Deltares.DamEngine.Interface.Tests
@@ -36,9 +37,21 @@
[Test, Ignore("Work_In_Progress")]
public void Run_UsingTestFiles_HasExpectedResultsInOutputFile()
{
+ const string calcDir = "TestOperational";
+ if (Directory.Exists(calcDir))
+ {
+ Directory.Delete(calcDir, true); // delete previous results
+ }
+
+ Directory.CreateDirectory(calcDir);
+
// Based on "DamLive\trunk\src\Deltares.DamLive.Tests\TestData\DamLive\Set2\\output.damx"
const string fileName = @"TestFiles\OperationalSet2.xml";
string inputString = File.ReadAllText(fileName);
+ inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
+ inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
+ inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\output.Geometries\");
+ inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\output0.soilmaterials.mdb");
EngineInterface engineInterface = new EngineInterface(inputString);
Assert.IsNotNull(engineInterface.DamProjectData);
string outputString = engineInterface.Run();
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml
===================================================================
diff -u -r1631 -r1635
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml (.../OperationalSet2.xml) (revision 1631)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml (.../OperationalSet2.xml) (revision 1635)
@@ -1,28 +1,28 @@
-
+
-
+
-
+
-
+
@@ -192,59 +192,120 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+