diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/Tests/InventoryTests.cs | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs index 9c2a2d6..758f970 100644 --- a/OpenSim/Data/Tests/InventoryTests.cs +++ b/OpenSim/Data/Tests/InventoryTests.cs | |||
@@ -25,12 +25,9 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | // #define NUNIT25 | ||
29 | |||
30 | using System; | 28 | using System; |
31 | using log4net.Config; | 29 | using log4net.Config; |
32 | using NUnit.Framework; | 30 | using NUnit.Framework; |
33 | using NUnit.Framework.SyntaxHelpers; | ||
34 | using OpenMetaverse; | 31 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
36 | using log4net; | 33 | using log4net; |
@@ -49,14 +46,6 @@ using OpenSim.Data.SQLite; | |||
49 | 46 | ||
50 | namespace OpenSim.Data.Tests | 47 | namespace OpenSim.Data.Tests |
51 | { | 48 | { |
52 | #if NUNIT25 | ||
53 | |||
54 | [TestFixture(typeof(SqliteConnection), typeof(SQLiteInventoryStore), Description = "Inventory store tests (SQLite)")] | ||
55 | [TestFixture(typeof(MySqlConnection), typeof(MySQLInventoryData), Description = "Inventory store tests (MySQL)")] | ||
56 | [TestFixture(typeof(SqlConnection), typeof(MSSQLInventoryData), Description = "Inventory store tests (MS SQL Server)")] | ||
57 | |||
58 | #else | ||
59 | |||
60 | [TestFixture(Description = "Inventory store tests (SQLite)")] | 49 | [TestFixture(Description = "Inventory store tests (SQLite)")] |
61 | public class SQLiteInventoryTests : InventoryTests<SqliteConnection, SQLiteInventoryStore> | 50 | public class SQLiteInventoryTests : InventoryTests<SqliteConnection, SQLiteInventoryStore> |
62 | { | 51 | { |
@@ -71,7 +60,6 @@ namespace OpenSim.Data.Tests | |||
71 | public class MSSQLInventoryTests : InventoryTests<SqlConnection, MSSQLInventoryData> | 60 | public class MSSQLInventoryTests : InventoryTests<SqlConnection, MSSQLInventoryData> |
72 | { | 61 | { |
73 | } | 62 | } |
74 | #endif | ||
75 | 63 | ||
76 | public class InventoryTests<TConn, TInvStore> : BasicDataServiceTest<TConn, TInvStore> | 64 | public class InventoryTests<TConn, TInvStore> : BasicDataServiceTest<TConn, TInvStore> |
77 | where TConn : DbConnection, new() | 65 | where TConn : DbConnection, new() |