* Moved the DatabaseTestAttribute to Test.Common, and thus included ref to that in all db tests. *phew*

2009-04-09 16:40:02 +00:00 · 2009-04-09 16:40:02 +00:00 · 5572a00295
parent f44694c28e
commit 5572a00295
38 changed files with 67 additions and 6 deletions
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- a/OpenSim/Tests/Common/DatabaseTestAttribute.cs
+++ b/OpenSim/Tests/Common/DatabaseTestAttribute.cs
@ -3,15 +3,15 @@ using System.Collections.Generic;
 using System.Text;
 using NUnit.Framework;

-namespace OpenSim.Data.Tests
-{   
+namespace OpenSim.Tests.Common
+{
    [AttributeUsage(AttributeTargets.All, 
-                   AllowMultiple=false, 
-                   Inherited=true)]
-    public class DatabaseTestAttribute : CategoryAttribute
+        AllowMultiple=false, 
+        Inherited=true)]
+    public class DatabaseTestAttribute : LongRunningAttribute
    {
        public DatabaseTestAttribute() : base("Database")
        { 
        }
    }
-}
+}
--- a/OpenSim/Tests/Common/LongRunningAttribute.cs
+++ 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)
+        {            
+        }
+    }
+}
--- a/prebuild.xml
+++ b/prebuild.xml
@ -2844,6 +2844,7 @@
      <Reference name="OpenMetaverseTypes.dll"/>
      <Reference name="OpenMetaverse.dll"/>
      <Reference name="MySql.Data.dll"/>
+      <Reference name="OpenSim.Tests.Common"/>
      <Reference name="OpenSim.Data.Tests"/>
      <Reference name="OpenSim.Data.MySQL"/>
      <Reference name="OpenSim.Framework.Console"/>
@ -2878,6 +2879,7 @@
      <Reference name="OpenSim.Data"/>
      <Reference name="OpenSim.Data.NHibernate"/>
      <Reference name="OpenSim.Data.Tests"/>
+      <Reference name="OpenSim.Tests.Common"/>
      <Reference name="OpenSim.Framework.Console"/>
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenMetaverseTypes.dll"/>
@ -2914,6 +2916,7 @@
      <Reference name="System.Data.SQLite.dll"/>
      <Reference name="OpenSim.Data"/>
      <Reference name="OpenSim.Data.Tests"/>
+      <Reference name="OpenSim.Tests.Common"/>
      <Reference name="OpenSim.Data.SQLite" />
      <Reference name="System.Drawing"/>
      <Reference name="OpenSim.Framework"/>
@ -2947,6 +2950,7 @@
      <Reference name="System"/>
      <Reference name="System.Xml"/>
      <Reference name="System.Data"/>
+      <Reference name="OpenMetaverse.dll"/>
      <Reference name="OpenMetaverseTypes.dll"/>
      <Reference name="XMLRPC.dll"/>
      <Reference name="OpenSim.Framework.Console"/>