Index: DamClients/DamUI/trunk/src/Dam/Tests/CalculationParametersAssemblerTest.cs
===================================================================
diff -u -r2632 -r2648
--- DamClients/DamUI/trunk/src/Dam/Tests/CalculationParametersAssemblerTest.cs	(.../CalculationParametersAssemblerTest.cs)	(revision 2632)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CalculationParametersAssemblerTest.cs	(.../CalculationParametersAssemblerTest.cs)	(revision 2648)
@@ -19,9 +19,13 @@
 // 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.Data;
 using Deltares.Dam.Data.Assemblers;
+using Deltares.Dam.TestHelper;
+using Deltares.Standard;
 using NUnit.Framework;
 
 namespace Deltares.Dam.Tests
@@ -53,6 +57,22 @@
         }
 
         [Test]
+        [TestCase("Stability")]
+        [TestCase("PipingSellmeijerProbabilistic")]
+        [TestCase("PipingIJkdijk")]
+        [TestCase("Overtopping")]
+        public void GivenParameterFileWithObsoleteCalculationModuleWhenParsingThenExceptionIsThrown(string obsoleteElement)
+        {
+            // Given ParameterFile with obsolete Calculation Module
+            string inputString = File.ReadAllText(testFileName);
+            inputString = XmlAdapter.ChangeKeyName(inputString, "StabilityOutside", 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 calculation module '{0}' is obsolete", obsoleteElement)));
+        }
+
+        [Test]
         public void CreateEntityFromDto()
         {
             // First validate test XML against schema
@@ -75,9 +95,6 @@
             Assert.IsTrue(calculationParameters.CalculationModules.PipingWti, "CalculationModules.PipingWti");
             Assert.IsTrue(calculationParameters.CalculationModules.PipingBligh, "CalculationModules.PipingBligh");
             Assert.IsTrue(calculationParameters.CalculationModules.PipingSellmeijer, "CalculationModules.PipingSellmeijer");
-            Assert.IsTrue(calculationParameters.CalculationModules.PipingSellmeijerProbabilistic, "CalculationModules.PipingSellmeijerProbabilistic");
-            Assert.IsTrue(calculationParameters.CalculationModules.PipingIJkdijk, "CalculationModules.PipingIJkdijk");
-            Assert.IsTrue(calculationParameters.CalculationModules.Overtopping, "CalculationModules.Overtopping");
 
             // MStab parameters
             Assert.IsNotNull(calculationParameters.MStabParameters);