diff options
author | lbsa71 | 2009-04-09 06:42:15 +0000 |
---|---|---|
committer | lbsa71 | 2009-04-09 06:42:15 +0000 |
commit | a707fa7bea7deff8adf445bbf2bbd8cff19fcbcf (patch) | |
tree | c71bcf31aefc5ea2ca6d9809c8dc6bc82231fbad /OpenSim | |
parent | SQLite doesn't work on ppc64, so ignore these tests if we are (diff) | |
download | opensim-SC-a707fa7bea7deff8adf445bbf2bbd8cff19fcbcf.zip opensim-SC-a707fa7bea7deff8adf445bbf2bbd8cff19fcbcf.tar.gz opensim-SC-a707fa7bea7deff8adf445bbf2bbd8cff19fcbcf.tar.bz2 opensim-SC-a707fa7bea7deff8adf445bbf2bbd8cff19fcbcf.tar.xz |
* Added custom DatabaseTestAttribute to help separating unit tests from component tests.
Diffstat (limited to 'OpenSim')
31 files changed, 47 insertions, 30 deletions
diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs index 514e04e..ff324e7 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class MySQLAssetTest : BasicAssetTest | 37 | public class MySQLAssetTest : BasicAssetTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs index 2c3980b..e60cb5a 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMsSqlAssetTest : BasicAssetTest | 37 | public class NHibernateMsSqlAssetTest : BasicAssetTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs index 7308a0e..11c8575 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMsSqlEstateTest : BasicEstateTest | 37 | public class NHibernateMsSqlEstateTest : BasicEstateTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs index 2768a9e..3f085f3 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMsSqlGridTest : BasicGridTest | 37 | public class NHibernateMsSqlGridTest : BasicGridTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs index 41c0957..8017f71 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMsSqlInventoryTest : BasicInventoryTest | 37 | public class NHibernateMsSqlInventoryTest : BasicInventoryTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs index beff3b9..572ac2c 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMsSqlRegionTest : BasicRegionTest | 37 | public class NHibernateMsSqlRegionTest : BasicRegionTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs index b09cbe6..02b0dc8 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMsSqlUserTest : BasicUserTest | 37 | public class NHibernateMsSqlUserTest : BasicUserTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs index 17c65d6..63fcbc6 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMySQLAssetTest : BasicAssetTest | 37 | public class NHibernateMySQLAssetTest : BasicAssetTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs index 6f5ed5f..0915e0d 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMySQLGridTest : BasicGridTest | 37 | public class NHibernateMySQLGridTest : BasicGridTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs index a7f5f5a..51f8cb1 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMySQLInventoryTest : BasicInventoryTest | 37 | public class NHibernateMySQLInventoryTest : BasicInventoryTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs index 33faea6..7417a2a 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMySQLRegionTest : BasicRegionTest | 37 | public class NHibernateMySQLRegionTest : BasicRegionTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs index 5554229..57c0741 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMySQLUserTest : BasicUserTest | 37 | public class NHibernateMySQLUserTest : BasicUserTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs index 86b9df6..af61738 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernateMySQLEstateTest : BasicEstateTest | 37 | public class NHibernateMySQLEstateTest : BasicEstateTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs index b51389a..1601121 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernatePostgreSQLAssetTest : BasicAssetTest | 37 | public class NHibernatePostgreSQLAssetTest : BasicAssetTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs index 1edf20a..672a76d 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernatePostgreSQLEstateTest : BasicEstateTest | 37 | public class NHibernatePostgreSQLEstateTest : BasicEstateTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs index a47830d..92f2385 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernatePostgreSQLGridTest : BasicGridTest | 37 | public class NHibernatePostgreSQLGridTest : BasicGridTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs index 6016303..98937bf 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernatePostgreSQLInventoryTest : BasicInventoryTest | 37 | public class NHibernatePostgreSQLInventoryTest : BasicInventoryTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs index 8b4a8f5..8df0061 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernatePostgreSQLRegionTest : BasicRegionTest | 37 | public class NHibernatePostgreSQLRegionTest : BasicRegionTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs index 13d6c69..aed54cc 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class NHibernatePostgreSQLUserTest : BasicUserTest | 37 | public class NHibernatePostgreSQLUserTest : BasicUserTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs index e89a14e..50ad0e9 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs | |||
@@ -34,7 +34,7 @@ using System.Reflection; | |||
34 | 34 | ||
35 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 36 | { |
37 | [TestFixture] | 37 | [TestFixture, DatabaseTest] |
38 | public class NHibernateSQLiteAssetTest : BasicAssetTest | 38 | public class NHibernateSQLiteAssetTest : BasicAssetTest |
39 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs index 23fac9a..e8b3dd3 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs | |||
@@ -34,7 +34,7 @@ using System.Reflection; | |||
34 | 34 | ||
35 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 36 | { |
37 | [TestFixture] | 37 | [TestFixture, DatabaseTest] |
38 | public class NHibernateSQLiteEstateTest : BasicEstateTest | 38 | public class NHibernateSQLiteEstateTest : BasicEstateTest |
39 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs index 2c3d4de..fad2c7d 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs | |||
@@ -34,7 +34,7 @@ using System.Reflection; | |||
34 | 34 | ||
35 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 36 | { |
37 | [TestFixture] | 37 | [TestFixture, DatabaseTest] |
38 | public class NHibernateSQLiteGridTest : BasicGridTest | 38 | public class NHibernateSQLiteGridTest : BasicGridTest |
39 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs index adccd12..7ec3ccb 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs | |||
@@ -34,7 +34,7 @@ using System.Reflection; | |||
34 | 34 | ||
35 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 36 | { |
37 | [TestFixture] | 37 | [TestFixture, DatabaseTest] |
38 | public class NHibernateSQLiteInventoryTest : BasicInventoryTest | 38 | public class NHibernateSQLiteInventoryTest : BasicInventoryTest |
39 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs index 83f4d36..a7eb265 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs | |||
@@ -34,7 +34,7 @@ using System.Reflection; | |||
34 | 34 | ||
35 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 36 | { |
37 | [TestFixture] | 37 | [TestFixture, DatabaseTest] |
38 | public class NHibernateSQLiteRegionTest : BasicRegionTest | 38 | public class NHibernateSQLiteRegionTest : BasicRegionTest |
39 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs index a742c8e..90958ec 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs | |||
@@ -35,7 +35,7 @@ using System.Reflection; | |||
35 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 36 | { |
37 | 37 | ||
38 | [TestFixture] | 38 | [TestFixture, DatabaseTest] |
39 | public class NHibernateSQLiteUserTest : BasicUserTest | 39 | public class NHibernateSQLiteUserTest : BasicUserTest |
40 | { | 40 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs index f299c91..db21892 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs | |||
@@ -31,7 +31,7 @@ using OpenSim.Data.Tests; | |||
31 | 31 | ||
32 | namespace OpenSim.Data.SQLite.Tests | 32 | namespace OpenSim.Data.SQLite.Tests |
33 | { | 33 | { |
34 | [TestFixture] | 34 | [TestFixture, DatabaseTest] |
35 | public class SQLiteAssetTest : BasicAssetTest | 35 | public class SQLiteAssetTest : BasicAssetTest |
36 | { | 36 | { |
37 | public string file; | 37 | public string file; |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs index 17d52c3..dadc2da 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs | |||
@@ -31,7 +31,7 @@ using OpenSim.Data.Tests; | |||
31 | 31 | ||
32 | namespace OpenSim.Data.SQLite.Tests | 32 | namespace OpenSim.Data.SQLite.Tests |
33 | { | 33 | { |
34 | [TestFixture] | 34 | [TestFixture, DatabaseTest] |
35 | public class SQLiteEstateTest : BasicEstateTest | 35 | public class SQLiteEstateTest : BasicEstateTest |
36 | { | 36 | { |
37 | public string file = "regiontest.db"; | 37 | public string file = "regiontest.db"; |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs index ae360f1..9c65cd2 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | |||
@@ -31,7 +31,7 @@ using OpenSim.Data.Tests; | |||
31 | 31 | ||
32 | namespace OpenSim.Data.SQLite.Tests | 32 | namespace OpenSim.Data.SQLite.Tests |
33 | { | 33 | { |
34 | [TestFixture] | 34 | [TestFixture, DatabaseTest] |
35 | public class SQLiteInventoryTest : BasicInventoryTest | 35 | public class SQLiteInventoryTest : BasicInventoryTest |
36 | { | 36 | { |
37 | public string file; | 37 | public string file; |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs index 48f3cbb..2c2dc3c 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs | |||
@@ -31,7 +31,7 @@ using OpenSim.Data.Tests; | |||
31 | 31 | ||
32 | namespace OpenSim.Data.SQLite.Tests | 32 | namespace OpenSim.Data.SQLite.Tests |
33 | { | 33 | { |
34 | [TestFixture] | 34 | [TestFixture, DatabaseTest] |
35 | public class SQLiteRegionTest : BasicRegionTest | 35 | public class SQLiteRegionTest : BasicRegionTest |
36 | { | 36 | { |
37 | public string file = "regiontest.db"; | 37 | public string file = "regiontest.db"; |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs index 3f8c049..f074b64 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs | |||
@@ -31,7 +31,7 @@ using OpenSim.Data.Tests; | |||
31 | 31 | ||
32 | namespace OpenSim.Data.SQLite.Tests | 32 | namespace OpenSim.Data.SQLite.Tests |
33 | { | 33 | { |
34 | [TestFixture] | 34 | [TestFixture, DatabaseTest] |
35 | public class SQLiteUserTest : BasicUserTest | 35 | public class SQLiteUserTest : BasicUserTest |
36 | { | 36 | { |
37 | public string file; | 37 | public string file; |
diff --git a/OpenSim/Data/Tests/DatabaseTestAttribute.cs b/OpenSim/Data/Tests/DatabaseTestAttribute.cs new file mode 100644 index 0000000..b500f40 --- /dev/null +++ b/OpenSim/Data/Tests/DatabaseTestAttribute.cs | |||
@@ -0,0 +1,17 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using NUnit.Framework; | ||
5 | |||
6 | namespace OpenSim.Data.Tests | ||
7 | { | ||
8 | [AttributeUsage(AttributeTargets.All, | ||
9 | AllowMultiple=false, | ||
10 | Inherited=true)] | ||
11 | public class DatabaseTestAttribute : CategoryAttribute | ||
12 | { | ||
13 | public DatabaseTestAttribute() : base("Database") | ||
14 | { | ||
15 | } | ||
16 | } | ||
17 | } | ||