diff options
author | Charles Krinke | 2009-02-22 20:52:55 +0000 |
---|---|---|
committer | Charles Krinke | 2009-02-22 20:52:55 +0000 |
commit | 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch) | |
tree | 96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Data | |
parent | Allow delivery of object messages gridwide (diff) | |
download | opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2 opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.xz |
Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
* 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.
Diffstat (limited to 'OpenSim/Data')
38 files changed, 163 insertions, 56 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLogData.cs b/OpenSim/Data/MSSQL/MSSQLLogData.cs index 63cd605..1332305 100644 --- a/OpenSim/Data/MSSQL/MSSQLLogData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLogData.cs | |||
@@ -112,8 +112,7 @@ namespace OpenSim.Data.MSSQL | |||
112 | catch (Exception e) | 112 | catch (Exception e) |
113 | { | 113 | { |
114 | //Are we not in a loop here | 114 | //Are we not in a loop here |
115 | //m_log.Error(e.ToString()); | 115 | m_log.Error("[LOG DB] Error logging : " + e.Message); |
116 | Console.WriteLine("[LOG DB] Error logging : " + e.Message); | ||
117 | } | 116 | } |
118 | } | 117 | } |
119 | } | 118 | } |
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index 3bb6857..2f14f16 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs | |||
@@ -1030,7 +1030,6 @@ namespace OpenSim.Data.MySQL | |||
1030 | { | 1030 | { |
1031 | IDbCommand result = Query(sql, parameters); | 1031 | IDbCommand result = Query(sql, parameters); |
1032 | 1032 | ||
1033 | //Console.WriteLine(result.CommandText); | ||
1034 | // int x; | 1033 | // int x; |
1035 | // if ((x = result.ExecuteNonQuery()) > 0) | 1034 | // if ((x = result.ExecuteNonQuery()) > 0) |
1036 | // { | 1035 | // { |
@@ -1123,7 +1122,6 @@ namespace OpenSim.Data.MySQL | |||
1123 | { | 1122 | { |
1124 | IDbCommand result = Query(sql, parameters); | 1123 | IDbCommand result = Query(sql, parameters); |
1125 | 1124 | ||
1126 | //Console.WriteLine(result.CommandText); | ||
1127 | // int x; | 1125 | // int x; |
1128 | // if ((x = result.ExecuteNonQuery()) > 0) | 1126 | // if ((x = result.ExecuteNonQuery()) > 0) |
1129 | // { | 1127 | // { |
diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs index d03e66c..514e04e 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class MySQLAssetTest : BasicAssetTest | 37 | public class MySQLAssetTest : BasicAssetTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public MySQLManager database; | 41 | public MySQLManager database; |
39 | public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -73,4 +76,4 @@ namespace OpenSim.Data.MySQL.Tests | |||
73 | } | 76 | } |
74 | } | 77 | } |
75 | } | 78 | } |
76 | } \ No newline at end of file | 79 | } |
diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs index f148385..79fcc2d 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class MySQLEstateTest : BasicEstateTest | 37 | public class MySQLEstateTest : BasicEstateTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public MySQLManager database; | 41 | public MySQLManager database; |
39 | public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; | 42 | 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 | |||
56 | } | 59 | } |
57 | catch (Exception e) | 60 | catch (Exception e) |
58 | { | 61 | { |
59 | Console.WriteLine("Exception {0}", e); | 62 | m_log.Error("Exception {0}", e); |
60 | Assert.Ignore(); | 63 | Assert.Ignore(); |
61 | } | 64 | } |
62 | } | 65 | } |
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs index 953294f..fd71022 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs | |||
@@ -28,12 +28,16 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class MySQLGridTest : BasicGridTest | 37 | public class MySQLGridTest : BasicGridTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
40 | |||
37 | public string file; | 41 | public string file; |
38 | public MySQLManager database; | 42 | public MySQLManager database; |
39 | public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; | 43 | 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 | |||
54 | } | 58 | } |
55 | catch (Exception e) | 59 | catch (Exception e) |
56 | { | 60 | { |
57 | Console.WriteLine("Exception {0}", e); | 61 | m_log.Error("Exception {0}", e); |
58 | Assert.Ignore(); | 62 | Assert.Ignore(); |
59 | } | 63 | } |
60 | } | 64 | } |
@@ -73,4 +77,4 @@ namespace OpenSim.Data.MySQL.Tests | |||
73 | } | 77 | } |
74 | } | 78 | } |
75 | } | 79 | } |
76 | } \ No newline at end of file | 80 | } |
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs index e03e38d..c7799e5 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class MySQLInventoryTest : BasicInventoryTest | 37 | public class MySQLInventoryTest : BasicInventoryTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public MySQLManager database; | 41 | public MySQLManager database; |
39 | public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error("Exception {0}", e); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs index 5cce53b..77964d3 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class MySQLRegionTest : BasicRegionTest | 37 | public class MySQLRegionTest : BasicRegionTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public MySQLManager database; | 41 | public MySQLManager database; |
39 | public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error("Exception {0}", e); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -87,4 +90,4 @@ namespace OpenSim.Data.MySQL.Tests | |||
87 | } | 90 | } |
88 | } | 91 | } |
89 | } | 92 | } |
90 | } \ No newline at end of file | 93 | } |
diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs index b74617e..449ce4a 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class MySQLUserTest : BasicUserTest | 37 | public class MySQLUserTest : BasicUserTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public MySQLManager database; | 41 | public MySQLManager database; |
39 | public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error("Exception {0}", e); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -78,4 +81,4 @@ namespace OpenSim.Data.MySQL.Tests | |||
78 | } | 81 | } |
79 | } | 82 | } |
80 | } | 83 | } |
81 | } \ No newline at end of file | 84 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs index ace7e44..2c3980b 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMsSqlAssetTest : BasicAssetTest | 37 | public class NHibernateMsSqlAssetTest : BasicAssetTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | 42 | ||
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
55 | } | 58 | } |
56 | catch (Exception e) | 59 | catch (Exception e) |
57 | { | 60 | { |
58 | Console.WriteLine("Exception {0}", e); | 61 | m_log.Error(e.ToString()); |
59 | Assert.Ignore(); | 62 | Assert.Ignore(); |
60 | } | 63 | } |
61 | } | 64 | } |
@@ -74,4 +77,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
74 | } | 77 | } |
75 | 78 | ||
76 | } | 79 | } |
77 | } \ No newline at end of file | 80 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs index a44936b..7308a0e 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMsSqlEstateTest : BasicEstateTest | 37 | public class NHibernateMsSqlEstateTest : BasicEstateTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | 42 | ||
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
55 | } | 58 | } |
56 | catch (Exception e) | 59 | catch (Exception e) |
57 | { | 60 | { |
58 | Console.WriteLine("Exception {0}", e); | 61 | m_log.Error(e.ToString()); |
59 | Assert.Ignore(); | 62 | Assert.Ignore(); |
60 | } | 63 | } |
61 | } | 64 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs index bb62b6f..2768a9e 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMsSqlGridTest : BasicGridTest | 37 | public class NHibernateMsSqlGridTest : BasicGridTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
72 | } | 75 | } |
73 | } | 76 | } |
74 | } | 77 | } |
75 | } \ No newline at end of file | 78 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs index 6fc8abf..41c0957 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMsSqlInventoryTest : BasicInventoryTest | 37 | public class NHibernateMsSqlInventoryTest : BasicInventoryTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs index 4d0e64d..beff3b9 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMsSqlRegionTest : BasicRegionTest | 37 | public class NHibernateMsSqlRegionTest : BasicRegionTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 42 | 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 | |||
55 | } | 58 | } |
56 | catch (Exception e) | 59 | catch (Exception e) |
57 | { | 60 | { |
58 | Console.WriteLine("Exception {0}", e); | 61 | m_log.Error(e.ToString()); |
59 | Assert.Ignore(); | 62 | Assert.Ignore(); |
60 | } | 63 | } |
61 | } | 64 | } |
@@ -74,4 +77,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
74 | } | 77 | } |
75 | 78 | ||
76 | } | 79 | } |
77 | } \ No newline at end of file | 80 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs index 19fd248..b09cbe6 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMsSqlUserTest : BasicUserTest | 37 | public class NHibernateMsSqlUserTest : BasicUserTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
72 | } | 75 | } |
73 | } | 76 | } |
74 | } | 77 | } |
75 | } \ No newline at end of file | 78 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs index 8bec0d3..17c65d6 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMySQLAssetTest : BasicAssetTest | 37 | public class NHibernateMySQLAssetTest : BasicAssetTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
73 | } | 76 | } |
74 | 77 | ||
75 | } | 78 | } |
76 | } \ No newline at end of file | 79 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs index 4c966f5..6f5ed5f 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMySQLGridTest : BasicGridTest | 37 | public class NHibernateMySQLGridTest : BasicGridTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
72 | } | 75 | } |
73 | } | 76 | } |
74 | } | 77 | } |
75 | } \ No newline at end of file | 78 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs index 7f2ee4a..a7f5f5a 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMySQLInventoryTest : BasicInventoryTest | 37 | public class NHibernateMySQLInventoryTest : BasicInventoryTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs index fa484a3..33faea6 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMySQLRegionTest : BasicRegionTest | 37 | public class NHibernateMySQLRegionTest : BasicRegionTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 42 | 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 | |||
55 | } | 58 | } |
56 | catch (Exception e) | 59 | catch (Exception e) |
57 | { | 60 | { |
58 | Console.WriteLine("Exception {0}", e); | 61 | m_log.Error(e.ToString()); |
59 | Assert.Ignore(); | 62 | Assert.Ignore(); |
60 | } | 63 | } |
61 | } | 64 | } |
@@ -74,4 +77,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
74 | } | 77 | } |
75 | 78 | ||
76 | } | 79 | } |
77 | } \ No newline at end of file | 80 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs index c316bd4..5554229 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMySQLUserTest : BasicUserTest | 37 | public class NHibernateMySQLUserTest : BasicUserTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
72 | } | 75 | } |
73 | } | 76 | } |
74 | } | 77 | } |
75 | } \ No newline at end of file | 78 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs index 939f1e9..86b9df6 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernateMySQLEstateTest : BasicEstateTest | 37 | public class NHibernateMySQLEstateTest : BasicEstateTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs index 6f86b0f..b51389a 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernatePostgreSQLAssetTest : BasicAssetTest | 37 | public class NHibernatePostgreSQLAssetTest : BasicAssetTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
73 | } | 76 | } |
74 | 77 | ||
75 | } | 78 | } |
76 | } \ No newline at end of file | 79 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs index c0a76e7..1edf20a 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernatePostgreSQLEstateTest : BasicEstateTest | 37 | public class NHibernatePostgreSQLEstateTest : BasicEstateTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs index 084de85..a47830d 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernatePostgreSQLGridTest : BasicGridTest | 37 | public class NHibernatePostgreSQLGridTest : BasicGridTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
72 | } | 75 | } |
73 | } | 76 | } |
74 | } | 77 | } |
75 | } \ No newline at end of file | 78 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs index 869d24f..6016303 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernatePostgreSQLInventoryTest : BasicInventoryTest | 37 | public class NHibernatePostgreSQLInventoryTest : BasicInventoryTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs index 0e4fc82..8b4a8f5 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernatePostgreSQLRegionTest : BasicRegionTest | 37 | public class NHibernatePostgreSQLRegionTest : BasicRegionTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
73 | } | 76 | } |
74 | 77 | ||
75 | } | 78 | } |
76 | } \ No newline at end of file | 79 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs index ffcb176..13d6c69 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs | |||
@@ -28,12 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 34 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 35 | { |
34 | [TestFixture] | 36 | [TestFixture] |
35 | public class NHibernatePostgreSQLUserTest : BasicUserTest | 37 | public class NHibernatePostgreSQLUserTest : BasicUserTest |
36 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
37 | public string file; | 40 | public string file; |
38 | public NHibernateManager database; | 41 | public NHibernateManager database; |
39 | public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; | 42 | 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 | |||
54 | } | 57 | } |
55 | catch (Exception e) | 58 | catch (Exception e) |
56 | { | 59 | { |
57 | Console.WriteLine("Exception {0}", e); | 60 | m_log.Error(e.ToString()); |
58 | Assert.Ignore(); | 61 | Assert.Ignore(); |
59 | } | 62 | } |
60 | } | 63 | } |
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
72 | } | 75 | } |
73 | } | 76 | } |
74 | } | 77 | } |
75 | } \ No newline at end of file | 78 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs index 1f98949..e89a14e 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs | |||
@@ -29,12 +29,15 @@ using System; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using NUnit.Framework; | 30 | using NUnit.Framework; |
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | ||
33 | using System.Reflection; | ||
32 | 34 | ||
33 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
34 | { | 36 | { |
35 | [TestFixture] | 37 | [TestFixture] |
36 | public class NHibernateSQLiteAssetTest : BasicAssetTest | 38 | public class NHibernateSQLiteAssetTest : BasicAssetTest |
37 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
38 | public string file; | 41 | public string file; |
39 | public NHibernateManager database; | 42 | public NHibernateManager database; |
40 | 43 | ||
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
56 | } | 59 | } |
57 | catch (Exception e) | 60 | catch (Exception e) |
58 | { | 61 | { |
59 | Console.WriteLine("Exception {0}", e); | 62 | m_log.Error(e.ToString()); |
60 | Assert.Ignore(); | 63 | Assert.Ignore(); |
61 | } | 64 | } |
62 | } | 65 | } |
@@ -75,4 +78,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
75 | } | 78 | } |
76 | 79 | ||
77 | } | 80 | } |
78 | } \ No newline at end of file | 81 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs index b51bff2..23fac9a 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs | |||
@@ -29,12 +29,15 @@ using System; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using NUnit.Framework; | 30 | using NUnit.Framework; |
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | ||
33 | using System.Reflection; | ||
32 | 34 | ||
33 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
34 | { | 36 | { |
35 | [TestFixture] | 37 | [TestFixture] |
36 | public class NHibernateSQLiteEstateTest : BasicEstateTest | 38 | public class NHibernateSQLiteEstateTest : BasicEstateTest |
37 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
38 | public string file; | 41 | public string file; |
39 | public NHibernateManager database; | 42 | public NHibernateManager database; |
40 | 43 | ||
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
56 | } | 59 | } |
57 | catch (Exception e) | 60 | catch (Exception e) |
58 | { | 61 | { |
59 | Console.WriteLine("Exception {0}", e); | 62 | m_log.Error(e.ToString()); |
60 | Assert.Ignore(); | 63 | Assert.Ignore(); |
61 | } | 64 | } |
62 | } | 65 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs index b9fe8b9..2c3d4de 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs | |||
@@ -29,12 +29,15 @@ using System; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using NUnit.Framework; | 30 | using NUnit.Framework; |
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | ||
33 | using System.Reflection; | ||
32 | 34 | ||
33 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
34 | { | 36 | { |
35 | [TestFixture] | 37 | [TestFixture] |
36 | public class NHibernateSQLiteGridTest : BasicGridTest | 38 | public class NHibernateSQLiteGridTest : BasicGridTest |
37 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
38 | public string file; | 41 | public string file; |
39 | public NHibernateManager database; | 42 | public NHibernateManager database; |
40 | public string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3"; | 43 | public string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3"; |
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
55 | } | 58 | } |
56 | catch (Exception e) | 59 | catch (Exception e) |
57 | { | 60 | { |
58 | Console.WriteLine("Exception {0}", e); | 61 | m_log.Error(e.ToString()); |
59 | Assert.Ignore(); | 62 | Assert.Ignore(); |
60 | } | 63 | } |
61 | } | 64 | } |
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
73 | } | 76 | } |
74 | } | 77 | } |
75 | } | 78 | } |
76 | } \ No newline at end of file | 79 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs index f31fc5b..adccd12 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs | |||
@@ -29,12 +29,15 @@ using System; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using NUnit.Framework; | 30 | using NUnit.Framework; |
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | ||
33 | using System.Reflection; | ||
32 | 34 | ||
33 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
34 | { | 36 | { |
35 | [TestFixture] | 37 | [TestFixture] |
36 | public class NHibernateSQLiteInventoryTest : BasicInventoryTest | 38 | public class NHibernateSQLiteInventoryTest : BasicInventoryTest |
37 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
38 | public string file; | 41 | public string file; |
39 | public NHibernateManager database; | 42 | public NHibernateManager database; |
40 | 43 | ||
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
56 | } | 59 | } |
57 | catch (Exception e) | 60 | catch (Exception e) |
58 | { | 61 | { |
59 | Console.WriteLine("Exception {0}", e); | 62 | m_log.Error(e.ToString()); |
60 | Assert.Ignore(); | 63 | Assert.Ignore(); |
61 | } | 64 | } |
62 | } | 65 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs index d902dfd..83f4d36 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs | |||
@@ -29,12 +29,15 @@ using System; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using NUnit.Framework; | 30 | using NUnit.Framework; |
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | ||
33 | using System.Reflection; | ||
32 | 34 | ||
33 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
34 | { | 36 | { |
35 | [TestFixture] | 37 | [TestFixture] |
36 | public class NHibernateSQLiteRegionTest : BasicRegionTest | 38 | public class NHibernateSQLiteRegionTest : BasicRegionTest |
37 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
38 | public string file; | 41 | public string file; |
39 | public NHibernateManager database; | 42 | public NHibernateManager database; |
40 | 43 | ||
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
56 | } | 59 | } |
57 | catch (Exception e) | 60 | catch (Exception e) |
58 | { | 61 | { |
59 | Console.WriteLine("Exception {0}", e); | 62 | m_log.Error(e.ToString()); |
60 | Assert.Ignore(); | 63 | Assert.Ignore(); |
61 | } | 64 | } |
62 | } | 65 | } |
@@ -75,4 +78,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
75 | } | 78 | } |
76 | 79 | ||
77 | } | 80 | } |
78 | } \ No newline at end of file | 81 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs index 78ab00f..a742c8e 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs | |||
@@ -29,12 +29,16 @@ using System; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using NUnit.Framework; | 30 | using NUnit.Framework; |
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | using log4net; | ||
33 | using System.Reflection; | ||
32 | 34 | ||
33 | namespace OpenSim.Data.NHibernate.Tests | 35 | namespace OpenSim.Data.NHibernate.Tests |
34 | { | 36 | { |
37 | |||
35 | [TestFixture] | 38 | [TestFixture] |
36 | public class NHibernateSQLiteUserTest : BasicUserTest | 39 | public class NHibernateSQLiteUserTest : BasicUserTest |
37 | { | 40 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
38 | public string file; | 42 | public string file; |
39 | public NHibernateManager database; | 43 | public NHibernateManager database; |
40 | 44 | ||
@@ -56,7 +60,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
56 | } | 60 | } |
57 | catch (Exception e) | 61 | catch (Exception e) |
58 | { | 62 | { |
59 | Console.WriteLine("Exception {0}", e); | 63 | m_log.Error(e.ToString()); |
60 | Assert.Ignore(); | 64 | Assert.Ignore(); |
61 | } | 65 | } |
62 | } | 66 | } |
@@ -74,4 +78,4 @@ namespace OpenSim.Data.NHibernate.Tests | |||
74 | } | 78 | } |
75 | } | 79 | } |
76 | } | 80 | } |
77 | } \ No newline at end of file | 81 | } |
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs index 500b646..e7faebb 100644 --- a/OpenSim/Data/Tests/BasicAssetTest.cs +++ b/OpenSim/Data/Tests/BasicAssetTest.cs | |||
@@ -31,11 +31,14 @@ using NUnit.Framework; | |||
31 | using NUnit.Framework.SyntaxHelpers; | 31 | using NUnit.Framework.SyntaxHelpers; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using log4net; | ||
35 | using System.Reflection; | ||
34 | 36 | ||
35 | namespace OpenSim.Data.Tests | 37 | namespace OpenSim.Data.Tests |
36 | { | 38 | { |
37 | public class BasicAssetTest | 39 | public class BasicAssetTest |
38 | { | 40 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
39 | public AssetDataBase db; | 42 | public AssetDataBase db; |
40 | public UUID uuid1; | 43 | public UUID uuid1; |
41 | public UUID uuid2; | 44 | public UUID uuid2; |
diff --git a/OpenSim/Data/Tests/BasicEstateTest.cs b/OpenSim/Data/Tests/BasicEstateTest.cs index f94ac46..f74a222 100644 --- a/OpenSim/Data/Tests/BasicEstateTest.cs +++ b/OpenSim/Data/Tests/BasicEstateTest.cs | |||
@@ -33,11 +33,14 @@ using OpenMetaverse; | |||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using System.Text; | 35 | using System.Text; |
36 | using log4net; | ||
37 | using System.Reflection; | ||
36 | 38 | ||
37 | namespace OpenSim.Data.Tests | 39 | namespace OpenSim.Data.Tests |
38 | { | 40 | { |
39 | public class BasicEstateTest | 41 | public class BasicEstateTest |
40 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
41 | public IEstateDataStore db; | 44 | public IEstateDataStore db; |
42 | public IRegionDataStore regionDb; | 45 | public IRegionDataStore regionDb; |
43 | 46 | ||
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs index e3256ff..8841bae 100644 --- a/OpenSim/Data/Tests/BasicGridTest.cs +++ b/OpenSim/Data/Tests/BasicGridTest.cs | |||
@@ -32,11 +32,14 @@ using log4net.Config; | |||
32 | using NUnit.Framework; | 32 | using NUnit.Framework; |
33 | using NUnit.Framework.SyntaxHelpers; | 33 | using NUnit.Framework.SyntaxHelpers; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using log4net; | ||
36 | using System.Reflection; | ||
35 | 37 | ||
36 | namespace OpenSim.Data.Tests | 38 | namespace OpenSim.Data.Tests |
37 | { | 39 | { |
38 | public class BasicGridTest | 40 | public class BasicGridTest |
39 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
40 | public GridDataBase db; | 43 | public GridDataBase db; |
41 | public UUID region1, region2, region3; | 44 | public UUID region1, region2, region3; |
42 | public UUID zero = UUID.Zero; | 45 | public UUID zero = UUID.Zero; |
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs index 1b8a5de..e5642f1 100644 --- a/OpenSim/Data/Tests/BasicInventoryTest.cs +++ b/OpenSim/Data/Tests/BasicInventoryTest.cs | |||
@@ -31,11 +31,14 @@ using NUnit.Framework; | |||
31 | using NUnit.Framework.SyntaxHelpers; | 31 | using NUnit.Framework.SyntaxHelpers; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using log4net; | ||
35 | using System.Reflection; | ||
34 | 36 | ||
35 | namespace OpenSim.Data.Tests | 37 | namespace OpenSim.Data.Tests |
36 | { | 38 | { |
37 | public class BasicInventoryTest | 39 | public class BasicInventoryTest |
38 | { | 40 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
39 | public IInventoryDataPlugin db; | 42 | public IInventoryDataPlugin db; |
40 | public UUID zero = UUID.Zero; | 43 | public UUID zero = UUID.Zero; |
41 | 44 | ||
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs index dfb2200..179692a 100644 --- a/OpenSim/Data/Tests/BasicRegionTest.cs +++ b/OpenSim/Data/Tests/BasicRegionTest.cs | |||
@@ -36,11 +36,14 @@ using OpenMetaverse; | |||
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using log4net; | ||
40 | using System.Reflection; | ||
39 | 41 | ||
40 | namespace OpenSim.Data.Tests | 42 | namespace OpenSim.Data.Tests |
41 | { | 43 | { |
42 | public class BasicRegionTest | 44 | public class BasicRegionTest |
43 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
44 | public IRegionDataStore db; | 47 | public IRegionDataStore db; |
45 | public UUID zero = UUID.Zero; | 48 | public UUID zero = UUID.Zero; |
46 | public UUID region1; | 49 | public UUID region1; |
@@ -139,7 +142,7 @@ namespace OpenSim.Data.Tests | |||
139 | } | 142 | } |
140 | catch (Exception e) | 143 | catch (Exception e) |
141 | { | 144 | { |
142 | Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e); | 145 | m_log.Error(e.ToString()); |
143 | Assert.Fail(); | 146 | Assert.Fail(); |
144 | } | 147 | } |
145 | 148 | ||
@@ -149,7 +152,7 @@ namespace OpenSim.Data.Tests | |||
149 | } | 152 | } |
150 | catch (Exception e) | 153 | catch (Exception e) |
151 | { | 154 | { |
152 | Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e); | 155 | m_log.Error(e.ToString()); |
153 | Assert.Fail(); | 156 | Assert.Fail(); |
154 | } | 157 | } |
155 | 158 | ||
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs index f0a90a9..151faa2 100644 --- a/OpenSim/Data/Tests/BasicUserTest.cs +++ b/OpenSim/Data/Tests/BasicUserTest.cs | |||
@@ -35,11 +35,14 @@ using NUnit.Framework; | |||
35 | using NUnit.Framework.SyntaxHelpers; | 35 | using NUnit.Framework.SyntaxHelpers; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using log4net; | ||
39 | using System.Reflection; | ||
38 | 40 | ||
39 | namespace OpenSim.Data.Tests | 41 | namespace OpenSim.Data.Tests |
40 | { | 42 | { |
41 | public class BasicUserTest | 43 | public class BasicUserTest |
42 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
43 | public IUserDataPlugin db; | 46 | public IUserDataPlugin db; |
44 | public UUID user1; | 47 | public UUID user1; |
45 | public UUID user2; | 48 | public UUID user2; |