You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by bo...@apache.org on 2013/08/08 15:10:34 UTC
svn commit: r1511769 - in /logging/log4net/branches/1.2.12: ./
tests/src/Appender/RemotingAppenderTest.cs
tests/src/Layout/PatternLayoutTest.cs
Author: bodewig
Date: Thu Aug 8 13:10:34 2013
New Revision: 1511769
URL: http://svn.apache.org/r1511769
Log:
merge fixed tests
Modified:
logging/log4net/branches/1.2.12/ (props changed)
logging/log4net/branches/1.2.12/tests/src/Appender/RemotingAppenderTest.cs
logging/log4net/branches/1.2.12/tests/src/Layout/PatternLayoutTest.cs
Propchange: logging/log4net/branches/1.2.12/
------------------------------------------------------------------------------
svn:mergeinfo = /logging/log4net/trunk:1511765-1511766
Modified: logging/log4net/branches/1.2.12/tests/src/Appender/RemotingAppenderTest.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/1.2.12/tests/src/Appender/RemotingAppenderTest.cs?rev=1511769&r1=1511768&r2=1511769&view=diff
==============================================================================
--- logging/log4net/branches/1.2.12/tests/src/Appender/RemotingAppenderTest.cs (original)
+++ logging/log4net/branches/1.2.12/tests/src/Appender/RemotingAppenderTest.cs Thu Aug 8 13:10:34 2013
@@ -75,7 +75,7 @@ namespace log4net.Tests.Appender
}
/// <summary>
- /// Test that the UserName property is not remoted when doing a Fix.Partial
+ /// Test that the LocationInfo property is not remoted when doing a Fix.Partial
/// </summary>
[Test]
public void TestPartialFix()
@@ -100,11 +100,11 @@ namespace log4net.Tests.Appender
// Grab the event data
LoggingEventData eventData = GetLoggingEventData(events[0]);
- Assert.IsNull(eventData.UserName, "Expect username to be null because only doing a partial fix");
+ Assert.IsNull(eventData.LocationInfo, "Expect LocationInfo to be null because only doing a partial fix");
}
/// <summary>
- /// Test that the UserName property is remoted when doing a Fix.All
+ /// Test that the LocationInfo property is remoted when doing a Fix.All
/// </summary>
[Test]
public void TestFullFix()
@@ -129,7 +129,7 @@ namespace log4net.Tests.Appender
// Grab the event data
LoggingEventData eventData = GetLoggingEventData(events[0]);
- Assert.IsNotNull(eventData.UserName, "Expect username to not be null because doing a full fix");
+ Assert.IsNotNull(eventData.LocationInfo, "Expect LocationInfo to not be null because doing a full fix");
}
/// <summary>
Modified: logging/log4net/branches/1.2.12/tests/src/Layout/PatternLayoutTest.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/1.2.12/tests/src/Layout/PatternLayoutTest.cs?rev=1511769&r1=1511768&r2=1511769&view=diff
==============================================================================
--- logging/log4net/branches/1.2.12/tests/src/Layout/PatternLayoutTest.cs (original)
+++ logging/log4net/branches/1.2.12/tests/src/Layout/PatternLayoutTest.cs Thu Aug 8 13:10:34 2013
@@ -111,11 +111,7 @@ namespace log4net.Tests.Layout
ILog log1 = LogManager.GetLogger(rep.Name, "TestStackTracePattern");
log1.Info("TestMessage");
-#if !MONO
- Assert.AreEqual("System.RuntimeMethodHandle.InvokeMethod > log4net.Tests.Layout.PatternLayoutTest.TestStackTracePattern", stringAppender.GetString(), "stack trace value set");
-#else
- Assert.AreEqual("MonoMethod.InternalInvoke > PatternLayoutTest.TestStackTracePattern", stringAppender.GetString(), "stack trace value set");
-#endif
+ StringAssert.EndsWith("PatternLayoutTest.TestStackTracePattern", stringAppender.GetString(), "stack trace value set");
stringAppender.Reset();
}