Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.

This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.

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;
 using System.Data.Common;
 using log4net;
 
-#if !NUNIT25
-using NUnit.Framework.SyntaxHelpers;
-#endif
-
 // DBMS-specific:
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
@@ -51,15 +47,6 @@ using OpenSim.Data.SQLite;
 
 namespace OpenSim.Data.Tests
 {
-
-#if NUNIT25
-
-    [TestFixture(typeof(MySqlConnection), typeof(MySQLAssetData), Description="Basic Asset store tests (MySQL)")]
-    [TestFixture(typeof(SqlConnection), typeof(MSSQLAssetData), Description = "Basic Asset store tests (MS SQL Server)")]
-    [TestFixture(typeof(SqliteConnection), typeof(SQLiteAssetData), Description = "Basic Asset store tests (SQLite)")]
-
-#else
-
     [TestFixture(Description = "Asset store tests (SQLite)")]
     public class SQLiteAssetTests : AssetTests<SqliteConnection, SQLiteAssetData>
     {
@@ -75,9 +62,6 @@ namespace OpenSim.Data.Tests
     {
     }
 
-#endif
-
-
     public class AssetTests<TConn, TAssetData> : BasicDataServiceTest<TConn, TAssetData>
         where TConn : DbConnection, new()
         where TAssetData : AssetDataBase, new()
@@ -218,4 +202,4 @@ namespace OpenSim.Data.Tests
             Assert.That(a3a, Constraints.PropertyCompareConstraint(a3));
         }
     }
-}
+}
\ No newline at end of file