Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r5592 -r5597
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5592)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5597)
@@ -230,6 +230,9 @@
PreserveNewest
+
+ PreserveNewest
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r5119 -r5597
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 5119)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 5597)
@@ -343,7 +343,8 @@
var resultMessage = sb.ToString();
calculationResult = CalculationResult.Succeeded;
- kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, null, resultMessage, out designResults);
+ DesignScenario designScenario = damKernelInput.Location.CurrentScenario;
+ kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, designScenario, resultMessage, out designResults);
if (designResults.Count > 0)
{
timeSerieEntry.Value = designResults[0].SafetyFactor.Value;
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs
===================================================================
diff -u -r5592 -r5597
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs (.../OperationalStabilityProfile1DTests.cs) (revision 5592)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs (.../OperationalStabilityProfile1DTests.cs) (revision 5597)
@@ -20,8 +20,10 @@
// All rights reserved.
using System.IO;
+using Deltares.DamEngine.Io;
using Deltares.DamEngine.Io.XmlOutput;
using Deltares.DamEngine.TestHelpers;
+using KellermanSoftware.CompareNetObjects;
using NUnit.Framework;
namespace Deltares.DamEngine.IntegrationTests.IntegrationTests;
@@ -35,24 +37,52 @@
// Based on the DamLive test Deltares.DamLive.Tests.StabilityInsideBishopGridTest
// "Deltares.DamLive.Tests\TestData\IntegrationTests\StabilityInsideBishopGrid\DAMLive.damx"
// with DamLive rev.4860
- const string projectPath = "StabilityInsideProfile1DBishopGrid";
+ const string baseName = "CalculateStabilityInsideBishopGrid1";
+ const string projectPath = baseName;
const string calcDir = "DAMLive.Calc";
const string testFilesLocation = @".\TestFiles\Operational\Profile1DTests\";
- const string stabilityInsideBishopGrid = @"CalculateStabilityInsideBishopGrid1InputFile.xml";
+ const string inputFilename = baseName + "InputFile.xml";
+ const string outputFilename = baseName + "OutputFile.xml";
if (Directory.Exists(calcDir))
{
Directory.Delete(calcDir, true); // delete previous results
}
- string inputFileName = testFilesLocation + stabilityInsideBishopGrid;
- string inputString = File.ReadAllText(inputFileName);
+ // Load expected output
+ string expectedOutputFileName = testFilesLocation + outputFilename;
+ Output expectedOutput = DamXmlSerialization.LoadOutputFromXmlFile(expectedOutputFileName);
+
+ // Given
+ // Load input
+ string inputString = File.ReadAllText(testFilesLocation + inputFilename);
inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", projectPath); // Current directory will be used
inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
- const string outputFilename = "OutputFileStabilityInsideProfile1DBishopGrid.xml";
- Output output = GeneralHelper.RunAfterInputValidation(inputString, true, outputFilename);
+ // When
+ // Run calculation
+ Output actualOutput = GeneralHelper.RunAfterInputValidation(inputString, true, outputFilename);
- Assert.Multiple(() => { Assert.That(output, Is.Not.Null); }
+ // Then
+ // Compare output
+ Assert.Multiple(() =>
+ {
+ Assert.That(actualOutput, Is.Not.Null);
+ Assert.That(expectedOutput, Is.Not.Null);
+ }
);
+ CompareOutput(expectedOutput, actualOutput);
}
+
+ private void CompareOutput(Output expected, Output actual)
+ {
+ var compare = new CompareLogic
+ {
+ Config =
+ {
+ MaxDifferences = 100
+ }
+ };
+ ComparisonResult result = compare.Compare(expected, actual);
+ Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write Output object");
+ }
}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs
===================================================================
diff -u -r4759 -r5597
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs (.../GeneralHelper.cs) (revision 4759)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs (.../GeneralHelper.cs) (revision 5597)
@@ -115,7 +115,8 @@
private static void CheckConsistencyOfAdaptGeometryResults(EngineInterface engineInterface, OutputResults outputResults)
{
- if (engineInterface.DamProjectData.DamProjectCalculationSpecification.AnalysisTypeForSerializationPurposeOnly == AnalysisType.AdaptGeometry)
+ if (engineInterface.DamProjectData.DamProjectType == DamProjectType.Design &&
+ engineInterface.DamProjectData.DamProjectCalculationSpecification.AnalysisTypeForSerializationPurposeOnly == AnalysisType.AdaptGeometry)
{
var isIteratedFilePresent = false;
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideBishopGrid1OutputFile.xml
===================================================================
diff -u
Binary files differ