Index: DamClients/DamUI/trunk/src/Dam/Tests/CalculationParametersAssemblerTest.cs
===================================================================
diff -u -r2648 -r2655
--- DamClients/DamUI/trunk/src/Dam/Tests/CalculationParametersAssemblerTest.cs	(.../CalculationParametersAssemblerTest.cs)	(revision 2648)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CalculationParametersAssemblerTest.cs	(.../CalculationParametersAssemblerTest.cs)	(revision 2655)
@@ -69,9 +69,24 @@
             XDocument inputDocument = XDocument.Parse(inputString);
 
             // When parsing, then exception is thrown
-            Assert.That(() => this.assembler.CreateDomainObject(inputDocument), Throws.TypeOf(typeof(DtoAssemblerException)).With.Message.EqualTo(String.Format("The specified calculation module '{0}' is obsolete", obsoleteElement)));
+            Assert.That(() => this.assembler.CreateDomainObject(inputDocument), Throws.TypeOf(typeof(DtoAssemblerException)).With.Message.EqualTo(String.Format("The specified parameter '{0}' is obsolete", obsoleteElement)));
         }
+        [Test]
+        [TestCase("ShearStrength")]
+        [TestCase("Probabilistic")]
+        [TestCase("IsOverrulePLLineCreationMethod")]
+        [TestCase("PLLineCreationMethod")]
+        public void GivenParameterFileWithObsoleteMStabParametersWhenParsingThenExceptionIsThrown(string obsoleteElement)
+        {
+            // Given ParameterFile with obsolete MStab parameters
+            string inputString = File.ReadAllText(testFileName);
+            inputString = XmlAdapter.ChangeKeyName(inputString, "CalculationModel", obsoleteElement);
+            XDocument inputDocument = XDocument.Parse(inputString);
 
+            // When parsing, then exception is thrown
+            Assert.That(() => this.assembler.CreateDomainObject(inputDocument), Throws.TypeOf(typeof(DtoAssemblerException)).With.Message.EqualTo(String.Format("The specified parameter '{0}' is obsolete", obsoleteElement)));
+        }
+
         [Test]
         public void CreateEntityFromDto()
         {
@@ -101,11 +116,8 @@
 
             Assert.AreEqual(false, calculationParameters.MStabParameters.IsCalculateAllStabilityProjectsAtOnce, "MStabParameters.IsCalculateAllStabilityProjectsAtOnce");
             Assert.AreEqual(MStabModelType.UpliftVan, calculationParameters.MStabParameters.Model, "MStabParameters.Model");
-            Assert.AreEqual(MStabShearStrength.StressTables, calculationParameters.MStabParameters.ShearStrength, "MStabParameters.ShearStrength");
             Assert.AreEqual(MStabSearchMethod.Grid, calculationParameters.MStabParameters.SearchMethod, "MStabParameters.SearchMethod");
-            Assert.AreEqual(false, calculationParameters.MStabParameters.IsProbabilistic, "MStabParameters.IsProbabilistic");
             Assert.IsTrue(calculationParameters.MStabParameters.CalculationOptions.ZonesType.Equals(MStabZonesType.ForbiddenZone), "MStabParameters.CalculationOptions.ZonesType");
-            Assert.AreEqual(true, calculationParameters.MStabParameters.IsOverrulePLLineCreationMethod, "MStabParameters.IsOverrulePLLineCreationMethod");
         }
     }
 }
\ No newline at end of file