diff options
author | Melanie | 2012-04-30 19:04:38 +0100 |
---|---|---|
committer | Melanie | 2012-04-30 19:04:38 +0100 |
commit | 4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6 (patch) | |
tree | 4a1a8386e77f584c900229f1e8ddb08058d07697 /OpenSim/Tests/Common/TestHelpers.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on an... (diff) | |
download | opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.zip opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.gz opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.bz2 opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/MySQLUserAccountData.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/TestHelpers.cs | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs index ced06de..5030d4b 100644 --- a/OpenSim/Tests/Common/TestHelpers.cs +++ b/OpenSim/Tests/Common/TestHelpers.cs | |||
@@ -27,6 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Diagnostics; | 29 | using System.Diagnostics; |
30 | using System.IO; | ||
31 | using System.Text; | ||
30 | using NUnit.Framework; | 32 | using NUnit.Framework; |
31 | using OpenMetaverse; | 33 | using OpenMetaverse; |
32 | 34 | ||
@@ -34,6 +36,37 @@ namespace OpenSim.Tests.Common | |||
34 | { | 36 | { |
35 | public class TestHelpers | 37 | public class TestHelpers |
36 | { | 38 | { |
39 | private static Stream EnableLoggingConfigStream | ||
40 | = new MemoryStream( | ||
41 | Encoding.UTF8.GetBytes( | ||
42 | @"<log4net> | ||
43 | <!-- A1 is set to be a ConsoleAppender --> | ||
44 | <appender name=""A1"" type=""log4net.Appender.ConsoleAppender""> | ||
45 | |||
46 | <!-- A1 uses PatternLayout --> | ||
47 | <layout type=""log4net.Layout.PatternLayout""> | ||
48 | <!-- Print the date in ISO 8601 format --> | ||
49 | <conversionPattern value=""%date [%thread] %-5level %logger %ndc - %message%newline"" /> | ||
50 | </layout> | ||
51 | </appender> | ||
52 | |||
53 | <!-- Set root logger level to DEBUG and its only appender to A1 --> | ||
54 | <root> | ||
55 | <level value=""DEBUG"" /> | ||
56 | <appender-ref ref=""A1"" /> | ||
57 | </root> | ||
58 | </log4net>")); | ||
59 | |||
60 | private static Stream DisableLoggingConfigStream | ||
61 | = new MemoryStream( | ||
62 | Encoding.UTF8.GetBytes( | ||
63 | // "<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/><appender-ref ref=\"A1\"/></root></log4net></configuration>"))); | ||
64 | //"<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>"))); | ||
65 | //"<configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>"))); | ||
66 | //"<configuration><log4net><root></root></log4net></configuration>"))); | ||
67 | //"<configuration><log4net><root/></log4net></configuration>"))); | ||
68 | "<log4net><root/></log4net>")); | ||
69 | |||
37 | public static bool AssertThisDelegateCausesArgumentException(TestDelegate d) | 70 | public static bool AssertThisDelegateCausesArgumentException(TestDelegate d) |
38 | { | 71 | { |
39 | try | 72 | try |
@@ -58,6 +91,19 @@ namespace OpenSim.Tests.Common | |||
58 | Console.WriteLine("===> In Test Method : {0} <===", stackTrace.GetFrame(1).GetMethod().Name); | 91 | Console.WriteLine("===> In Test Method : {0} <===", stackTrace.GetFrame(1).GetMethod().Name); |
59 | } | 92 | } |
60 | 93 | ||
94 | public static void EnableLogging() | ||
95 | { | ||
96 | log4net.Config.XmlConfigurator.Configure(EnableLoggingConfigStream); | ||
97 | } | ||
98 | |||
99 | /// <summary> | ||
100 | /// Disable logging whilst running the tests. | ||
101 | /// </summary> | ||
102 | public static void DisableLogging() | ||
103 | { | ||
104 | log4net.Config.XmlConfigurator.Configure(DisableLoggingConfigStream); | ||
105 | } | ||
106 | |||
61 | /// <summary> | 107 | /// <summary> |
62 | /// Parse tail section into full UUID. | 108 | /// Parse tail section into full UUID. |
63 | /// </summary> | 109 | /// </summary> |