Index: DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs
===================================================================
diff -u -r3527 -r3822
--- DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 3527)
+++ DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 3822)
@@ -23,12 +23,10 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
-
using Deltares.Dam.Data;
using Deltares.Dam.TestHelper;
using Deltares.Geotechnics.Soils;
using Deltares.Geotechnics.SurfaceLines;
-using Deltares.Standard.TestUtils;
using KellermanSoftware.CompareNetObjects;
using NUnit.Framework;
@@ -304,8 +302,7 @@
}
[Test]
-// [Category("Integration")]
- [Category(Categories.WorkInProgress)]
+ [Category("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")] #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)
@@ -349,8 +346,7 @@
/// Expected name of the soilbase.
/// Name of the location.
[Test]
-// [Category("Integration")]
- [Category(Categories.WorkInProgress)]
+ [Category("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")] #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)
@@ -455,9 +451,9 @@
/// - 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, Ignore] //#Bka: project uses Bishop which is not yet supported for MacroStability kernel.
-// [Category("Integration")]
- [Category(Categories.WorkInProgress)]
+ [Test]
+ [Category("WorkInProgress")]
+ [Ignore("project uses Bishop which is not yet supported for MacroStability kernel.")]
public void CanSaveAndLoadCurrentVersion()
{
const string projectFilenameHhnk = @"..\..\..\data\Dam\Versions\V 15.1.1.3\HHNKRegionalDesign\HHNK HemPolder Regional Design.damx";