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/MySQL/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 'OpenSim/Data/MySQL/Tests')
-rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs | 7 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs | 5 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLGridTest.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs | 5 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs | 7 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLUserTest.cs | 7 |
6 files changed, 29 insertions, 10 deletions
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 | } |