Index: DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs =================================================================== diff -u -r3798 -r3822 --- DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 3798) +++ DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 3822) @@ -26,8 +26,6 @@ using Deltares.DamEngine.Interface; using Deltares.DamEngine.Io; using Deltares.Standard; -using Deltares.Standard.Logging; -using Deltares.Standard.TestUtils; using NUnit.Framework; namespace Deltares.Dam.Tests @@ -40,7 +38,7 @@ /// /// /// - private static List ComputeStabilityOutsideProjectUsingClassic(string projectFilename, int expectedLocations, out List calculationMessages) + private static List ComputeStabilityOutsideProjectUsingClassic(string projectFilename, int expectedLocations) { // Read dikering using (var damProjectData = ProjectLoader.LoadProjectData(projectFilename)) @@ -68,21 +66,19 @@ // DamXmlSerialization.SaveOutputAsXmlFile("OutputForDebugging.xml", output); FillDamUiFromXmlOutput.AddOutputToDamProjectData(damProjectData, output); } - var allCalculationresults = damProjectData.DesignCalculations; - calculationMessages = damProjectData.CalculationMessages; - return allCalculationresults; + return damProjectData.DesignCalculations; } } - [Test, Ignore] - [Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine + [Test] + [Category("WorkInProgress")] + [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")] public void TestStabilityClassicOutsideWith2DstiFiles() { const double diff = 0.001; string projectFilename = @"..\..\..\data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"; - List calculationMessages; - var allCalculationresults = ComputeStabilityOutsideProjectUsingClassic(projectFilename, 19, out calculationMessages); + var allCalculationresults = ComputeStabilityOutsideProjectUsingClassic(projectFilename, 19); Assert.AreEqual(1, allCalculationresults.Count); // Results as found with Dam Classic. These should be reproduced in the first place, however wrong these might be ;-) Assert.AreEqual("DWP_1", allCalculationresults[0].LocationName); @@ -132,15 +128,15 @@ Assert.AreEqual(null, allCalculationresults[0].UpliftFactor); } - [Test, Ignore] - [Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine and Stability Outside is not yet implemented. + [Test] + [Category("WorkInProgress")] + [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine and Stability Outside is not yet implemented.")] public void TestStabilityClassicOutsideWith1DProfiles() { const double diff = 0.001; string projectFilename = @"..\..\..\data\DamEngineTestProjects\Actualisatie\Actualisatie.damx"; - List calculationMessages; - var allCalculationresults = ComputeStabilityOutsideProjectUsingClassic(projectFilename, 56, out calculationMessages); + var allCalculationresults = ComputeStabilityOutsideProjectUsingClassic(projectFilename, 56); Assert.AreEqual(36, allCalculationresults.Count); // Results for calc 2 (results[1]) as found with Dam Classic. These should be reproduced in the first place, however wrong these might be ;-) Assert.AreEqual("RK210-560", allCalculationresults[1].LocationName);