Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs =================================================================== diff -u -r4185 -r4231 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4185) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4231) @@ -63,7 +63,6 @@ [TestCase("OperationalBishopGrid18Cores.xml")] public void OperationalBishopGridTestsWithXmlInputFile(string aFileName) { - //const string inputFilename = "InputForDebugging.xml"; // or put your own name here; string fullInputFilename = Path.Combine(mapTestFiles, aFileName); Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; string inputString = File.ReadAllText(fullInputFilename); @@ -175,7 +174,7 @@ List series = engineInterface.DamProjectData.OutputTimeSerieCollection.Series; int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.AreEqual(0, errorCount, "There should be nor errors during the calculation."); + Assert.AreEqual(0, errorCount, "There should be no errors during the calculation."); var seriesCount = 0; var resultsCount = 0; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs =================================================================== diff -u -r4052 -r4231 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs (.../PipingSellmeijerVnkTests.cs) (revision 4052) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs (.../PipingSellmeijerVnkTests.cs) (revision 4231) @@ -36,6 +36,21 @@ public class PipingSellmeijerVnkTests { private const double tolerance = 0.0005; + private const string workingDir = @"TestFiles\"; + private string oldWorkingDir; + + [SetUp] + public void TestFixtureSetup() + { + oldWorkingDir = Directory.GetCurrentDirectory(); + Directory.SetCurrentDirectory(workingDir); + } + + [TearDown] + public void TestFixtureTearDown() + { + Directory.SetCurrentDirectory(oldWorkingDir); + } /// Test for different segmentFailureMechanismType /// The soilprobabilities are set tot the specified segmentFailureMechanismType Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs =================================================================== diff -u -r4052 -r4231 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs (.../PipingSellmeijer4ForcesTests.cs) (revision 4052) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs (.../PipingSellmeijer4ForcesTests.cs) (revision 4231) @@ -35,7 +35,22 @@ public class PipingSellmeijer4ForcesTests { private const double tolerance = 0.0005; - + private const string workingDir = @"TestFiles\"; + private string oldWorkingDir; + + [SetUp] + public void TestFixtureSetup() + { + oldWorkingDir = Directory.GetCurrentDirectory(); + Directory.SetCurrentDirectory(workingDir); + } + + [TearDown] + public void TestFixtureTearDown() + { + Directory.SetCurrentDirectory(oldWorkingDir); + } + /// Test for different segmentFailureMechanismType /// The soilprobabilities are set tot the specified segmentFailureMechanismType [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs =================================================================== diff -u -r4052 -r4231 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs (.../OperationalGrebbedijkTests.cs) (revision 4052) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs (.../OperationalGrebbedijkTests.cs) (revision 4231) @@ -40,23 +40,35 @@ class OperationalGrebbedijkTests { private const double tolerance = 0.0005; + private const string workingDir = @"TestFiles\"; + private string oldWorkingDir; + + [SetUp] + public void TestFixtureSetup() + { + oldWorkingDir = Directory.GetCurrentDirectory(); + Directory.SetCurrentDirectory(workingDir); + } + + [TearDown] + public void TestFixtureTearDown() + { + Directory.SetCurrentDirectory(oldWorkingDir); + } [Test] [Ignore("#Bka: this is a Bishop test. So as soon as that model is implemented it must be activated and made to work again.")] [Category("Work_In_Progress")] public void Run_UsingTestFiles_HasExpectedResultsInOutputFile() { const string calcDir = "TestOperationalGrebbedijk"; - const string workingDir = @"TestFiles\"; 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 - Directory.SetCurrentDirectory(workingDir); // Based on "DamLive\trunk\src\Deltares.DamLive.Tests\TestData\DamLive\Set2\\output.damx" const string inputFileName = baseTestDirectory + @"GrebbedijkStability.xml"; const string outputFileName = baseTestDirectory + @"GrebbedijkStability.output.xml"; @@ -100,7 +112,7 @@ public void Run_UsingTestFiles_ButWithUnsupportedPipingModelFails(PipingModelType pipingModel) { const string calcDir = "TestOperationalGrebbedijk"; - const string workingDir = @".\"; + const string localWorkingDir = @".\"; const string baseTestDirectory = @".\"; if (Directory.Exists(calcDir)) { @@ -109,7 +121,8 @@ Directory.CreateDirectory(calcDir); // Switch to TestFiles directory to check if DamLive can also run from another directory - Directory.SetCurrentDirectory(workingDir); + string oldLocalWorkingDir = Directory.GetCurrentDirectory(); + Directory.SetCurrentDirectory(localWorkingDir); // Based on "DamLive\trunk\src\Deltares.DamLive.Tests\TestData\DamLive\Set2\\output.damx" const string inputFileName = baseTestDirectory + @"GrebbedijkStability.xml"; string inputString = File.ReadAllText(inputFileName); @@ -122,22 +135,20 @@ engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.Piping; engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType = pipingModel; Assert.That(() => engineInterface.Run(), Throws.TypeOf(typeof(NotImplementedException)).With.Message.EqualTo("The method or operation is not implemented.")); + Directory.SetCurrentDirectory(oldLocalWorkingDir); } [TestCase(PipingModelType.Wti2017)] public void Run_UsingTestFiles_ButWithSupportedPipingModelFailsBecauseNoRelevantSegments(PipingModelType pipingModel) { const string calcDir = "TestOperationalGrebbedijk"; - const string workingDir = @"TestFiles\"; 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 - Directory.SetCurrentDirectory(workingDir); // Based on "DamLive\trunk\src\Deltares.DamLive.Tests\TestData\DamLive\Set2\\output.damx" const string inputFileName = baseTestDirectory + @"GrebbedijkStability.xml"; string inputString = File.ReadAllText(inputFileName); Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs =================================================================== diff -u -r4052 -r4231 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 4052) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 4231) @@ -38,7 +38,22 @@ private const double tolerance = 0.0005; private const double novalue = -999.0; private const string stabilityOutsideFactor = "StabilityOutsideFactor"; - + private const string workingDir = @"TestFiles\"; + private string oldWorkingDir; + + [SetUp] + public void TestFixtureSetup() + { + oldWorkingDir = Directory.GetCurrentDirectory(); + Directory.SetCurrentDirectory(workingDir); + } + + [TearDown] + public void TestFixtureTearDown() + { + Directory.SetCurrentDirectory(oldWorkingDir); + } + [Test] [Ignore("")] [Category(Categories.WorkInProgress)] @@ -47,16 +62,13 @@ public void Run_UsingTestFiles_HasExpectedResultsInOutputFile(string inputTestcaseFilename, double valueEntry1, double valueEntry2) { const string calcDir = "TestOperationalPulauTekong"; - const string workingDir = @"TestFiles\"; const string baseTestDirectory = @".\Operational\PulauTekong\"; 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 - Directory.SetCurrentDirectory(workingDir); // Based on "Deltares.DamLive.Tests.PulauTekongTest" string inputFileName = baseTestDirectory + inputTestcaseFilename; const string outputFileName = baseTestDirectory + @"PulauTekong.OutputFile.xml"; @@ -106,7 +118,7 @@ Directory.CreateDirectory(calcDir); - const string baseTestDirectory = @".\TestFiles\Operational\PulauTekong\"; + const string baseTestDirectory = @".\Operational\PulauTekong\"; string inputFileName = baseTestDirectory + @"PulauTekong.InputFile.xml"; string inputString = File.ReadAllText(inputFileName); inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs =================================================================== diff -u -r4052 -r4231 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs (.../OperationalIntegrationTests.cs) (revision 4052) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs (.../OperationalIntegrationTests.cs) (revision 4231) @@ -97,7 +97,7 @@ Directory.CreateDirectory(calcDir); - const string inputFileName = @"OperationalSet2.xml"; + const string inputFileName = @"TestFiles\OperationalSet2.xml"; string inputString = File.ReadAllText(inputFileName); inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs =================================================================== diff -u -r4230 -r4231 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 4230) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 4231) @@ -53,6 +53,7 @@ { Directory.SetCurrentDirectory(oldWorkingDir); } + /// Test for different segmentFailureMechanismType /// The soilprobabilities are set tot the specified segmentFailureMechanismType [Test]