Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs =================================================================== diff -u -r4626 -r4630 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs (.../StabilityInsideUpliftVanGridTest.cs) (revision 4626) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs (.../StabilityInsideUpliftVanGridTest.cs) (revision 4630) @@ -75,11 +75,11 @@ projectIntegrationFilename, out runner, out locations); runner.Initialize(); runner.MaxCalculationCores = maxCores; - Assert.IsNotNull(runner); - Assert.IsNotNull(runner.DamProjectData); - Assert.IsNotNull(runner.CalculationParameters); - Assert.IsNotNull(runner.CalculationParameters.CalculationModules); - Assert.IsNotNull(runner.CalculationParameters.MStabParameters); + Assert.That(runner, Is.Not.Null); + Assert.That(runner.DamProjectData, Is.Not.Null); + Assert.That(runner.CalculationParameters, Is.Not.Null); + Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); + Assert.That(runner.CalculationParameters.MStabParameters, Is.Not.Null); runner.Run(); runner.OutputTimeSeriesCollection.Save("UpliftVanOutputFile" + maxCores); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveUsingCompleteDataSetTest.cs =================================================================== diff -u -r4626 -r4630 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveUsingCompleteDataSetTest.cs (.../DamLiveUsingCompleteDataSetTest.cs) (revision 4626) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveUsingCompleteDataSetTest.cs (.../DamLiveUsingCompleteDataSetTest.cs) (revision 4630) @@ -57,12 +57,12 @@ runner.CreateAndSetWorkingDirectories(); runner.DeleteFormerProjectFiles(); - Assert.IsNotNull(runner); - Assert.IsNotNull(runner.ProjectData); - Assert.IsNotNull(runner.RunnerDelegate); - Assert.IsNotNull(runner.CalculationParameters); - Assert.IsNotNull(runner.CalculationParameters.CalculationModules); - Assert.IsNotNull(runner.CalculationParameters.MStabParameters); + Assert.That(runner, Is.Not.Null); + Assert.That(runner.ProjectData, Is.Not.Null); + Assert.That(runner.RunnerDelegate, Is.Not.Null); + Assert.That(runner.CalculationParameters, Is.Not.Null); + Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); + Assert.That(runner.CalculationParameters.MStabParameters, Is.Not.Null); runner.Process(); runner.WriteResultsToFile(outputFile); @@ -128,8 +128,8 @@ #region Test Setup - const string TestWorkingFolder = "DamLiveUsingCompleteDataSetTest"; - private const string TestDataFolder = @"TestData\DamLive\Set3"; + const string testWorkingFolder = "DamLiveUsingCompleteDataSetTest"; + private const string testDataFolder = @"TestData\DamLive\Set3"; private List locations; private string inputFile; @@ -142,8 +142,8 @@ [SetUp] public void SetupFixture() { - IoHelper.RemoveTestWorkingDirectory(TestWorkingFolder); // to be sure no test directory exist from previous tests - Directory.CreateDirectory(TestWorkingFolder); + IoHelper.RemoveTestWorkingDirectory(testWorkingFolder); // to be sure no test directory exist from previous tests + Directory.CreateDirectory(testWorkingFolder); } [TearDown] @@ -164,10 +164,10 @@ // 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); Directory.CreateDirectory(actualTestPath); - DirectoryHelper.CopyRecursive(actualTestPath, TestDataFolder); + DirectoryHelper.CopyRecursive(actualTestPath, testDataFolder); //inputFile = Path.Combine(actualTestPath, "live.FEWS.InputFile.1Step.xml"); inputFile = Path.Combine(actualTestPath, "live.FEWS.InputFile.xml"); Index: DamClients/DamLive/trunk/src/build/Test.targets =================================================================== diff -u -r4610 -r4630 --- DamClients/DamLive/trunk/src/build/Test.targets (.../Test.targets) (revision 4610) +++ DamClients/DamLive/trunk/src/build/Test.targets (.../Test.targets) (revision 4630) @@ -9,14 +9,12 @@ - 3.13.3 + 4.1.0 - 4.4.2 + 4.6.0 - - 17.5.0 - + 4.5.4 Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongStabilityOutwardTest.cs =================================================================== diff -u -r4626 -r4630 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongStabilityOutwardTest.cs (.../DamLivePulauTekongStabilityOutwardTest.cs) (revision 4626) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongStabilityOutwardTest.cs (.../DamLivePulauTekongStabilityOutwardTest.cs) (revision 4630) @@ -60,11 +60,11 @@ SetupStabilityProject(inputTestcaseFilename); runner.Initialize(); - Assert.IsNotNull(runner); - Assert.IsNotNull(runner.DamProjectData); - Assert.IsNotNull(runner.CalculationParameters); - Assert.IsNotNull(runner.CalculationParameters.CalculationModules); - Assert.IsNotNull(runner.CalculationParameters.MStabParameters); + Assert.That(runner, Is.Not.Null); + Assert.That(runner.DamProjectData, Is.Not.Null); + Assert.That(runner.CalculationParameters, Is.Not.Null); + Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); + Assert.That(runner.CalculationParameters.MStabParameters, Is.Not.Null); runner.Run(); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/CalculationParametersAssemblerTest.cs =================================================================== diff -u -r4626 -r4630 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/CalculationParametersAssemblerTest.cs (.../CalculationParametersAssemblerTest.cs) (revision 4626) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/CalculationParametersAssemblerTest.cs (.../CalculationParametersAssemblerTest.cs) (revision 4630) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.IO; using System.Xml.Linq; using Deltares.Dam.Application.Live; @@ -34,7 +33,6 @@ public class CalculationParametersAssemblerTest { private const string testFileName = @"TestData\SampleCalculationParameters.xml"; - private const double Precision = 1e-8; private XDocument testDoc; private CalculationParametersAssembler assembler; @@ -102,10 +100,10 @@ // Do the thing: create MStabParameters from XML element CalculationParameters calculationParameters = assembler.CreateDomainObject(testDoc); - Assert.IsNotNull(calculationParameters); + Assert.That(calculationParameters, Is.Not.Null); // Calculation modules - Assert.IsNotNull(calculationParameters.CalculationModules); + Assert.That(calculationParameters, Is.Not.Null); Assert.That(calculationParameters.CalculationModules.StabilityOutside, Is.True, "CalculationModules.StabilityOutside"); Assert.That(calculationParameters.CalculationModules.StabilityInside, Is.True, "CalculationModules.Stability"); @@ -114,7 +112,7 @@ Assert.That(calculationParameters.CalculationModules.PipingSellmeijer, Is.True, "CalculationModules.PipingSellmeijer"); // MStab parameters - Assert.IsNotNull(calculationParameters.MStabParameters); + Assert.That(calculationParameters.MStabParameters, Is.Not.Null); Assert.That(calculationParameters.MStabParameters.IsCalculateAllStabilityProjectsAtOnce, Is.EqualTo(false), "MStabParameters.IsCalculateAllStabilityProjectsAtOnce"); Assert.That(calculationParameters.MStabParameters.Model, Is.EqualTo(MStabModelType.UpliftVan), "MStabParameters.Model"); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs =================================================================== diff -u -r4626 -r4630 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs (.../DamLiveGrebbedijkTest.cs) (revision 4626) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs (.../DamLiveGrebbedijkTest.cs) (revision 4630) @@ -57,11 +57,11 @@ SetupStabilityProject(); runner.Initialize(); runner.DamProjectData.MaxCalculationCores = 5; - Assert.IsNotNull(runner); - Assert.IsNotNull(runner.DamProjectData); - Assert.IsNotNull(runner.CalculationParameters); - Assert.IsNotNull(runner.CalculationParameters.CalculationModules); - Assert.IsNotNull(runner.CalculationParameters.MStabParameters); + Assert.That(runner, Is.Not.Null); + Assert.That(runner.DamProjectData, Is.Not.Null); + Assert.That(runner.CalculationParameters, Is.Not.Null); + Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); + Assert.That(runner.CalculationParameters.MStabParameters, Is.Not.Null); runner.Run(); //runner.WriteResultsToFile(outputFile); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongMissingValuesTest.cs =================================================================== diff -u -r4626 -r4630 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongMissingValuesTest.cs (.../DamLivePulauTekongMissingValuesTest.cs) (revision 4626) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongMissingValuesTest.cs (.../DamLivePulauTekongMissingValuesTest.cs) (revision 4630) @@ -31,7 +31,7 @@ namespace Deltares.DamLive.Tests; -// This test is based on a early configuration of the project Pulau Tekong for stability outward +// This test is based on an early configuration of the project Pulau Tekong for stability outward // It tests if having missing values in the time serie is handled correctly [TestFixture] [Category("Integration")] @@ -61,11 +61,11 @@ SetupStabilityProject(inputTestcaseFilename); runner.Initialize(); - Assert.IsNotNull(runner); - Assert.IsNotNull(runner.DamProjectData); - Assert.IsNotNull(runner.CalculationParameters); - Assert.IsNotNull(runner.CalculationParameters.CalculationModules); - Assert.IsNotNull(runner.CalculationParameters.MStabParameters); + Assert.That(runner, Is.Not.Null); + Assert.That(runner.DamProjectData, Is.Not.Null); + Assert.That(runner.CalculationParameters, Is.Not.Null); + Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); + Assert.That(runner.CalculationParameters.MStabParameters, Is.Not.Null); runner.Run(); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs =================================================================== diff -u -r4626 -r4630 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 4626) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 4630) @@ -77,11 +77,11 @@ //SetupStabilityProject(maxCores); runner.Initialize(); runner.MaxCalculationCores = maxCores; - Assert.IsNotNull(runner); - Assert.IsNotNull(runner.DamProjectData); - Assert.IsNotNull(runner.CalculationParameters); - Assert.IsNotNull(runner.CalculationParameters.CalculationModules); - Assert.IsNotNull(runner.CalculationParameters.MStabParameters); + Assert.That(runner, Is.Not.Null); + Assert.That(runner.DamProjectData, Is.Not.Null); + Assert.That(runner.CalculationParameters, Is.Not.Null); + Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); + Assert.That(runner.CalculationParameters.MStabParameters, Is.Not.Null); runner.StabilityWorkingPath = Path.GetTempPath(); runner.Run(); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/ModelRunnerTest.cs =================================================================== diff -u -r4068 -r4630 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/ModelRunnerTest.cs (.../ModelRunnerTest.cs) (revision 4068) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/ModelRunnerTest.cs (.../ModelRunnerTest.cs) (revision 4630) @@ -138,7 +138,7 @@ runner.Process(); - Assert.IsNotEmpty(runner.OutputTimeSeriesCollection.Series); + Assert.That(runner.OutputTimeSeriesCollection.Series, Is.Not.Empty); } #region Test Setup Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs =================================================================== diff -u -r4626 -r4630 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 4626) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 4630) @@ -82,11 +82,11 @@ //SetupStabilityProject(maxCores); runner.Initialize(); runner.MaxCalculationCores = maxCores; - Assert.IsNotNull(runner); - Assert.IsNotNull(runner.DamProjectData); - Assert.IsNotNull(runner.CalculationParameters); - Assert.IsNotNull(runner.CalculationParameters.CalculationModules); - Assert.IsNotNull(runner.CalculationParameters.MStabParameters); + Assert.That(runner, Is.Not.Null); + Assert.That(runner.DamProjectData, Is.Not.Null); + Assert.That(runner.CalculationParameters, Is.Not.Null); + Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); + Assert.That(runner.CalculationParameters.MStabParameters, Is.Not.Null); runner.Run(); runner.OutputTimeSeriesCollection.Save("UpliftVanBeeSwarmOutputFile" + maxCores); @@ -208,7 +208,7 @@ //testName = Path.Combine(testIntegrationDataFolder, testName); var engineInterface = new EngineInterface(inputString); - Assert.IsNotNull(engineInterface.DamProjectData); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); engineInterface.DamProjectData.MaxCalculationCores = maxCores; engineInterface.DamProjectData.ProjectPath = testWorkingFolder + maxCores; Input input = DamXmlSerialization.LoadInputFromXmlString(inputString); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs =================================================================== diff -u -r4626 -r4630 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs (.../PipingWtiInsideTest.cs) (revision 4626) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs (.../PipingWtiInsideTest.cs) (revision 4630) @@ -75,10 +75,10 @@ //SetupPipingProject(maxCores); runner.Initialize(); runner.MaxCalculationCores = maxCores; - Assert.IsNotNull(runner); - Assert.IsNotNull(runner.DamProjectData); - Assert.IsNotNull(runner.CalculationParameters); - Assert.IsNotNull(runner.CalculationParameters.CalculationModules); + Assert.That(runner, Is.Not.Null); + Assert.That(runner.DamProjectData, Is.Not.Null); + Assert.That(runner.CalculationParameters, Is.Not.Null); + Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); runner.Run(); //runner.WriteResultsToFile(outputFile);