From 5572a00295e36e3ee455a4eef9879c4685f3589d Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 9 Apr 2009 16:40:02 +0000 Subject: * Moved the DatabaseTestAttribute to Test.Common, and thus included ref to that in all db tests. *phew* --- OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs | 1 + OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs | 1 + OpenSim/Data/MySQL/Tests/MySQLGridTest.cs | 1 + OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs | 1 + OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs | 1 + OpenSim/Data/MySQL/Tests/MySQLUserTest.cs | 1 + .../NHibernate/Tests/NHibernateMsSqlAssetTest.cs | 1 + .../NHibernate/Tests/NHibernateMsSqlEstateTest.cs | 1 + .../NHibernate/Tests/NHibernateMsSqlGridTest.cs | 1 + .../Tests/NHibernateMsSqlInventoryTest.cs | 1 + .../NHibernate/Tests/NHibernateMsSqlRegionTest.cs | 1 + .../NHibernate/Tests/NHibernateMsSqlUserTest.cs | 1 + .../NHibernate/Tests/NHibernateMySQLAssetTest.cs | 1 + .../NHibernate/Tests/NHibernateMySQLGridTest.cs | 1 + .../Tests/NHibernateMySQLInventoryTest.cs | 1 + .../NHibernate/Tests/NHibernateMySQLRegionTest.cs | 1 + .../NHibernate/Tests/NHibernateMySQLUserTest.cs | 1 + .../NHibernate/Tests/NHibernateMySqlEstateTest.cs | 1 + .../Tests/NHibernatePostgreSQLAssetTest.cs | 1 + .../Tests/NHibernatePostgreSQLEstateTest.cs | 1 + .../Tests/NHibernatePostgreSQLGridTest.cs | 1 + .../Tests/NHibernatePostgreSQLInventoryTest.cs | 1 + .../Tests/NHibernatePostgreSQLRegionTest.cs | 1 + .../Tests/NHibernatePostgreSQLUserTest.cs | 1 + .../NHibernate/Tests/NHibernateSQLiteAssetTest.cs | 1 + .../NHibernate/Tests/NHibernateSQLiteEstateTest.cs | 1 + .../NHibernate/Tests/NHibernateSQLiteGridTest.cs | 1 + .../Tests/NHibernateSQLiteInventoryTest.cs | 1 + .../NHibernate/Tests/NHibernateSQLiteRegionTest.cs | 1 + .../NHibernate/Tests/NHibernateSQLiteUserTest.cs | 1 + OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs | 1 + OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs | 1 + OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | 1 + OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs | 1 + OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs | 1 + OpenSim/Data/Tests/DatabaseTestAttribute.cs | 17 ----------------- OpenSim/Tests/Common/DatabaseTestAttribute.cs | 17 +++++++++++++++++ OpenSim/Tests/Common/LongRunningAttribute.cs | 22 ++++++++++++++++++++++ prebuild.xml | 4 ++++ 39 files changed, 78 insertions(+), 17 deletions(-) delete mode 100644 OpenSim/Data/Tests/DatabaseTestAttribute.cs create mode 100644 OpenSim/Tests/Common/DatabaseTestAttribute.cs create mode 100644 OpenSim/Tests/Common/LongRunningAttribute.cs diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs index ff324e7..fd6f508 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.MySQL.Tests { diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs index a2f0a4c..1f44b4b 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.MySQL.Tests { diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs index a1b973a..23512dc 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.MySQL.Tests { diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs index 298b4fc..f539359 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.MySQL.Tests { diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs index ff64e59..294a80e 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.MySQL.Tests { diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs index 920fcf1..3da06c8 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.MySQL.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs index e60cb5a..66bb8b0 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs index 11c8575..b344bf0 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs index 3f085f3..6fd0b29 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs index 8017f71..e9ca83a 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs index 572ac2c..e04c5fa 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs index 02b0dc8..f78a301 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs index 63fcbc6..8f36a4a 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs index 0915e0d..1503838 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs index 51f8cb1..771ba58 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs index 7417a2a..982f8db 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs index 57c0741..c446c24 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs index af61738..149c01c 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs index 1601121..914fabf 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs index 672a76d..c51aabf 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs index 92f2385..9397f74 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs index 98937bf..9969a8f 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs index 8df0061..4a02bef 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs index aed54cc..bc3c9cd 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs @@ -30,6 +30,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs index 50ad0e9..fd4035d 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs @@ -31,6 +31,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs index e8b3dd3..39e704a 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs @@ -31,6 +31,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs index fad2c7d..0663a16 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs @@ -31,6 +31,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs index 7ec3ccb..e30210d 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs @@ -31,6 +31,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs index a7eb265..56aecc2 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs @@ -31,6 +31,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs index 90958ec..da57518 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs @@ -31,6 +31,7 @@ using NUnit.Framework; using OpenSim.Data.Tests; using log4net; using System.Reflection; +using OpenSim.Tests.Common; namespace OpenSim.Data.NHibernate.Tests { diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs index db21892..7221811 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs @@ -28,6 +28,7 @@ using System.IO; using NUnit.Framework; using OpenSim.Data.Tests; +using OpenSim.Tests.Common; namespace OpenSim.Data.SQLite.Tests { diff --git a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs index dadc2da..9ed9897 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs @@ -28,6 +28,7 @@ using System.IO; using NUnit.Framework; using OpenSim.Data.Tests; +using OpenSim.Tests.Common; namespace OpenSim.Data.SQLite.Tests { diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs index 9c65cd2..a5b2e06 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs @@ -28,6 +28,7 @@ using System.IO; using NUnit.Framework; using OpenSim.Data.Tests; +using OpenSim.Tests.Common; namespace OpenSim.Data.SQLite.Tests { diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs index 2c2dc3c..be17a38 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs @@ -28,6 +28,7 @@ using System.IO; using NUnit.Framework; using OpenSim.Data.Tests; +using OpenSim.Tests.Common; namespace OpenSim.Data.SQLite.Tests { diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs index f074b64..1c0ba71 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs @@ -28,6 +28,7 @@ using System.IO; using NUnit.Framework; using OpenSim.Data.Tests; +using OpenSim.Tests.Common; namespace OpenSim.Data.SQLite.Tests { diff --git a/OpenSim/Data/Tests/DatabaseTestAttribute.cs b/OpenSim/Data/Tests/DatabaseTestAttribute.cs deleted file mode 100644 index b500f40..0000000 --- a/OpenSim/Data/Tests/DatabaseTestAttribute.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using NUnit.Framework; - -namespace OpenSim.Data.Tests -{ - [AttributeUsage(AttributeTargets.All, - AllowMultiple=false, - Inherited=true)] - public class DatabaseTestAttribute : CategoryAttribute - { - public DatabaseTestAttribute() : base("Database") - { - } - } -} diff --git a/OpenSim/Tests/Common/DatabaseTestAttribute.cs b/OpenSim/Tests/Common/DatabaseTestAttribute.cs new file mode 100644 index 0000000..9d21831 --- /dev/null +++ b/OpenSim/Tests/Common/DatabaseTestAttribute.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; +using NUnit.Framework; + +namespace OpenSim.Tests.Common +{ + [AttributeUsage(AttributeTargets.All, + AllowMultiple=false, + Inherited=true)] + public class DatabaseTestAttribute : LongRunningAttribute + { + public DatabaseTestAttribute() : base("Database") + { + } + } +} \ No newline at end of file diff --git a/OpenSim/Tests/Common/LongRunningAttribute.cs b/OpenSim/Tests/Common/LongRunningAttribute.cs new file mode 100644 index 0000000..722217d --- /dev/null +++ b/OpenSim/Tests/Common/LongRunningAttribute.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Text; +using NUnit.Framework; + +namespace OpenSim.Tests.Common +{ + [AttributeUsage(AttributeTargets.All, + AllowMultiple = false, + Inherited = true)] + public class LongRunningAttribute : CategoryAttribute + { + protected LongRunningAttribute() : this("Long Running Test") + { + + } + + protected LongRunningAttribute(string category) : base(category) + { + } + } +} diff --git a/prebuild.xml b/prebuild.xml index 15be54e..067dc8d 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -2844,6 +2844,7 @@ + @@ -2878,6 +2879,7 @@ + @@ -2914,6 +2916,7 @@ + @@ -2947,6 +2950,7 @@ + -- cgit v1.1