diff options
author | lbsa71 | 2009-04-09 16:40:02 +0000 |
---|---|---|
committer | lbsa71 | 2009-04-09 16:40:02 +0000 |
commit | 5572a00295e36e3ee455a4eef9879c4685f3589d (patch) | |
tree | f0c2d7b2f417a100fcb2e5c9cccec051d1684e09 | |
parent | * Allows MRMs to import libraries in the OpenSim bin directory. (diff) | |
download | opensim-SC-5572a00295e36e3ee455a4eef9879c4685f3589d.zip opensim-SC-5572a00295e36e3ee455a4eef9879c4685f3589d.tar.gz opensim-SC-5572a00295e36e3ee455a4eef9879c4685f3589d.tar.bz2 opensim-SC-5572a00295e36e3ee455a4eef9879c4685f3589d.tar.xz |
* Moved the DatabaseTestAttribute to Test.Common, and thus included ref to that in all db tests. *phew*
38 files changed, 67 insertions, 6 deletions
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 35 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 35 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 35 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 35 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 35 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 35 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Tests.Common; | ||
33 | 34 | ||
34 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
35 | { | 36 | { |
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; | |||
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | 32 | using log4net; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenSim.Tests.Common; | ||
34 | 35 | ||
35 | namespace OpenSim.Data.NHibernate.Tests | 36 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 37 | { |
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; | |||
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | 32 | using log4net; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenSim.Tests.Common; | ||
34 | 35 | ||
35 | namespace OpenSim.Data.NHibernate.Tests | 36 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 37 | { |
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; | |||
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | 32 | using log4net; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenSim.Tests.Common; | ||
34 | 35 | ||
35 | namespace OpenSim.Data.NHibernate.Tests | 36 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 37 | { |
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; | |||
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | 32 | using log4net; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenSim.Tests.Common; | ||
34 | 35 | ||
35 | namespace OpenSim.Data.NHibernate.Tests | 36 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 37 | { |
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; | |||
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | 32 | using log4net; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenSim.Tests.Common; | ||
34 | 35 | ||
35 | namespace OpenSim.Data.NHibernate.Tests | 36 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 37 | { |
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; | |||
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | 32 | using log4net; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenSim.Tests.Common; | ||
34 | 35 | ||
35 | namespace OpenSim.Data.NHibernate.Tests | 36 | namespace OpenSim.Data.NHibernate.Tests |
36 | { | 37 | { |
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 @@ | |||
28 | using System.IO; | 28 | using System.IO; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using OpenSim.Tests.Common; | ||
31 | 32 | ||
32 | namespace OpenSim.Data.SQLite.Tests | 33 | namespace OpenSim.Data.SQLite.Tests |
33 | { | 34 | { |
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 @@ | |||
28 | using System.IO; | 28 | using System.IO; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using OpenSim.Tests.Common; | ||
31 | 32 | ||
32 | namespace OpenSim.Data.SQLite.Tests | 33 | namespace OpenSim.Data.SQLite.Tests |
33 | { | 34 | { |
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 @@ | |||
28 | using System.IO; | 28 | using System.IO; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using OpenSim.Tests.Common; | ||
31 | 32 | ||
32 | namespace OpenSim.Data.SQLite.Tests | 33 | namespace OpenSim.Data.SQLite.Tests |
33 | { | 34 | { |
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 @@ | |||
28 | using System.IO; | 28 | using System.IO; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using OpenSim.Tests.Common; | ||
31 | 32 | ||
32 | namespace OpenSim.Data.SQLite.Tests | 33 | namespace OpenSim.Data.SQLite.Tests |
33 | { | 34 | { |
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 @@ | |||
28 | using System.IO; | 28 | using System.IO; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using OpenSim.Tests.Common; | ||
31 | 32 | ||
32 | namespace OpenSim.Data.SQLite.Tests | 33 | namespace OpenSim.Data.SQLite.Tests |
33 | { | 34 | { |
diff --git a/OpenSim/Data/Tests/DatabaseTestAttribute.cs b/OpenSim/Tests/Common/DatabaseTestAttribute.cs index b500f40..9d21831 100644 --- a/OpenSim/Data/Tests/DatabaseTestAttribute.cs +++ b/OpenSim/Tests/Common/DatabaseTestAttribute.cs | |||
@@ -3,15 +3,15 @@ using System.Collections.Generic; | |||
3 | using System.Text; | 3 | using System.Text; |
4 | using NUnit.Framework; | 4 | using NUnit.Framework; |
5 | 5 | ||
6 | namespace OpenSim.Data.Tests | 6 | namespace OpenSim.Tests.Common |
7 | { | 7 | { |
8 | [AttributeUsage(AttributeTargets.All, | 8 | [AttributeUsage(AttributeTargets.All, |
9 | AllowMultiple=false, | 9 | AllowMultiple=false, |
10 | Inherited=true)] | 10 | Inherited=true)] |
11 | public class DatabaseTestAttribute : CategoryAttribute | 11 | public class DatabaseTestAttribute : LongRunningAttribute |
12 | { | 12 | { |
13 | public DatabaseTestAttribute() : base("Database") | 13 | public DatabaseTestAttribute() : base("Database") |
14 | { | 14 | { |
15 | } | 15 | } |
16 | } | 16 | } |
17 | } | 17 | } \ 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 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using NUnit.Framework; | ||
5 | |||
6 | namespace OpenSim.Tests.Common | ||
7 | { | ||
8 | [AttributeUsage(AttributeTargets.All, | ||
9 | AllowMultiple = false, | ||
10 | Inherited = true)] | ||
11 | public class LongRunningAttribute : CategoryAttribute | ||
12 | { | ||
13 | protected LongRunningAttribute() : this("Long Running Test") | ||
14 | { | ||
15 | |||
16 | } | ||
17 | |||
18 | protected LongRunningAttribute(string category) : base(category) | ||
19 | { | ||
20 | } | ||
21 | } | ||
22 | } | ||
diff --git a/prebuild.xml b/prebuild.xml index 15be54e..067dc8d 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -2844,6 +2844,7 @@ | |||
2844 | <Reference name="OpenMetaverseTypes.dll"/> | 2844 | <Reference name="OpenMetaverseTypes.dll"/> |
2845 | <Reference name="OpenMetaverse.dll"/> | 2845 | <Reference name="OpenMetaverse.dll"/> |
2846 | <Reference name="MySql.Data.dll"/> | 2846 | <Reference name="MySql.Data.dll"/> |
2847 | <Reference name="OpenSim.Tests.Common"/> | ||
2847 | <Reference name="OpenSim.Data.Tests"/> | 2848 | <Reference name="OpenSim.Data.Tests"/> |
2848 | <Reference name="OpenSim.Data.MySQL"/> | 2849 | <Reference name="OpenSim.Data.MySQL"/> |
2849 | <Reference name="OpenSim.Framework.Console"/> | 2850 | <Reference name="OpenSim.Framework.Console"/> |
@@ -2878,6 +2879,7 @@ | |||
2878 | <Reference name="OpenSim.Data"/> | 2879 | <Reference name="OpenSim.Data"/> |
2879 | <Reference name="OpenSim.Data.NHibernate"/> | 2880 | <Reference name="OpenSim.Data.NHibernate"/> |
2880 | <Reference name="OpenSim.Data.Tests"/> | 2881 | <Reference name="OpenSim.Data.Tests"/> |
2882 | <Reference name="OpenSim.Tests.Common"/> | ||
2881 | <Reference name="OpenSim.Framework.Console"/> | 2883 | <Reference name="OpenSim.Framework.Console"/> |
2882 | <Reference name="OpenSim.Region.Framework"/> | 2884 | <Reference name="OpenSim.Region.Framework"/> |
2883 | <Reference name="OpenMetaverseTypes.dll"/> | 2885 | <Reference name="OpenMetaverseTypes.dll"/> |
@@ -2914,6 +2916,7 @@ | |||
2914 | <Reference name="System.Data.SQLite.dll"/> | 2916 | <Reference name="System.Data.SQLite.dll"/> |
2915 | <Reference name="OpenSim.Data"/> | 2917 | <Reference name="OpenSim.Data"/> |
2916 | <Reference name="OpenSim.Data.Tests"/> | 2918 | <Reference name="OpenSim.Data.Tests"/> |
2919 | <Reference name="OpenSim.Tests.Common"/> | ||
2917 | <Reference name="OpenSim.Data.SQLite" /> | 2920 | <Reference name="OpenSim.Data.SQLite" /> |
2918 | <Reference name="System.Drawing"/> | 2921 | <Reference name="System.Drawing"/> |
2919 | <Reference name="OpenSim.Framework"/> | 2922 | <Reference name="OpenSim.Framework"/> |
@@ -2947,6 +2950,7 @@ | |||
2947 | <Reference name="System"/> | 2950 | <Reference name="System"/> |
2948 | <Reference name="System.Xml"/> | 2951 | <Reference name="System.Xml"/> |
2949 | <Reference name="System.Data"/> | 2952 | <Reference name="System.Data"/> |
2953 | <Reference name="OpenMetaverse.dll"/> | ||
2950 | <Reference name="OpenMetaverseTypes.dll"/> | 2954 | <Reference name="OpenMetaverseTypes.dll"/> |
2951 | <Reference name="XMLRPC.dll"/> | 2955 | <Reference name="XMLRPC.dll"/> |
2952 | <Reference name="OpenSim.Framework.Console"/> | 2956 | <Reference name="OpenSim.Framework.Console"/> |