ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 03:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:

Browse Source 
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
This commit is contained in:
Charles Krinke
2009-02-22 20:52:55 +00:00
parent 913654f2c9
commit 8f55b9d735
117 changed files with 580 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Data/MSSQL/MSSQLLogData.cs
View File

@@ -112,8 +112,7 @@ namespace OpenSim.Data.MSSQL
catch (Exception e)
{
//Are we not in a loop here
//m_log.Error(e.ToString());
Console.WriteLine("[LOG DB] Error logging : " + e.Message);
m_log.Error("[LOG DB] Error logging : " + e.Message);
}
}
}

2
OpenSim/Data/MySQL/MySQLManager.cs
View File

@@ -1030,7 +1030,6 @@ namespace OpenSim.Data.MySQL
{
IDbCommand result = Query(sql, parameters);
//Console.WriteLine(result.CommandText);
// int x;
// if ((x = result.ExecuteNonQuery()) > 0)
// {
@@ -1123,7 +1122,6 @@ namespace OpenSim.Data.MySQL
{
IDbCommand result = Query(sql, parameters);
//Console.WriteLine(result.CommandText);
// int x;
// if ((x = result.ExecuteNonQuery()) > 0)
// {

7
OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
public class MySQLAssetTest : BasicAssetTest
{
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;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -73,4 +76,4 @@ namespace OpenSim.Data.MySQL.Tests
}
}
}
}
}

5
OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
public class MySQLEstateTest : BasicEstateTest
{
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;";
@@ -56,7 +59,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error("Exception {0}", e);
Assert.Ignore();
}
}

8
OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
View File

@@ -28,12 +28,16 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
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;";
@@ -54,7 +58,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error("Exception {0}", e);
Assert.Ignore();
}
}
@@ -73,4 +77,4 @@ namespace OpenSim.Data.MySQL.Tests
}
}
}
}
}

5
OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
public class MySQLInventoryTest : BasicInventoryTest
{
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;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error("Exception {0}", e);
Assert.Ignore();
}
}

7
OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
public class MySQLRegionTest : BasicRegionTest
{
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;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error("Exception {0}", e);
Assert.Ignore();
}
}
@@ -87,4 +90,4 @@ namespace OpenSim.Data.MySQL.Tests
}
}
}
}
}

7
OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
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;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error("Exception {0}", e);
Assert.Ignore();
}
}
@@ -78,4 +81,4 @@ namespace OpenSim.Data.MySQL.Tests
}
}
}
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMsSqlAssetTest : BasicAssetTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -74,4 +77,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}

5
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMsSqlEstateTest : BasicEstateTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMsSqlGridTest : BasicGridTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}
}

5
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMsSqlInventoryTest : BasicInventoryTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMsSqlRegionTest : BasicRegionTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -74,4 +77,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMsSqlUserTest : BasicUserTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMySQLAssetTest : BasicAssetTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMySQLGridTest : BasicGridTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}
}

5
OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMySQLInventoryTest : BasicInventoryTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMySQLRegionTest : BasicRegionTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -74,4 +77,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMySQLUserTest : BasicUserTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}
}

5
OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateMySQLEstateTest : BasicEstateTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernatePostgreSQLAssetTest : BasicAssetTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}

5
OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernatePostgreSQLEstateTest : BasicEstateTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernatePostgreSQLGridTest : BasicGridTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}
}

5
OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernatePostgreSQLInventoryTest : BasicInventoryTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernatePostgreSQLRegionTest : BasicRegionTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernatePostgreSQLUserTest : BasicUserTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
View File

@@ -29,12 +29,15 @@ using System;
using System.IO;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateSQLiteAssetTest : BasicAssetTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -75,4 +78,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}

5
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
View File

@@ -29,12 +29,15 @@ using System;
using System.IO;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateSQLiteEstateTest : BasicEstateTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
View File

@@ -29,12 +29,15 @@ using System;
using System.IO;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateSQLiteGridTest : BasicGridTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
public string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3";
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}
}

5
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
View File

@@ -29,12 +29,15 @@ using System;
using System.IO;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateSQLiteInventoryTest : BasicInventoryTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}

7
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
View File

@@ -29,12 +29,15 @@ using System;
using System.IO;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateSQLiteRegionTest : BasicRegionTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -75,4 +78,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}

8
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
View File

@@ -29,12 +29,16 @@ using System;
using System.IO;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.NHibernate.Tests
{
[TestFixture]
public class NHibernateSQLiteUserTest : BasicUserTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public NHibernateManager database;
@@ -56,7 +60,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -74,4 +78,4 @@ namespace OpenSim.Data.NHibernate.Tests
}
}
}
}
}

3
OpenSim/Data/Tests/BasicAssetTest.cs
View File

@@ -31,11 +31,14 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using OpenSim.Framework;
using log4net;
using System.Reflection;
namespace OpenSim.Data.Tests
{
public class BasicAssetTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public AssetDataBase db;
public UUID uuid1;
public UUID uuid2;

3
OpenSim/Data/Tests/BasicEstateTest.cs
View File

@@ -33,11 +33,14 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using System.Text;
using log4net;
using System.Reflection;
namespace OpenSim.Data.Tests
{
public class BasicEstateTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public IEstateDataStore db;
public IRegionDataStore regionDb;

3
OpenSim/Data/Tests/BasicGridTest.cs
View File

@@ -32,11 +32,14 @@ using log4net.Config;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using log4net;
using System.Reflection;
namespace OpenSim.Data.Tests
{
public class BasicGridTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public GridDataBase db;
public UUID region1, region2, region3;
public UUID zero = UUID.Zero;

3
OpenSim/Data/Tests/BasicInventoryTest.cs
View File

@@ -31,11 +31,14 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using OpenSim.Framework;
using log4net;
using System.Reflection;
namespace OpenSim.Data.Tests
{
public class BasicInventoryTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public IInventoryDataPlugin db;
public UUID zero = UUID.Zero;

7
OpenSim/Data/Tests/BasicRegionTest.cs
View File

@@ -36,11 +36,14 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using log4net;
using System.Reflection;
namespace OpenSim.Data.Tests
{
public class BasicRegionTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public IRegionDataStore db;
public UUID zero = UUID.Zero;
public UUID region1;
@@ -139,7 +142,7 @@ namespace OpenSim.Data.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e);
m_log.Error(e.ToString());
Assert.Fail();
}
@@ -149,7 +152,7 @@ namespace OpenSim.Data.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e);
m_log.Error(e.ToString());
Assert.Fail();
}

3
OpenSim/Data/Tests/BasicUserTest.cs
View File

@@ -35,11 +35,14 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using OpenSim.Framework;
using log4net;
using System.Reflection;
namespace OpenSim.Data.Tests
{
public class BasicUserTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public IUserDataPlugin db;
public UUID user1;
public UUID user2;