Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
===================================================================
diff -u -r4373 -r4381
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs (.../OperationalGrebbedijkTests.cs) (revision 4373)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs (.../OperationalGrebbedijkTests.cs) (revision 4381)
@@ -106,42 +106,6 @@
Assert.AreEqual(2.326, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[1].Value, tolerance);
}
- [TestCase(1)]
- [TestCase(2)]
- public void Run_UsingTestFiles_ButWithUnsupportedPipingModelFails(int oldPipingModel)
- {
- // testcase 1 = old model PipingModelType.Sellmeijer4Forces
- // testcase 2 = old model PipingModelType.SellmeijerVnk
- const string calcDir = "TestOperationalGrebbedijk";
- const string localWorkingDir = @".\";
- const string baseTestDirectory = @".\";
- if (Directory.Exists(calcDir))
- {
- Directory.Delete(calcDir, true); // delete previous results
- }
-
- Directory.CreateDirectory(calcDir);
- // Switch to TestFiles directory to check if DamLive can also run from another directory
- string oldLocalWorkingDir = Directory.GetCurrentDirectory();
- try
- {
- Directory.SetCurrentDirectory(localWorkingDir);
- // Based on "DamLive\trunk\src\Deltares.DamLive.Tests\TestData\DamLive\Set2\\output.damx", assume 4Forces
- string inputFileName = baseTestDirectory + @"GrebbedijkStability4Forces.xml";
- if (oldPipingModel == 2)
- {
- inputFileName = baseTestDirectory + @"GrebbedijkStabilityVNK.xml";
- }
- string inputString = File.ReadAllText(inputFileName);
- Assert.That(() => new EngineInterface(inputString),
- Throws.TypeOf(typeof(NotImplementedException)).With.Message.EqualTo("The method or operation is not implemented."));
- }
- finally
- {
- Directory.SetCurrentDirectory(oldLocalWorkingDir);
- }
- }
-
[TestCase(PipingModelType.Wti2017)]
[TestCase(PipingModelType.Bligh)]
public void Run_UsingTestFiles_ButWithSupportedPipingModelFailsBecauseNoRelevantSegments(PipingModelType pipingModel)
Index: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/TestFiles/GrebbedijkStability4Forces.xml
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/TestFiles/GrebbedijkStability4Forces.xml (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/TestFiles/GrebbedijkStability4Forces.xml (revision 4381)
@@ -0,0 +1,361 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/DamXmlSerializationTests.cs
===================================================================
diff -u -r4052 -r4381
--- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/DamXmlSerializationTests.cs (.../DamXmlSerializationTests.cs) (revision 4052)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/DamXmlSerializationTests.cs (.../DamXmlSerializationTests.cs) (revision 4381)
@@ -19,6 +19,9 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System;
+using System.IO;
+using Deltares.DamEngine.Interface;
using Deltares.DamEngine.Io.XmlInput;
using Deltares.DamEngine.Io.XmlOutput;
using KellermanSoftware.CompareNetObjects;
@@ -54,7 +57,42 @@
Output destinationOutput = DamXmlSerialization.LoadOutputFromXmlFile(filename);
CompareOutput(sourceOutput, destinationOutput);
}
+
+ [TestCase(1)]
+ [TestCase(2)]
+ public void Run_UsingTestFiles_ButWithUnsupportedPipingModelFails(int oldPipingModel)
+ {
+ // testcase 1 = old model PipingModelType.Sellmeijer4Forces
+ // testcase 2 = old model PipingModelType.SellmeijerVnk
+ const string calcDir = "TestOperationalGrebbedijk";
+ const string localWorkingDir = @".\";
+ const string baseTestDirectory = @".\";
+ if (Directory.Exists(calcDir))
+ {
+ Directory.Delete(calcDir, true); // delete previous results
+ }
+ Directory.CreateDirectory(calcDir);
+ // Switch to TestFiles directory to check if DamLive can also run from another directory
+ string oldLocalWorkingDir = Directory.GetCurrentDirectory();
+ try
+ {
+ Directory.SetCurrentDirectory(localWorkingDir);
+ // Based on "DamLive\trunk\src\Deltares.DamLive.Tests\TestData\DamLive\Set2\\output.damx", assume 4Forces
+ string inputFileName = baseTestDirectory + @"\TestFiles\GrebbedijkStability4Forces.xml";
+ if (oldPipingModel == 2)
+ {
+ inputFileName = baseTestDirectory + @"\TestFiles\GrebbedijkStabilityVNK.xml";
+ }
+ string inputString = File.ReadAllText(inputFileName);
+ Assert.That(() => new EngineInterface(inputString),
+ Throws.TypeOf(typeof(NotImplementedException)).With.Message.EqualTo("The method or operation is not implemented."));
+ }
+ finally
+ {
+ Directory.SetCurrentDirectory(oldLocalWorkingDir);
+ }
+ }
private Input CreatePopulatedInput()
{
var input = new Input();
Fisheye: Tag 4381 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/GrebbedijkStabilityVNK.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r4374 -r4381
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 4374)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 4381)
@@ -327,12 +327,6 @@
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
Index: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/TestFiles/GrebbedijkStabilityVNK.xml
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/TestFiles/GrebbedijkStabilityVNK.xml (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/TestFiles/GrebbedijkStabilityVNK.xml (revision 4381)
@@ -0,0 +1,361 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj
===================================================================
diff -u -r4185 -r4381
--- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj (.../Deltares.DamEngine.Io.Tests.csproj) (revision 4185)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj (.../Deltares.DamEngine.Io.Tests.csproj) (revision 4381)
@@ -1,18 +1,27 @@
-
+
-
+
-
-
+
+
-
+
+
3.9.0
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
Fisheye: Tag 4381 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/GrebbedijkStability4Forces.xml'.
Fisheye: No comparison available. Pass `N' to diff?