From bb171717ceaef37b022a135209c2e0bf031d21f9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Feb 2010 15:38:52 -0800
Subject: Deleted obsolete files in the Data layer. Compiles.
---
OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs | 22 ++++--
OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs | 54 +++++++++------
OpenSim/Data/MySQL/Tests/MySQLGridTest.cs | 94 --------------------------
OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs | 30 +++++---
OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs | 53 +++++++++------
OpenSim/Data/MySQL/Tests/MySQLUserTest.cs | 85 -----------------------
6 files changed, 103 insertions(+), 235 deletions(-)
delete mode 100644 OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
delete mode 100644 OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
(limited to 'OpenSim/Data/MySQL/Tests')
diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
index e1d3f81..a46fdf8 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
@@ -31,6 +31,7 @@ using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
using OpenSim.Tests.Common;
+using MySql.Data.MySqlClient;
namespace OpenSim.Data.MySQL.Tests
{
@@ -39,7 +40,7 @@ namespace OpenSim.Data.MySQL.Tests
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
- public MySQLManager database;
+ private string m_connectionString;
public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
[TestFixtureSetUp]
@@ -52,7 +53,6 @@ namespace OpenSim.Data.MySQL.Tests
// tests.
try
{
- database = new MySQLManager(connect);
db = new MySQLAssetData();
db.Initialise(connect);
}
@@ -70,10 +70,22 @@ namespace OpenSim.Data.MySQL.Tests
{
db.Dispose();
}
- if (database != null)
+ ExecuteSql("drop table migrations");
+ ExecuteSql("drop table assets");
+ }
+
+ ///
+ /// Execute a MySqlCommand
+ ///
+ /// sql string to execute
+ private void ExecuteSql(string sql)
+ {
+ using (MySqlConnection dbcon = new MySqlConnection(connect))
{
- database.ExecuteSql("drop table migrations");
- database.ExecuteSql("drop table assets");
+ dbcon.Open();
+
+ MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+ cmd.ExecuteNonQuery();
}
}
}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
index 48486b1..01afcae 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
@@ -31,6 +31,8 @@ using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
using OpenSim.Tests.Common;
+using MySql.Data.MySqlClient;
+
namespace OpenSim.Data.MySQL.Tests
{
@@ -39,7 +41,6 @@ namespace OpenSim.Data.MySQL.Tests
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
- public MySQLManager database;
public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
[TestFixtureSetUp]
@@ -52,9 +53,8 @@ namespace OpenSim.Data.MySQL.Tests
// tests.
try
{
- database = new MySQLManager(connect);
// clear db incase to ensure we are in a clean state
- ClearDB(database);
+ ClearDB();
regionDb = new MySQLDataStore();
regionDb.Initialise(connect);
@@ -75,29 +75,41 @@ namespace OpenSim.Data.MySQL.Tests
{
regionDb.Dispose();
}
- ClearDB(database);
+ ClearDB();
}
- private void ClearDB(MySQLManager manager)
+ private void ClearDB()
{
// if a new table is added, it has to be dropped here
- if (manager != null)
+ ExecuteSql("drop table if exists migrations");
+ ExecuteSql("drop table if exists prims");
+ ExecuteSql("drop table if exists primshapes");
+ ExecuteSql("drop table if exists primitems");
+ ExecuteSql("drop table if exists terrain");
+ ExecuteSql("drop table if exists land");
+ ExecuteSql("drop table if exists landaccesslist");
+ ExecuteSql("drop table if exists regionban");
+ ExecuteSql("drop table if exists regionsettings");
+ ExecuteSql("drop table if exists estate_managers");
+ ExecuteSql("drop table if exists estate_groups");
+ ExecuteSql("drop table if exists estate_users");
+ ExecuteSql("drop table if exists estateban");
+ ExecuteSql("drop table if exists estate_settings");
+ ExecuteSql("drop table if exists estate_map");
+ }
+
+ ///
+ /// Execute a MySqlCommand
+ ///
+ /// sql string to execute
+ private void ExecuteSql(string sql)
+ {
+ using (MySqlConnection dbcon = new MySqlConnection(connect))
{
- manager.ExecuteSql("drop table if exists migrations");
- manager.ExecuteSql("drop table if exists prims");
- manager.ExecuteSql("drop table if exists primshapes");
- manager.ExecuteSql("drop table if exists primitems");
- manager.ExecuteSql("drop table if exists terrain");
- manager.ExecuteSql("drop table if exists land");
- manager.ExecuteSql("drop table if exists landaccesslist");
- manager.ExecuteSql("drop table if exists regionban");
- manager.ExecuteSql("drop table if exists regionsettings");
- manager.ExecuteSql("drop table if exists estate_managers");
- manager.ExecuteSql("drop table if exists estate_groups");
- manager.ExecuteSql("drop table if exists estate_users");
- manager.ExecuteSql("drop table if exists estateban");
- manager.ExecuteSql("drop table if exists estate_settings");
- manager.ExecuteSql("drop table if exists estate_map");
+ dbcon.Open();
+
+ MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+ cmd.ExecuteNonQuery();
}
}
}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
deleted file mode 100644
index 8272316..0000000
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-using MySql.Data.MySqlClient;
-
-namespace OpenSim.Data.MySQL.Tests
-{
- [TestFixture, DatabaseTest]
- public class MySQLGridTest : BasicGridTest
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- public string file;
- public MySQLManager database;
- public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
-
- [TestFixtureSetUp]
- public void Init()
- {
- SuperInit();
- // If we manage to connect to the database with the user
- // and password above it is our test database, and run
- // these tests. If anything goes wrong, ignore these
- // tests.
- try
- {
- database = new MySQLManager(connect);
- db = new MySQLGridData();
- db.Initialise(connect);
- }
- catch (Exception e)
- {
- m_log.Error("Exception {0}", e);
- Assert.Ignore();
- }
-
- // This actually does the roll forward assembly stuff
- Assembly assem = GetType().Assembly;
-
- using (MySqlConnection dbcon = new MySqlConnection(connect))
- {
- dbcon.Open();
- Migration m = new Migration(dbcon, assem, "AssetStore");
- m.Update();
- }
- }
-
- [TestFixtureTearDown]
- public void Cleanup()
- {
- m_log.Warn("Cleaning up.");
- if (db != null)
- {
- db.Dispose();
- }
- // if a new table is added, it has to be dropped here
- if (database != null)
- {
- database.ExecuteSql("drop table migrations");
- database.ExecuteSql("drop table regions");
- }
- }
- }
-}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
index a3a32dc..4575493 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -31,6 +31,8 @@ using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
using OpenSim.Tests.Common;
+using MySql.Data.MySqlClient;
+
namespace OpenSim.Data.MySQL.Tests
{
@@ -39,7 +41,6 @@ namespace OpenSim.Data.MySQL.Tests
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
- public MySQLManager database;
public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
[TestFixtureSetUp]
@@ -52,7 +53,6 @@ namespace OpenSim.Data.MySQL.Tests
// tests.
try
{
- database = new MySQLManager(connect);
DropTables();
db = new MySQLInventoryData();
db.Initialise(connect);
@@ -71,17 +71,29 @@ namespace OpenSim.Data.MySQL.Tests
{
db.Dispose();
}
- if (database != null)
- {
- DropTables();
- }
+ DropTables();
}
private void DropTables()
{
- database.ExecuteSql("drop table IF EXISTS inventoryitems");
- database.ExecuteSql("drop table IF EXISTS inventoryfolders");
- database.ExecuteSql("drop table IF EXISTS migrations");
+ ExecuteSql("drop table IF EXISTS inventoryitems");
+ ExecuteSql("drop table IF EXISTS inventoryfolders");
+ ExecuteSql("drop table IF EXISTS migrations");
+ }
+
+ ///
+ /// Execute a MySqlCommand
+ ///
+ /// sql string to execute
+ private void ExecuteSql(string sql)
+ {
+ using (MySqlConnection dbcon = new MySqlConnection(connect))
+ {
+ dbcon.Open();
+
+ MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+ cmd.ExecuteNonQuery();
+ }
}
}
}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
index 0dc8b7d..e7e57e4 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
@@ -31,6 +31,7 @@ using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
using OpenSim.Tests.Common;
+using MySql.Data.MySqlClient;
namespace OpenSim.Data.MySQL.Tests
{
@@ -39,7 +40,6 @@ namespace OpenSim.Data.MySQL.Tests
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
- public MySQLManager database;
public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
[TestFixtureSetUp]
@@ -52,9 +52,8 @@ namespace OpenSim.Data.MySQL.Tests
// tests.
try
{
- database = new MySQLManager(connect);
// this is important in case a previous run ended badly
- ClearDB(database);
+ ClearDB();
db = new MySQLDataStore();
db.Initialise(connect);
@@ -73,28 +72,40 @@ namespace OpenSim.Data.MySQL.Tests
{
db.Dispose();
}
- ClearDB(database);
+ ClearDB();
}
- private void ClearDB(MySQLManager manager)
+ private void ClearDB()
{
- if (manager != null)
+ ExecuteSql("drop table if exists migrations");
+ ExecuteSql("drop table if exists prims");
+ ExecuteSql("drop table if exists primshapes");
+ ExecuteSql("drop table if exists primitems");
+ ExecuteSql("drop table if exists terrain");
+ ExecuteSql("drop table if exists land");
+ ExecuteSql("drop table if exists landaccesslist");
+ ExecuteSql("drop table if exists regionban");
+ ExecuteSql("drop table if exists regionsettings");
+ ExecuteSql("drop table if exists estate_managers");
+ ExecuteSql("drop table if exists estate_groups");
+ ExecuteSql("drop table if exists estate_users");
+ ExecuteSql("drop table if exists estateban");
+ ExecuteSql("drop table if exists estate_settings");
+ ExecuteSql("drop table if exists estate_map");
+ }
+
+ ///
+ /// Execute a MySqlCommand
+ ///
+ /// sql string to execute
+ private void ExecuteSql(string sql)
+ {
+ using (MySqlConnection dbcon = new MySqlConnection(connect))
{
- manager.ExecuteSql("drop table if exists migrations");
- manager.ExecuteSql("drop table if exists prims");
- manager.ExecuteSql("drop table if exists primshapes");
- manager.ExecuteSql("drop table if exists primitems");
- manager.ExecuteSql("drop table if exists terrain");
- manager.ExecuteSql("drop table if exists land");
- manager.ExecuteSql("drop table if exists landaccesslist");
- manager.ExecuteSql("drop table if exists regionban");
- manager.ExecuteSql("drop table if exists regionsettings");
- manager.ExecuteSql("drop table if exists estate_managers");
- manager.ExecuteSql("drop table if exists estate_groups");
- manager.ExecuteSql("drop table if exists estate_users");
- manager.ExecuteSql("drop table if exists estateban");
- manager.ExecuteSql("drop table if exists estate_settings");
- manager.ExecuteSql("drop table if exists estate_map");
+ dbcon.Open();
+
+ MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+ cmd.ExecuteNonQuery();
}
}
}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
deleted file mode 100644
index cf8139a..0000000
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.MySQL.Tests
-{
- [TestFixture, DatabaseTest]
- public class MySQLUserTest : BasicUserTest
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- public string file;
- public MySQLManager database;
- public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
-
- [TestFixtureSetUp]
- public void Init()
- {
- SuperInit();
- // If we manage to connect to the database with the user
- // and password above it is our test database, and run
- // these tests. If anything goes wrong, ignore these
- // tests.
- try
- {
- database = new MySQLManager(connect);
- db = new MySQLUserData();
- db.Initialise(connect);
- }
- catch (Exception e)
- {
- m_log.Error("Exception {0}", e);
- Assert.Ignore();
- }
- }
-
- [TestFixtureTearDown]
- public void Cleanup()
- {
- if (db != null)
- {
- db.Dispose();
- }
- // if a new table is added, it has to be dropped here
- if (database != null)
- {
- database.ExecuteSql("drop table migrations");
- database.ExecuteSql("drop table users");
- database.ExecuteSql("drop table userfriends");
- database.ExecuteSql("drop table agents");
- database.ExecuteSql("drop table avatarappearance");
- database.ExecuteSql("drop table avatarattachments");
- }
- }
- }
-}
--
cgit v1.1