diff options
Diffstat (limited to 'OpenSim/Data/Tests/EstateTests.cs')
-rw-r--r-- | OpenSim/Data/Tests/EstateTests.cs | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs index fbf8ba6..3354e28 100644 --- a/OpenSim/Data/Tests/EstateTests.cs +++ b/OpenSim/Data/Tests/EstateTests.cs | |||
@@ -28,7 +28,6 @@ | |||
28 | using System; | 28 | using System; |
29 | using log4net.Config; | 29 | using log4net.Config; |
30 | using NUnit.Framework; | 30 | using NUnit.Framework; |
31 | using NUnit.Framework.SyntaxHelpers; | ||
32 | using OpenMetaverse; | 31 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
34 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
@@ -49,15 +48,6 @@ using OpenSim.Data.SQLite; | |||
49 | 48 | ||
50 | namespace OpenSim.Data.Tests | 49 | namespace OpenSim.Data.Tests |
51 | { | 50 | { |
52 | |||
53 | #if NUNIT25 | ||
54 | |||
55 | [TestFixture(typeof(MySqlConnection), typeof(MySQLEstateStore), Description = "Estate store tests (MySQL)")] | ||
56 | [TestFixture(typeof(SqlConnection), typeof(MSSQLEstateStore), Description = "Estate store tests (MS SQL Server)")] | ||
57 | [TestFixture(typeof(SqliteConnection), typeof(SQLiteEstateStore), Description = "Estate store tests (SQLite)")] | ||
58 | |||
59 | #else | ||
60 | |||
61 | [TestFixture(Description = "Estate store tests (SQLite)")] | 51 | [TestFixture(Description = "Estate store tests (SQLite)")] |
62 | public class SQLiteEstateTests : EstateTests<SqliteConnection, SQLiteEstateStore> | 52 | public class SQLiteEstateTests : EstateTests<SqliteConnection, SQLiteEstateStore> |
63 | { | 53 | { |
@@ -73,8 +63,6 @@ namespace OpenSim.Data.Tests | |||
73 | { | 63 | { |
74 | } | 64 | } |
75 | 65 | ||
76 | #endif | ||
77 | |||
78 | public class EstateTests<TConn, TEstateStore> : BasicDataServiceTest<TConn, TEstateStore> | 66 | public class EstateTests<TConn, TEstateStore> : BasicDataServiceTest<TConn, TEstateStore> |
79 | where TConn : DbConnection, new() | 67 | where TConn : DbConnection, new() |
80 | where TEstateStore : class, IEstateDataStore, new() | 68 | where TEstateStore : class, IEstateDataStore, new() |
@@ -520,6 +508,5 @@ namespace OpenSim.Data.Tests | |||
520 | } | 508 | } |
521 | 509 | ||
522 | #endregion | 510 | #endregion |
523 | |||
524 | } | 511 | } |
525 | } | 512 | } \ No newline at end of file |