Index: DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs
===================================================================
diff -u -r3817 -r3822
--- DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 3817)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 3822)
@@ -24,7 +24,6 @@
using Deltares.DamEngine.Io;
using System.Collections.Generic;
using Deltares.Dam.Data;
-using Deltares.Standard.TestUtils;
using NUnit.Framework;
using Deltares.Dam.TestHelper;
@@ -94,9 +93,10 @@
///
/// Performs test BM04Opdijven01 situation without uplift 1D
///
- [Test, Ignore]
+ [Test]
[Category("Slow")]
- [Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
+ [Category("WorkInProgress")]
+ [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")]
public void BM04Opdrijven01SituatieZonderOpdrijven1D()
{
string cFolderName =
@@ -113,9 +113,10 @@
///
/// Performs test BM04Opdrijven02 situation where uplift occurs 1D
///
- [Test, Ignore]
+ [Test]
[Category("Slow")]
- [Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
+ [Category("WorkInProgress")]
+ [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")]
public void BM04Opdrijven02SituatieMetOpdrijven1D()
{
string cFolderName =
@@ -132,9 +133,10 @@
///
/// Performs test BM04Opdrijven03 situation with a labile equilibirum 1D
///
- [Test, Ignore]
+ [Test]
[Category("Slow")]
- [Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
+ [Category("WorkInProgress")]
+ [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")]
public void BM04Opdrijven03SituatieMetEenLabielEvenwicht1D()
{
string cFolderName =
@@ -151,9 +153,10 @@
///
/// performs test BM04Opdrijven04 situation with an inclined ditch bottom where uplift occurs 1D
///
- [Test, Ignore]
+ [Test]
[Category("Slow")]
- [Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
+ [Category("WorkInProgress")]
+ [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")]
public void BM04Opdrijven04SituatieMetEenSchuineSlootbodemEnOpdrijvenOp1Locatie1D()
{
string cFolderName =
@@ -187,9 +190,10 @@
///
/// Performs test BM04Opdrijven06 situation with uplift on different locations along the 1D profile
///
- [Test, Ignore]
+ [Test]
[Category("Slow")]
- [Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
+ [Category("WorkInProgress")]
+ [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")]
public void BM04Opdrijven06SituatieMetOpdrijvenOpVerschillendeLocatiesLangsHetProfiel1D()
{
string cFolderName =