From 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Sun, 22 Feb 2009 20:52:55 +0000
Subject: 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.

---
 OpenSim/Data/Tests/BasicAssetTest.cs     | 3 +++
 OpenSim/Data/Tests/BasicEstateTest.cs    | 3 +++
 OpenSim/Data/Tests/BasicGridTest.cs      | 3 +++
 OpenSim/Data/Tests/BasicInventoryTest.cs | 3 +++
 OpenSim/Data/Tests/BasicRegionTest.cs    | 7 +++++--
 OpenSim/Data/Tests/BasicUserTest.cs      | 3 +++
 6 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Data/Tests')

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;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
+using log4net;
+using System.Reflection;
 
 namespace OpenSim.Data.Tests
 {
     public class BasicAssetTest
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         public AssetDataBase db;
         public UUID uuid1;
         public UUID uuid2;
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;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using System.Text;
+using log4net;
+using System.Reflection;
 
 namespace OpenSim.Data.Tests
 {
     public class BasicEstateTest
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         public IEstateDataStore db;
         public IRegionDataStore regionDb;
 
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;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
+using log4net;
+using System.Reflection;
 
 namespace OpenSim.Data.Tests
 {
     public class BasicGridTest
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         public GridDataBase db;
         public UUID region1, region2, region3;
         public UUID zero = UUID.Zero;
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;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
+using log4net;
+using System.Reflection;
 
 namespace OpenSim.Data.Tests
 {
     public class BasicInventoryTest
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         public IInventoryDataPlugin db;
         public UUID zero = UUID.Zero;
 
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;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using log4net;
+using System.Reflection;
 
 namespace OpenSim.Data.Tests
 {
     public class BasicRegionTest
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         public IRegionDataStore db;
         public UUID zero = UUID.Zero;
         public UUID region1;
@@ -139,7 +142,7 @@ namespace OpenSim.Data.Tests
             }
             catch (Exception e)
             {
-                Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e);
+                m_log.Error(e.ToString());
                 Assert.Fail();
             }
                     
@@ -149,7 +152,7 @@ namespace OpenSim.Data.Tests
             }
             catch (Exception e)
             {
-                Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e);
+                m_log.Error(e.ToString());
                 Assert.Fail();
             }
 
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;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
+using log4net;
+using System.Reflection;
 
 namespace OpenSim.Data.Tests
 {
     public class BasicUserTest
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         public IUserDataPlugin db;
         public UUID user1;
         public UUID user2;
-- 
cgit v1.1