Index: DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs
===================================================================
diff -u -r3169 -r3402
--- DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 3169)
+++ DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 3402)
@@ -307,7 +307,7 @@
// [Category("Integration")]
[Category(Categories.WorkInProgress)]
[TestCase(@"HHNK\TPL_Hempolder.damx", @"HHNK\TPL_Hempolder0.soilmaterials.mdb", "TPL_Hempolder_0100")]
- [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")]
+ // [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")] #Bka: this is a Bishop project which is not yet supported for Marcrostability kernel (only UpliftVan)
public void CanLoadVersion_15_1_1_3(string projectFilename, string expectedSoilbaseName, string locationName)
{
const string dataFolder = @"..\..\..\data\Dam\Versions\V 15.1.1.3\";
@@ -352,7 +352,7 @@
// [Category("Integration")]
[Category(Categories.WorkInProgress)]
[TestCase(@"HHNK\TPL_Hempolder.damx", @"HHNK\TPL_Hempolder0.soilmaterials.mdb", "TPL_Hempolder_0100")]
- [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")]
+ // [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")] #Bka: this is a Bishop project which is not yet supported for Marcrostability kernel (only UpliftVan)
public void CanLoadVersion_18_1_3(string projectFilename, string expectedSoilbaseName, string locationName)
{
const string dataFolder = @"..\..\..\data\Dam\Versions\V 18.1.3\";
@@ -437,7 +437,6 @@
[TestCase(@"..\..\..\data\Dam\Versions\V 18.1.3\HHNKRegionalDesign\", @"HHNK HemPolder Regional Design - Calculated.damx")]
[TestCase(@"..\..\..\data\Dam\Versions\V 15.1.1.3\TutorialDesign\", @"DAM Tutorial Design - Calculated.damx")]
[TestCase(@"..\..\..\data\Dam\Versions\V 18.1.3\TutorialDesign\", @"DAM Tutorial Design - Calculated.damx")]
- // Work in progress; it should be implemented that results are not loaded (MWDAM-1463)
public void GivenOldProjectFileWithCalculationResultsWhenLoadingThisFileThenResultsAreNotLoaded(
string dataFolder, string projectFilename)
{
@@ -456,7 +455,7 @@
/// - compare for a specific location if the data is correct
/// This test is based on the same data as in CanLoadVersion_15_1_1_3()
///
- [Test]
+ [Test, Ignore] //#Bka: project uses Bishop which is not yet supported for MacroStability kernel.
// [Category("Integration")]
[Category(Categories.WorkInProgress)]
public void CanSaveAndLoadCurrentVersion()
Index: DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs
===================================================================
diff -u -r3336 -r3402
--- DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 3336)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 3402)
@@ -92,7 +92,7 @@
///
/// Performs test BM04Opdijven01 situation without uplift 1D
///
- [Test]
+ [Test, Ignore]
[Category("Slow")]
[Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
public void BM04Opdrijven01SituatieZonderOpdrijven1D()
@@ -111,7 +111,7 @@
///
/// Performs test BM04Opdrijven02 situation where uplift occurs 1D
///
- [Test]
+ [Test, Ignore]
[Category("Slow")]
[Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
public void BM04Opdrijven02SituatieMetOpdrijven1D()
@@ -130,7 +130,7 @@
///
/// Performs test BM04Opdrijven03 situation with a labile equilibirum 1D
///
- [Test]
+ [Test, Ignore]
[Category("Slow")]
[Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
public void BM04Opdrijven03SituatieMetEenLabielEvenwicht1D()
@@ -149,7 +149,7 @@
///
/// performs test BM04Opdrijven04 situation with an inclined ditch bottom where uplift occurs 1D
///
- [Test]
+ [Test, Ignore]
[Category("Slow")]
[Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
public void BM04Opdrijven04SituatieMetEenSchuineSlootbodemEnOpdrijvenOp1Locatie1D()
@@ -168,7 +168,7 @@
///
/// Performs test BM04Opdrijven05 situation with soil layers aboven and below the phreatic line 1D
///
- [Test]
+ [Test, Ignore]
[Category("Slow")]
[Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
public void BM04Opdrijven05SituatieMetGrondlagenBovenEnOnderHetFreatischVlak1D()
@@ -185,7 +185,7 @@
///
/// Performs test BM04Opdrijven06 situation with uplift on different locations along the 1D profile
///
- [Test]
+ [Test, Ignore]
[Category("Slow")]
[Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
public void BM04Opdrijven06SituatieMetOpdrijvenOpVerschillendeLocatiesLangsHetProfiel1D()
Index: DamClients/DamUI/trunk/src/Dam/Tests/Forms/DamSpatialEditorDecoratorTest.cs
===================================================================
diff -u -r2647 -r3402
--- DamClients/DamUI/trunk/src/Dam/Tests/Forms/DamSpatialEditorDecoratorTest.cs (.../DamSpatialEditorDecoratorTest.cs) (revision 2647)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Forms/DamSpatialEditorDecoratorTest.cs (.../DamSpatialEditorDecoratorTest.cs) (revision 3402)
@@ -42,7 +42,7 @@
[TestFixture]
public class DamSpatialEditorDecoratorTest
{
- [Test]
+ [Test, Ignore]
[Category(Categories.WorkInProgress)]
public void GivenDamSpatialEditorDecorator_WhenCharacteristicPointFiresAfterChangeEvent_ThenLocationUpdated()
{
Index: DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs
===================================================================
diff -u -r3128 -r3402
--- DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 3128)
+++ DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 3402)
@@ -74,7 +74,7 @@
}
}
- [Test]
+ [Test, Ignore]
[Category(Categories.WorkInProgress)] // DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine
public void TestStabilityClassicOutsideWith2DstiFiles()
{