Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs =================================================================== diff -u -r4484 -r4488 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4484) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4488) @@ -225,13 +225,15 @@ // Note that all results are based on the single core version of this tests that can be found at: // DesignBishopOptimizedSlopeAndShoulderAdaptionWithScenariosForHeadPL3CalculatesCorrect in MacroStabilityInwardsTests Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); + string outputFileName = "Results_Cores_" + maxCores + ".xml"; if (justOneScenario) { - DamXmlSerialization.SaveOutputAsXmlFile("Results_OneScenario_Cores_" + maxCores + ".xml", output); + outputFileName = "Results_OneScenario_Cores_" + maxCores + ".xml"; + DamXmlSerialization.SaveOutputAsXmlFile(outputFileName, output); } else { - DamXmlSerialization.SaveOutputAsXmlFile("Results_Cores_" + maxCores + ".xml", output); + DamXmlSerialization.SaveOutputAsXmlFile(outputFileName, output); } if (justOneScenario) @@ -255,8 +257,8 @@ { Assert.AreEqual(18, resultsFound); CheckLargeResultsSets.CheckBasicResultsBasedOnReferenceResultsFile( - //"Results_Cores_16.xml", output.Results.CalculationResults); - "TestFiles\\DesignBishopAdaptionWithScenariosForHeadPl3_Results.xml", output.Results.CalculationResults); + "TestFiles\\DesignBishopAdaptionWithScenariosForHeadPl3_Results.xml", outputFileName, + output.Results.CalculationResults); } } [Test, Category("MultiCore")] @@ -292,11 +294,13 @@ // Note that all results are based on the single core version of this tests that can be found at: // DesignBishopOptimizedSlopeAndShoulderAdaptionWithScenariosForHeadPL3CalculatesCorrect in MacroStabilityInwardsTests Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); - DamXmlSerialization.SaveOutputAsXmlFile("LargeInsideBishopNoAdaptionGridResults_Cores_" + maxCores + ".xml", output); + string outputFileName = "LargeInsideBishopNoAdaptionGridResults_Cores_" + maxCores + ".xml"; + DamXmlSerialization.SaveOutputAsXmlFile(outputFileName, output); Assert.AreEqual(718, output.Results.CalculationResults.Length); Assert.AreEqual(2497, output.Results.CalculationMessages.Length); CheckLargeResultsSets.CheckBasicResultsBasedOnReferenceResultsFile( - "TestFiles\\LargeInsideBishopNoAdaptionGridResults_Cores_1.xml", output.Results.CalculationResults); + "TestFiles\\LargeInsideBishopNoAdaptionGridResults_Cores_1.xml", outputFileName, + output.Results.CalculationResults); } private static void RemoveTestWorkingDirectory() Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs =================================================================== diff -u -r4487 -r4488 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 4487) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 4488) @@ -392,8 +392,14 @@ return resultsFound; } - public static void CheckBasicResultsBasedOnReferenceResultsFile(string resultsFile, DesignResult[] calculationResults) + public static void CheckBasicResultsBasedOnReferenceResultsFile(string resultsFile, string outputFileName, + DesignResult[] calculationResults) { + string logFile = Path.ChangeExtension("TestFiles\\" + outputFileName, ".log"); + if (File.Exists(logFile)) + { + File.Delete(logFile); + } Output output = DamXmlSerialization.LoadOutputFromXmlFile(resultsFile); Assert.AreEqual(output.Results.CalculationResults.Count(), calculationResults.Count(), "Results Count does not match"); foreach (DesignResult expectedDesignResult in output.Results.CalculationResults) @@ -424,7 +430,7 @@ }; compare.Config.MembersToIgnore = ResultsParametersToIgnore; ComparisonResult result = compare.Compare(expectedDesignResult, actualDesignResult); - WriteDifferencesToLog(resultsFile, result); + WriteDifferencesToLog(logFile, expectedDesignResult.BaseFileName, result); Assert.AreEqual(0, result.Differences.Count, "Differences found comparing design results for " + resultsFile); } } @@ -434,16 +440,17 @@ "CalculationSubDir" }; - private static void WriteDifferencesToLog(string resultsFile, ComparisonResult result) + private static void WriteDifferencesToLog(string logFile, string baseFileName, ComparisonResult result) { - Path.ChangeExtension(resultsFile, ".log"); if (result.Differences.Any()) { - File.WriteAllText(resultsFile, result.DifferencesString); + string res = baseFileName + ": \r\n" + result.DifferencesString; + File.AppendAllText(logFile, res); } else { - File.WriteAllText(resultsFile, "No differences found at all!"); + string res = baseFileName + ": No differences found at all! \r\n"; + File.AppendAllText(logFile, res); } } } \ No newline at end of file