aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/NHibernate/Tests
diff options
context:
space:
mode:
authorCharles Krinke2009-02-22 20:52:55 +0000
committerCharles Krinke2009-02-22 20:52:55 +0000
commit8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch)
tree96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Data/NHibernate/Tests
parentAllow delivery of object messages gridwide (diff)
downloadopensim-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/NHibernate/Tests')
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs8
24 files changed, 113 insertions, 40 deletions
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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace 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;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace 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;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace 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;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace 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;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace 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;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace 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;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace 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}
generated by cgit v1.1 at 2024-12-14 10:42:29 +0000