Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs =================================================================== diff -u -r5459 -r5609 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 5459) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 5609) @@ -39,12 +39,12 @@ public class StabilityInsideUpliftVanBeeSwarmTest { - const string projectIntegrationFilename = @"DAMLive.damx"; - const string input1AFilename = @"live.InputTimeSeriesMHW.xml"; - const string output1AFilename = @"live.OutputTimeSeriesMHW.xml"; - const string calculationParametersIntegrationFilename = @"live.ParametersFile.xml"; + private const string projectIntegrationFilename = @"DAMLive.damx"; + private const string input1AFilename = @"live.InputTimeSeriesMHW.xml"; + private const string output1AFilename = @"live.OutputTimeSeriesMHW.xml"; + private const string calculationParametersIntegrationFilename = @"live.ParametersFile.xml"; - const string testWorkingFolder = @".\damLiveUpliftVanBeeSwarmWork"; + private const string testWorkingFolder = @".\damLiveUpliftVanBeeSwarmWork"; private const string testIntegrationDataFolder = @"..\..\TestData\IntegrationTests\StabilityInsideUpliftVanBeeSwarm"; private List locations; @@ -53,8 +53,8 @@ [SetUp] public void SetupFixture() { - //IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMinCores); // to be sure no test directory exist from previous tests - //IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores); + IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMinCores); // to be sure no test directory exist from previous tests + IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores); } [TearDown] @@ -74,7 +74,7 @@ public void CalculateStabilityInsideUpliftVanBeeSwarmUsingTestFilesHasExpectedResultsInOutputFile(int maxCores) { const double cTolerance = 0.0005; - string testFileName = "CalculateStabilityInsideUpliftVanBeeSwarm"+ maxCores; + string testFileName = "CalculateStabilityInsideUpliftVanBeeSwarm" + maxCores; var generalHelper = new GeneralHelper(); generalHelper.SetupIntegrationProject(maxCores, testWorkingFolder, testIntegrationDataFolder, input1AFilename, output1AFilename, testFileName, calculationParametersIntegrationFilename, @@ -108,84 +108,88 @@ // StabilityInside check if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString()) { - if (timeSeries.LocationId == "Purmer_PU0042+00_K") + Assert.Multiple(() => { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.451).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.592).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } + if (timeSeries.LocationId == "Purmer_PU0042+00_K") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.451).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.592).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } - if (timeSeries.LocationId == "Purmer_PU0042+00_K_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.351).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.490).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } + if (timeSeries.LocationId == "Purmer_PU0042+00_K_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.351).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.490).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } - if (timeSeries.LocationId == "Purmer_PU0042+00_R") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.242).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.365).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - if (timeSeries.LocationId == "Purmer_PU0042+00_R_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.161).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.279).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0110+20_K") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0110+20_K_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0110+20_R") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } + if (timeSeries.LocationId == "Purmer_PU0042+00_R") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.242).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.365).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } - if (timeSeries.LocationId == "Purmer_PU0110+20_R_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } + if (timeSeries.LocationId == "Purmer_PU0042+00_R_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.161).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.279).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_K") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_K_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_R") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_R_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + }); } seriesCount++; @@ -194,7 +198,7 @@ Assert.That(seriesCount > 0, Is.True, "No output time series"); Assert.That(resultsCount, Is.EqualTo(16), "Incorrect number of results"); } - + [Category("Integration")] [TestCase(10)] [TestCase(24)] @@ -204,30 +208,30 @@ string fullInputFilename = Path.Combine(testIntegrationDataFolder, inputFilename); Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; string inputString = File.ReadAllText(fullInputFilename); - string testName = "InputForDebuggingBeeSwarm"+ maxCores + " .xml"; + string testName = "InputForDebuggingBeeSwarm" + maxCores + " .xml"; //testName = Path.Combine(testIntegrationDataFolder, testName); - + var engineInterface = new EngineInterface(inputString); Assert.That(engineInterface.DamProjectData, Is.Not.Null); engineInterface.DamProjectData.MaxCalculationCores = maxCores; - engineInterface.DamProjectData.ProjectPath = testWorkingFolder + maxCores; + engineInterface.DamProjectData.ProjectPath = testWorkingFolder + maxCores; Input input = DamXmlSerialization.LoadInputFromXmlString(inputString); DamXmlSerialization.SaveInputAsXmlFile(testName, input); string result = engineInterface.Validate(); Assert.That(result == null, Is.True, "Validation must succeed but does not, see output xml in debugger"); string outputString = engineInterface.Run(); string outputName = "Output" + maxCores + ".xml"; File.WriteAllText(outputName, outputString); - List series = engineInterface.DamProjectData.OutputTimeSerieCollection.Series; - + 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."); - + var seriesCount = 0; var resultsCount = 0; const double cTolerance = 0.0005; - - foreach (Deltares.DamEngine.Data.General.TimeSeries.TimeSerie timeSeries in series) + + foreach (DamEngine.Data.General.TimeSeries.TimeSerie timeSeries in series) { //Assert.IsTrue(validParameterIDs.Any(n => n == timeSeries.ParameterId)); //Assert.IsTrue(locations.Any(l => l.Name == timeSeries.LocationId)); @@ -263,6 +267,7 @@ Assert.That(lastEntry.Value, Is.EqualTo(1.365).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } + if (timeSeries.LocationId == "Purmer_PU0042+00_R_V") { DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First(); @@ -272,7 +277,7 @@ Assert.That(lastEntry.Value, Is.EqualTo(1.279).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } - + if (timeSeries.LocationId == "Purmer_PU0110+20_K") { DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First(); @@ -282,7 +287,7 @@ Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } - + if (timeSeries.LocationId == "Purmer_PU0110+20_K_V") { DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First(); @@ -292,7 +297,7 @@ Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } - + if (timeSeries.LocationId == "Purmer_PU0110+20_R") { DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First(); @@ -319,7 +324,5 @@ Assert.That(seriesCount > 0, Is.True, "No output time series"); Assert.That(resultsCount, Is.EqualTo(16), "Incorrect number of results"); - } - } \ No newline at end of file Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs =================================================================== diff -u -r4943 -r5609 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 4943) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 5609) @@ -34,12 +34,12 @@ [Category("Integration")] public class StabilityInsideBishopGridTest { - const string projectIntegrationFilename = @"DAMLive.damx"; - const string input1AFilename = @"live.InputTimeSeriesMHW.xml"; - const string output1AFilename = @"live.OutputTimeSeriesMHW.xml"; - const string calculationParametersIntegrationFilename = @"live.ParametersFile.xml"; + private const string projectIntegrationFilename = @"DAMLive.damx"; + private const string input1AFilename = @"live.InputTimeSeriesMHW.xml"; + private const string output1AFilename = @"live.OutputTimeSeriesMHW.xml"; + private const string calculationParametersIntegrationFilename = @"live.ParametersFile.xml"; - const string testWorkingFolder = @".\damLiveBishopGridWork"; + private const string testWorkingFolder = @".\damLiveBishopGridWork"; private const string testIntegrationDataFolder = @"..\..\TestData\IntegrationTests\StabilityInsideBishopGrid"; private List locations; @@ -52,16 +52,16 @@ IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores); } + [SetUp] + public void SetupTest() {} + [TearDown] public void TearDownFixture() { IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMinCores); IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores); } - [SetUp] - public void SetupTest() {} - [Test] [Category("Integration")] [TestCase(GeneralHelper.CMinCores)] @@ -71,9 +71,9 @@ maxCores = Math.Min(maxCores, Environment.ProcessorCount); const double cTolerance = 0.0005; var generalHelper = new GeneralHelper(); - string testFileName = "CalculateStabilityInsideBishopGrid"+ maxCores; - generalHelper.SetupIntegrationProject(maxCores, testWorkingFolder, testIntegrationDataFolder, input1AFilename, - output1AFilename, testFileName, calculationParametersIntegrationFilename, + string testFileName = "CalculateStabilityInsideBishopGrid" + maxCores; + generalHelper.SetupIntegrationProject(maxCores, testWorkingFolder, testIntegrationDataFolder, input1AFilename, + output1AFilename, testFileName, calculationParametersIntegrationFilename, projectIntegrationFilename, out runner, out locations); //SetupStabilityProject(maxCores); runner.Initialize(); @@ -105,85 +105,88 @@ // StabilityInside check if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString()) { - if (timeSeries.LocationId == "Purmer_PU0042+00_K") + Assert.Multiple(() => { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.548).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.725).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } + if (timeSeries.LocationId == "Purmer_PU0042+00_K") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.548).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.725).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } - if (timeSeries.LocationId == "Purmer_PU0042+00_K_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.493).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.649).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0042+00_R") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.324).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.479).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0042+00_R_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.279).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.419).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0110+20_K") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.536).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.702).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0110+20_K_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.480).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.636).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0110+20_R") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.317).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.462).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0110+20_R_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.270).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.406).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } + if (timeSeries.LocationId == "Purmer_PU0042+00_K_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.493).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.649).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0042+00_R") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.324).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.479).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0042+00_R_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.279).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.419).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_K") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.536).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.702).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_K_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.480).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.636).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_R") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.317).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.462).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_R_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.270).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.406).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + }); } seriesCount++; @@ -192,6 +195,4 @@ Assert.That(seriesCount > 0, Is.True, "No output time series"); Assert.That(resultsCount, Is.EqualTo(16), "Incorrect number of results"); } - - } \ No newline at end of file Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs =================================================================== diff -u -r4943 -r5609 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs (.../StabilityInsideUpliftVanGridTest.cs) (revision 4943) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs (.../StabilityInsideUpliftVanGridTest.cs) (revision 5609) @@ -33,12 +33,12 @@ [Category("Integration")] public class StabilityInsideUpliftVanGridTest { - const string projectIntegrationFilename = @"DAMLive.damx"; - const string input1AFilename = @"live.InputTimeSeriesMHW.xml"; - const string output1AFilename = @"live.OutputTimeSeriesMHW.xml"; - const string calculationParametersIntegrationFilename = @"live.ParametersFile.xml"; + private const string projectIntegrationFilename = @"DAMLive.damx"; + private const string input1AFilename = @"live.InputTimeSeriesMHW.xml"; + private const string output1AFilename = @"live.OutputTimeSeriesMHW.xml"; + private const string calculationParametersIntegrationFilename = @"live.ParametersFile.xml"; - const string testWorkingFolder = @".\damLiveUpliftVanGridWork"; + private const string testWorkingFolder = @".\damLiveUpliftVanGridWork"; private const string testIntegrationDataFolder = @"..\..\TestData\IntegrationTests\StabilityInsideUpliftVanGrid"; private List locations; @@ -51,16 +51,16 @@ IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores); } + [SetUp] + public void SetupTest() {} + [TearDown] public void TearDownFixture() { IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMinCores); IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores); } - [SetUp] - public void SetupTest() {} - [Test] [Category("Integration")] [TestCase(GeneralHelper.CMinCores)] @@ -69,7 +69,7 @@ { const double cTolerance = 0.0005; var generalHelper = new GeneralHelper(); - string testFileName = "CalculateStabilityInsideUpliftVanGrid"+ maxCores; + string testFileName = "CalculateStabilityInsideUpliftVanGrid" + maxCores; generalHelper.SetupIntegrationProject(maxCores, testWorkingFolder, testIntegrationDataFolder, input1AFilename, output1AFilename, testFileName, calculationParametersIntegrationFilename, projectIntegrationFilename, out runner, out locations); @@ -101,85 +101,88 @@ // StabilityInside check if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString()) { - if (timeSeries.LocationId == "Purmer_PU0042+00_K") + Assert.Multiple(() => { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.456).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.583).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } + if (timeSeries.LocationId == "Purmer_PU0042+00_K") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.456).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.583).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } - if (timeSeries.LocationId == "Purmer_PU0042+00_K_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.366).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.480).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } + if (timeSeries.LocationId == "Purmer_PU0042+00_K_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.366).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.480).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } - if (timeSeries.LocationId == "Purmer_PU0042+00_R") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.248).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.359).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - if (timeSeries.LocationId == "Purmer_PU0042+00_R_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.172).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.271).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0110+20_K") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0110+20_K_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } - - if (timeSeries.LocationId == "Purmer_PU0110+20_R") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } + if (timeSeries.LocationId == "Purmer_PU0042+00_R") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.248).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.359).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } - if (timeSeries.LocationId == "Purmer_PU0110+20_R_V") - { - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); - resultsCount++; - } + if (timeSeries.LocationId == "Purmer_PU0042+00_R_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.172).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(1.271).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + if (timeSeries.LocationId == "Purmer_PU0110+20_K") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_K_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_R") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_R_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.That(lastEntry.Value, Is.EqualTo(double.NaN).Within(cTolerance), "The computed safety factory is not correct"); + resultsCount++; + } + }); } seriesCount++; @@ -188,5 +191,4 @@ Assert.That(seriesCount > 0, Is.True, "No output time series"); Assert.That(resultsCount, Is.EqualTo(16), "Incorrect number of results"); } - } \ No newline at end of file