diff options
Diffstat (limited to 'OpenSim/Data/Tests/AssetTests.cs')
-rw-r--r-- | OpenSim/Data/Tests/AssetTests.cs | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs index 800b9bf..32f74a9 100644 --- a/OpenSim/Data/Tests/AssetTests.cs +++ b/OpenSim/Data/Tests/AssetTests.cs | |||
@@ -35,10 +35,6 @@ using OpenSim.Framework; | |||
35 | using System.Data.Common; | 35 | using System.Data.Common; |
36 | using log4net; | 36 | using log4net; |
37 | 37 | ||
38 | #if !NUNIT25 | ||
39 | using NUnit.Framework.SyntaxHelpers; | ||
40 | #endif | ||
41 | |||
42 | // DBMS-specific: | 38 | // DBMS-specific: |
43 | using MySql.Data.MySqlClient; | 39 | using MySql.Data.MySqlClient; |
44 | using OpenSim.Data.MySQL; | 40 | using OpenSim.Data.MySQL; |
@@ -51,15 +47,6 @@ using OpenSim.Data.SQLite; | |||
51 | 47 | ||
52 | namespace OpenSim.Data.Tests | 48 | namespace OpenSim.Data.Tests |
53 | { | 49 | { |
54 | |||
55 | #if NUNIT25 | ||
56 | |||
57 | [TestFixture(typeof(MySqlConnection), typeof(MySQLAssetData), Description="Basic Asset store tests (MySQL)")] | ||
58 | [TestFixture(typeof(SqlConnection), typeof(MSSQLAssetData), Description = "Basic Asset store tests (MS SQL Server)")] | ||
59 | [TestFixture(typeof(SqliteConnection), typeof(SQLiteAssetData), Description = "Basic Asset store tests (SQLite)")] | ||
60 | |||
61 | #else | ||
62 | |||
63 | [TestFixture(Description = "Asset store tests (SQLite)")] | 50 | [TestFixture(Description = "Asset store tests (SQLite)")] |
64 | public class SQLiteAssetTests : AssetTests<SqliteConnection, SQLiteAssetData> | 51 | public class SQLiteAssetTests : AssetTests<SqliteConnection, SQLiteAssetData> |
65 | { | 52 | { |
@@ -75,9 +62,6 @@ namespace OpenSim.Data.Tests | |||
75 | { | 62 | { |
76 | } | 63 | } |
77 | 64 | ||
78 | #endif | ||
79 | |||
80 | |||
81 | public class AssetTests<TConn, TAssetData> : BasicDataServiceTest<TConn, TAssetData> | 65 | public class AssetTests<TConn, TAssetData> : BasicDataServiceTest<TConn, TAssetData> |
82 | where TConn : DbConnection, new() | 66 | where TConn : DbConnection, new() |
83 | where TAssetData : AssetDataBase, new() | 67 | where TAssetData : AssetDataBase, new() |
@@ -218,4 +202,4 @@ namespace OpenSim.Data.Tests | |||
218 | Assert.That(a3a, Constraints.PropertyCompareConstraint(a3)); | 202 | Assert.That(a3a, Constraints.PropertyCompareConstraint(a3)); |
219 | } | 203 | } |
220 | } | 204 | } |
221 | } | 205 | } \ No newline at end of file |