Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingBlighTests.cs =================================================================== diff -u -r1221 -r1330 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 1221) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 1330) @@ -165,7 +165,6 @@ [Test] [SetUICulture("en-US")] - [ExpectedException(typeof(DesignCalculatorException))] public void CanPerformBlighFailingDesignWithAdaptionRechterDiezedijk1Location() { // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk piping Bligh design.damx" @@ -177,15 +176,12 @@ string inputString = File.ReadAllText(fileName); EngineInterface engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); - try - { - string outputString = engineInterface.Run(); - } - catch(DesignCalculatorException e) - { - Assert.AreEqual("The design was not successful in location '101', soilprofile 'segment1_1D1', Factor achieved = 2.870, Factor required = 8.000.", e.Message); - throw e; - } + string outputString = engineInterface.Run(); + var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); + Assert.AreEqual(2, output.Results.CalculationMessages.Length); + Assert.AreEqual("Location 101, subsoil scenario 'segment1_1D1', design scenario '1': The calculation failed with error message 'The design was not successful in location '101', soilprofile 'segment1_1D1', Factor achieved = 2.870, Factor required = 8.000.'", + output.Results.CalculationMessages[0].Message1); + } [Test]