Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs
===================================================================
diff -u -r4611 -r4626
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 4611)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 4626)
@@ -103,96 +103,96 @@
         string[] validParameterIDs = Enum.GetNames(typeof(TimeSerieParameters));
         foreach (TimeSerie timeSeries in series)
         {
-            Assert.IsTrue(validParameterIDs.Any(n => n == timeSeries.ParameterId));
-            Assert.IsTrue(locations.Any(l => l.Name == timeSeries.LocationId));
+            Assert.That(validParameterIDs.Any(n => n == timeSeries.ParameterId), Is.True);
+            Assert.That(locations.Any(l => l.Name == timeSeries.LocationId), Is.True);
             // StabilityInside check
             if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString())
             {
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.442, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.442).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.579, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.579).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.365, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.365).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.481, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.481).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.239, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.239).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.355, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.355).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.168, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.168).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.272, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.272).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 
                 if (timeSeries.LocationId == "Purmer_PU0110+20_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    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.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    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.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    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.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
             }
 
             seriesCount++;
         }
 
-        Assert.IsTrue(seriesCount > 0, "No output time series");
-        Assert.AreEqual(16, resultsCount, "Incorrect number of results");
+        Assert.That(seriesCount > 0, Is.True, "No output time series");
+        Assert.That(resultsCount, Is.EqualTo(16), "Incorrect number of results");
     }
     
     [Category("Integration")]
@@ -214,7 +214,7 @@
         Input input = DamXmlSerialization.LoadInputFromXmlString(inputString);
         DamXmlSerialization.SaveInputAsXmlFile(testName, input);
         string result = engineInterface.Validate();
-        Assert.IsTrue(result == null, "Validation must succeed but does not, see output xml in debugger");
+        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);
@@ -237,88 +237,88 @@
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.442, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.442).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.579, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.579).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K_V")
                 {
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.365, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.365).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.481, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.481).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R")
                 {
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.239, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.239).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.355, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.355).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();
-                    Assert.AreEqual(1.168, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.168).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.272, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.272).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();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    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();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    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();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    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")
                 {
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
             }
 
             seriesCount++;
         }
 
-        Assert.IsTrue(seriesCount > 0, "No output time series");
-        Assert.AreEqual(16, resultsCount, "Incorrect number of results");
+        Assert.That(seriesCount > 0, Is.True, "No output time series");
+        Assert.That(resultsCount, Is.EqualTo(16), "Incorrect number of results");
         
     }