Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTest.cs
===================================================================
diff -u -r1832 -r1833
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTest.cs	(.../DamLivePulauTekongTest.cs)	(revision 1832)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTest.cs	(.../DamLivePulauTekongTest.cs)	(revision 1833)
@@ -40,7 +40,7 @@
         private const double missingValue = -999.0;
         const string projectStabilityFilename = @"PulauTekong.damx";
         const string inputFilenameWithValues = @"live.InputTimeSeries.xml";
-        const string inputFilenameWithNoValues = @"live.InputTimeSeries - novalues.xml";
+        const string inputFilenameWithMissingValues = @"live.InputTimeSeries - novalues.xml";
         const string outputFilename = @"live.OutputTimeSeries.xml";
         const string calculationParametersStabilityFilename = @"live.ParametersFile.xml";
 
@@ -164,10 +164,12 @@
         ///  </summary>        
         [Test]
         [Category("Integration")]
-        public void CalculateStabilityOutsideUsingTestFilesHasExpectedResultsInOutputFile()
+        [TestCase(inputFilenameWithValues, 2.486106, 2.114159)]
+        [TestCase(inputFilenameWithMissingValues, missingValue, missingValue)]
+        public void CalculateStabilityOutsideUsingTestFilesHasExpectedResultsInOutputFile(string inputTestcaseFilename, double valueEntry1, double valueEntry2)
         {
             const double cTolerance = 0.0005;
-            SetupStabilityProject(inputFilenameWithValues);
+            SetupStabilityProject(inputTestcaseFilename);
             runner.Initialize();
 
             Assert.IsNotNull(runner);
@@ -199,13 +201,13 @@
                     {
                         calculatedLocationCount++;
                         var firstEntry = timeSeries.Entries.First();
-                        Assert.AreEqual(2.486106, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                        Assert.AreEqual(valueEntry1, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
                     }
                     if (timeSeries.LocationId == "CD CS2 X3")
                     {
                         calculatedLocationCount++;
                         var firstEntry = timeSeries.Entries.First();
-                        Assert.AreEqual(2.114159, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                        Assert.AreEqual(valueEntry2, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
                     }
                 }
 
@@ -215,59 +217,5 @@
             Assert.IsTrue(seriesCount > 0, "No output time series");
             Assert.IsTrue(calculatedLocationCount == 2, "Not all locations have output for stability outside");
         }
-
-        [Test]
-        [Category("Integration")]
-        public void CalculateStabilityOutsideUsingTestFilesWithNoValuesHasOutputFileWithNoValues()
-        {
-            const double cTolerance = 0.0005;
-            SetupStabilityProject(inputFilenameWithNoValues);
-            runner.Initialize();
-
-            Assert.IsNotNull(runner);
-            Assert.IsNotNull(runner.DamProjectData);
-            Assert.IsNotNull(runner.CalculationParameters);
-            Assert.IsNotNull(runner.CalculationParameters.CalculationModules);
-            Assert.IsNotNull(runner.CalculationParameters.MStabParameters);
-
-            runner.Run();
-
-            AssertNoErrors();
-
-            // Assertions
-
-            var series = runner.OutputTimeSeriesCollection.Series;
-
-            int seriesCount = 0;
-            int calculatedLocationCount = 0;
-            var validParameterIDs = Enum.GetNames(typeof(TimeSerieParameters));
-            foreach (var timeSeries in series)
-            {
-                Assert.IsTrue(validParameterIDs.Any(n => n == timeSeries.ParameterId));
-                Assert.IsTrue(locations.Any(l => l.Name == timeSeries.LocationId));
-                // StabilityOutside check
-                if (timeSeries.ParameterId == TimeSerieParameters.StabilityOutsideFactor.ToString())
-                {
-                    if (timeSeries.LocationId == "CD CS1 X1")
-                    {
-                        calculatedLocationCount++;
-                        var firstEntry = timeSeries.Entries.First();
-                        Assert.AreEqual(missingValue, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    }
-                    if (timeSeries.LocationId == "CD CS2 X3")
-                    {
-                        calculatedLocationCount++;
-                        var firstEntry = timeSeries.Entries.First();
-                        Assert.AreEqual(missingValue, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    }
-                }
-
-                seriesCount++;
-            }
-
-            Assert.IsTrue(seriesCount > 0, "No output time series");
-            Assert.IsTrue(calculatedLocationCount == 2, "Not all locations have output for stability outside");
-        }
-
     }
 }