Fisheye: Tag 5947 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamLiveTest.cmd'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/ModelRunnerTest.cs =================================================================== diff -u -r5914 -r5947 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/ModelRunnerTest.cs (.../ModelRunnerTest.cs) (revision 5914) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/ModelRunnerTest.cs (.../ModelRunnerTest.cs) (revision 5947) @@ -146,8 +146,8 @@ #region Test Setup - const string TestWorkingFolder = "LiveDikeTestWorkingFolder"; - private const string TestDataFolder = @"TestData\DamLive\Set1"; + private const string testWorkingFolder = "LiveDikeTestWorkingFolder"; + private const string testDataFolder = @"TestData\IntegrationTests\StabilityInsideBishopGrid"; private string inputFile; private string outputFile; @@ -159,13 +159,13 @@ [SetUp] public void SetupFixture() { - paramFile = Path.Combine(TestDataFolder, "Deltares.Dam.Application.Live.Tests.ParametersFile.xml"); - inputFile = Path.Combine(TestDataFolder, "Deltares.Dam.Application.Live.Tests.InputFile.xml"); - outputFile = Path.Combine(TestDataFolder, "Deltares.Dam.Application.Live.Tests.OutputFile.xml"); - projectFile = Path.Combine(TestDataFolder, "Deltares.Dam.Application.Live.Tests.ProjectFile.damx"); + paramFile = Path.Combine(testDataFolder, "live.ParametersFile.xml"); + inputFile = Path.Combine(testDataFolder, "live.InputTimeSeriesMHW.xml"); + outputFile = Path.Combine(testDataFolder, "live.OutputTimeSeriesMHW.xml"); + projectFile = Path.Combine(testDataFolder, "DAMLive.damx"); RemoveTestWorkingDirectory(); // to be sure no test directory exist from previous tests - Directory.CreateDirectory(TestWorkingFolder); + Directory.CreateDirectory(testWorkingFolder); } [TearDown] @@ -187,7 +187,7 @@ // create a random unique test directory name in the // test working folder string actualTestPath = Guid.NewGuid().ToString().Replace("-", ""); - actualTestPath = Path.Combine(TestWorkingFolder, actualTestPath); + actualTestPath = Path.Combine(testWorkingFolder, actualTestPath); damProjectData = new DamProjectData(); DamProject.SetTestProgramVersion("19.1"); runner = new ModelRunner @@ -220,10 +220,10 @@ /// private static void RemoveTestWorkingDirectory() { - if (Directory.Exists(TestWorkingFolder)) + if (Directory.Exists(testWorkingFolder)) { const bool recursive = true; - Directory.Delete(TestWorkingFolder, recursive); + Directory.Delete(testWorkingFolder, recursive); } } Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj =================================================================== diff -u -r5902 -r5947 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj (.../Deltares.DamLive.Tests.csproj) (revision 5902) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj (.../Deltares.DamLive.Tests.csproj) (revision 5947) @@ -26,21 +26,18 @@ - - PreserveNewest + + PreserveNewest - - PreserveNewest + + PreserveNewest - - PreserveNewest + + PreserveNewest - - PreserveNewest + + PreserveNewest - - PreserveNewest - Fisheye: Tag 5947 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/DamLive/Set1/Deltares.Dam.Application.Live.Tests.InputFile.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5947 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/DamLive/Set1/Deltares.Dam.Application.Live.Tests.OutputFile.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5947 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/DamLive/Set1/Deltares.Dam.Application.Live.Tests.ParametersFile.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/DamLive/Set1/Deltares.Dam.Application.Live.Tests.Soilmaterials.mdb =================================================================== diff -u -r1549 -r5947 Binary files differ Fisheye: Tag 5947 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/DamLive/Set1/Deltares.Dam.Application.Live.Tests.ProjectFile.damx'. Fisheye: No comparison available. Pass `N' to diff?