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/Tests | |
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 '')
-rw-r--r-- | OpenSim/Data/Tests/BasicAssetTest.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/Tests/BasicEstateTest.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/Tests/BasicGridTest.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/Tests/BasicInventoryTest.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/Tests/BasicRegionTest.cs | 7 | ||||
-rw-r--r-- | OpenSim/Data/Tests/BasicUserTest.cs | 3 |
6 files changed, 20 insertions, 2 deletions
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; |