Fisheye: Tag 5640 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs =================================================================== diff -u -r4624 -r5640 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalMultiCoreTests.cs) (revision 5640) @@ -31,11 +31,8 @@ /// These tests were based on DamLiveIntegrationTest.Run_UsingTestFiles_HasExpectedResultsInOutputFile() /// [TestFixture] -class OperationalPulauTekongTests +class OperationalMultiCoreTests { - 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; @@ -52,37 +49,6 @@ Directory.SetCurrentDirectory(oldWorkingDir); } - [Test, Ignore("This test is not yet implemented, waits on stix implementation.")] - [Category(Categories.WorkInProgress)] - [TestCase(@"PulauTekong.InputFile.xml", 2.486106, 2.114159, true)] - [TestCase(@"PulauTekong.InputFile-NoValues.xml", novalue, novalue, false)] - public void Run_UsingTestFiles_HasExpectedResultsInOutputFile(string inputTestcaseFilename, double valueEntry1, double valueEntry2, bool areResultsExpected) - { - const string calcDir = "TestOperationalPulauTekong"; - const string baseTestDirectory = @".\Operational\PulauTekong\"; - if (Directory.Exists(calcDir)) - { - Directory.Delete(calcDir, true); // delete previous results - } - - Directory.CreateDirectory(calcDir); - // Based on "Deltares.DamLive.Tests.PulauTekongTest" - string inputFileName = baseTestDirectory + inputTestcaseFilename; - const string outputFileName = baseTestDirectory + @"PulauTekong.OutputFile.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 - inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", baseTestDirectory + @"PulauTekong.geometries2D.0\"); - inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", baseTestDirectory + @"PulauTekong0.soilmaterials.mdb"); - - Output output = GeneralHelper.RunAfterInputValidation(inputString, areResultsExpected, outputFileName); - - Assert.That(output.Results.OperationalOutputTimeSeries[0].ParameterId, Is.EqualTo(stabilityOutsideFactor)); - Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(valueEntry1).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[1].ParameterId, Is.EqualTo(stabilityOutsideFactor)); - Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(valueEntry2).Within(tolerance)); - } - [Test, Category(Categories.MultiCore), Ignore("This test is not yet implemented, waits on stix implementation.")] [Category(Categories.WorkInProgress)] // This test runs the same project as Run_UsingTestFiles_HasExpectedResultsInOutputFile @@ -112,7 +78,7 @@ Directory.CreateDirectory(calcDir); - const string baseTestDirectory = @".\Operational\PulauTekong\"; + const string baseTestDirectory = @".\Operational\PulauTekongMultiCore\"; string inputFileName = baseTestDirectory + @"PulauTekong.InputFile.xml"; string inputString = File.ReadAllText(inputFileName); inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used Fisheye: Tag 5640 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong/PulauTekong.geometries2D.0/CD CS2 X3.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5640 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong/PulauTekong.geometries2D.0/SD CS3 10-10.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5640 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong/PulauTekong.InputFile.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong/PulauTekong0.soilmaterials.mdb =================================================================== diff -u -r1809 -r5640 Binary files differ Fisheye: Tag 5640 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong/PulauTekong.geometries2D.0/CD CS1 X1.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5640 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong/PulauTekong.geometries2D.0/SD CS1 3-3.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5640 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong/PulauTekong.geometries2D.0/SD CS2 8-8.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5640 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong/PulauTekong.InputFile-NoValues.xml'. Fisheye: No comparison available. Pass `N' to diff?