Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
===================================================================
diff -u -r2029 -r2037
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 2029)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 2037)
@@ -1,5 +1,6 @@
using System.IO;
using System.Text;
+using System.Threading;
using Deltares.DamEngine.Data.General;
using Deltares.DamEngine.Data.Geotechnics;
using Deltares.DamEngine.Interface;
@@ -208,6 +209,36 @@
return DamXmlSerialization.LoadOutputFromXmlString(outputString);
}
+ [Test]
+ [SetUICulture("en-US")]
+ //ToDo MWDAM-1395 Use this test also to test if the kernel gives the message in the expected language, now it is always Dutch
+ public void CanPerformWtiSellmeijerRevisedFailingDesignRechterDiezedijk1Location()
+ {
+ // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk.damx"
+ // Set Analysis type to "No Adaption"
+ // Set model to Piping Sellmeijer Revised (WBI)
+ // Select first location (100)
+ Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+ const string fileName = @"TestFiles\Rechter Diezedijk_WtiSellmeijerRevisedFailedDesignInputFile_1Location.xml";
+ string inputString = File.ReadAllText(fileName);
+ EngineInterface engineInterface = new EngineInterface(inputString);
+ Assert.IsNotNull(engineInterface.DamProjectData);
+ string outputString = engineInterface.Run();
+ var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+ Assert.AreEqual(2, output.Results.CalculationResults.DesignResults.Length);
+ //ToDo MWDAM-1395 expected english message but is dutch
+ Assert.AreEqual("De effectieve spanning mag niet negatief zijn.\r\n", output.Results.CalculationResults.DesignResults[1].PipingDesignResults.ResultMessage);
+ //ToDo MWDAM-1394 expected RunFailed but is succeeded
+ //Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[1].CalculationResult));
+ //ToDo MWDAM-1396 expected location etc included in message, but is only last part of message
+ //Assert.AreEqual("Location '100', subsoil scenario 'segment1_1D2', design scenario '1': " +
+ //"The calculation failed with error message " +
+ //"'The design was not successful. " +
+ //"De effectieve spanning mag niet negatief zijn.'",
+ //output.Results.CalculationMessages[0].Message1);
+ }
+
}
+
}
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_WtiSellmeijerRevisedFailedDesignInputFile_1Location.xml
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_WtiSellmeijerRevisedFailedDesignInputFile_1Location.xml (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_WtiSellmeijerRevisedFailedDesignInputFile_1Location.xml (revision 2037)
@@ -0,0 +1,367 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r2025 -r2037
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 2025)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 2037)
@@ -185,6 +185,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs
===================================================================
diff -u -r2028 -r2037
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 2028)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 2037)
@@ -23,6 +23,7 @@
using System.Threading;
using Deltares.DamEngine.Data.General;
using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.Data.Standard.Calculation;
using Deltares.DamEngine.Interface;
using Deltares.DamEngine.Io;
using NUnit.Framework;
@@ -183,6 +184,9 @@
Assert.IsNotNull(engineInterface.DamProjectData);
string outputString = engineInterface.Run();
var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+ Assert.AreEqual(2, output.Results.CalculationResults.DesignResults.Length);
+ Assert.AreEqual("The new shoulder length is too large to fit in the current surface line.", output.Results.CalculationResults.DesignResults[1].PipingDesignResults.ResultMessage);
+ Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[1].CalculationResult));
Assert.AreEqual(2, output.Results.CalculationMessages.Length);
Assert.AreEqual("Location '101', subsoil scenario 'segment1_1D1', design scenario '1': " +
"The calculation failed with error message " +