remove obsolete #ifdefs from unit tests
diff --git a/src/integration-testing/log4net-611-main/log4net-611-main.csproj b/src/integration-testing/log4net-611-main/log4net-611-main.csproj
index a3474a3..a297564 100644
--- a/src/integration-testing/log4net-611-main/log4net-611-main.csproj
+++ b/src/integration-testing/log4net-611-main/log4net-611-main.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFrameworks>net462;net6.0</TargetFrameworks>
+ <TargetFrameworks>net462;net8.0</TargetFrameworks>
<RootNamespace>log4net_611_main</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
diff --git a/src/integration-testing/log4net-672/log4net-672.csproj b/src/integration-testing/log4net-672/log4net-672.csproj
index 5a134f9..7905ac1 100644
--- a/src/integration-testing/log4net-672/log4net-672.csproj
+++ b/src/integration-testing/log4net-672/log4net-672.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<RootNamespace>log4net_672</RootNamespace>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
diff --git a/src/integration-testing/log4net-673/log4net-673.csproj b/src/integration-testing/log4net-673/log4net-673.csproj
index a799926..d063a14 100644
--- a/src/integration-testing/log4net-673/log4net-673.csproj
+++ b/src/integration-testing/log4net-673/log4net-673.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<RootNamespace>log4net_673</RootNamespace>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>disable</Nullable>
diff --git a/src/integration-testing/log4net-681/log4net-681.csproj b/src/integration-testing/log4net-681/log4net-681.csproj
index 5abd45f..238e930 100644
--- a/src/integration-testing/log4net-681/log4net-681.csproj
+++ b/src/integration-testing/log4net-681/log4net-681.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<RootNamespace>log4net_681</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
diff --git a/src/log4net.Tests/Appender/AdoNetAppenderTest.cs b/src/log4net.Tests/Appender/AdoNetAppenderTest.cs
index 1b4eedf..bc8f184 100644
--- a/src/log4net.Tests/Appender/AdoNetAppenderTest.cs
+++ b/src/log4net.Tests/Appender/AdoNetAppenderTest.cs
@@ -21,15 +21,10 @@
using System;
using System.Data;
-#if NETSTANDARD1_3
-using System.Reflection;
-#endif
using System.Xml;
using log4net.Appender;
using log4net.Config;
-#if !NETSTANDARD1_3
using log4net.Core;
-#endif
using log4net.Layout;
using log4net.Repository;
using log4net.Tests.Appender.AdoNet;
@@ -48,11 +43,7 @@
AdoNetAppender adoNetAppender = new AdoNetAppender();
adoNetAppender.BufferSize = -1;
-#if NETSTANDARD1_3
- adoNetAppender.ConnectionType = typeof(Log4NetConnection).AssemblyQualifiedName;
-#else
- adoNetAppender.ConnectionType = "log4net.Tests.Appender.AdoNet.Log4NetConnection";
-#endif
+ adoNetAppender.ConnectionType = typeof(Log4NetConnection).AssemblyQualifiedName;
adoNetAppender.ActivateOptions();
BasicConfigurator.Configure(rep, adoNetAppender);
@@ -72,11 +63,7 @@
AdoNetAppender adoNetAppender = new AdoNetAppender();
adoNetAppender.BufferSize = bufferSize;
-#if NETSTANDARD1_3
- adoNetAppender.ConnectionType = typeof(Log4NetConnection).AssemblyQualifiedName;
-#else
- adoNetAppender.ConnectionType = "log4net.Tests.Appender.AdoNet.Log4NetConnection";
-#endif
+ adoNetAppender.ConnectionType = typeof(Log4NetConnection).AssemblyQualifiedName;
adoNetAppender.ActivateOptions();
BasicConfigurator.Configure(rep, adoNetAppender);
@@ -92,7 +79,6 @@
Assert.AreEqual(bufferSize + 1, Log4NetCommand.MostRecentInstance.ExecuteNonQueryCount);
}
-#if !NETSTANDARD1_3
[Test]
public void WebsiteExample()
{
@@ -276,7 +262,6 @@
param = (IDbDataParameter)command.Parameters["@exception"];
Assert.IsEmpty((string)param.Value);
}
-#endif
[Test]
public void NullPropertyXmlConfig()
@@ -331,11 +316,7 @@
productIdParam.Layout = rawPropertyLayout;
AdoNetAppender appender = new AdoNetAppender();
-#if NETSTANDARD1_3
- appender.ConnectionType = typeof(Log4NetConnection).AssemblyQualifiedName;
-#else
- appender.ConnectionType = typeof(Log4NetConnection).FullName;
-#endif
+ appender.ConnectionType = typeof(Log4NetConnection).AssemblyQualifiedName;
appender.BufferSize = -1;
appender.CommandText = "INSERT INTO Log ([productId]) VALUES (@productId)";
appender.AddParameter(productIdParam);
@@ -354,4 +335,4 @@
Assert.AreEqual(DBNull.Value, param.Value);
}
}
-}
+}
\ No newline at end of file
diff --git a/src/log4net.Tests/Appender/DebugAppenderTest.cs b/src/log4net.Tests/Appender/DebugAppenderTest.cs
index 8cc2608..9ff0666 100644
--- a/src/log4net.Tests/Appender/DebugAppenderTest.cs
+++ b/src/log4net.Tests/Appender/DebugAppenderTest.cs
@@ -18,8 +18,7 @@
*
*/
-#if NET_2_0
-
+#if NET462_OR_GREATER
using System;
using System.Diagnostics;
using log4net.Appender;
@@ -56,9 +55,7 @@
ILog log = LogManager.GetLogger(rep.Name, GetType());
log.Debug("Message");
- Assert.AreEqual(
- null,
- categoryTraceListener.Category);
+ Assert.IsNull(categoryTraceListener.Category);
Assert.IsFalse(testErrHandler.ErrorOccured);
@@ -84,9 +81,7 @@
ILog log = LogManager.GetLogger(rep.Name, GetType());
log.Debug("Message");
- Assert.AreEqual(
- null,
- categoryTraceListener.Category);
+ Assert.IsNull(categoryTraceListener.Category);
Debug.Listeners.Remove(categoryTraceListener);
}
@@ -171,5 +166,4 @@
}
}
}
-
-#endif
+#endif
\ No newline at end of file
diff --git a/src/log4net.Tests/Appender/EventLogAppenderTest.cs b/src/log4net.Tests/Appender/EventLogAppenderTest.cs
index 63e7771..ce29272 100644
--- a/src/log4net.Tests/Appender/EventLogAppenderTest.cs
+++ b/src/log4net.Tests/Appender/EventLogAppenderTest.cs
@@ -18,7 +18,7 @@
#endregion
// netstandard doesn't support EventLog
-#if NET_2_0
+#if NET462_OR_GREATER
using System.Diagnostics;
@@ -102,4 +102,4 @@
}
}
-#endif // NET_2_0
+#endif // NET462_OR_GREATER
\ No newline at end of file
diff --git a/src/log4net.Tests/Appender/EventRaisingAppender.cs b/src/log4net.Tests/Appender/EventRaisingAppender.cs
index e9392ea..b7da0ef 100644
--- a/src/log4net.Tests/Appender/EventRaisingAppender.cs
+++ b/src/log4net.Tests/Appender/EventRaisingAppender.cs
@@ -19,60 +19,57 @@
*
*/
-#if !NET_2_0 && !MONO_2_0
-
using System;
namespace log4net.Tests.Appender
{
- /// <summary>
- /// Provides data for the <see cref="EventRaisingAppender.LoggingEventAppended"/> event.
- /// </summary>
- /// <seealso cref="System.EventArgs" />
- public class LoggingEventEventArgs : EventArgs
- {
- public log4net.Core.LoggingEvent LoggingEvent { get; private set; }
+ /// <summary>
+ /// Provides data for the <see cref="EventRaisingAppender.LoggingEventAppended"/> event.
+ /// </summary>
+ /// <seealso cref="System.EventArgs" />
+ public class LoggingEventEventArgs : EventArgs
+ {
+ public log4net.Core.LoggingEvent LoggingEvent { get; private set; }
- public LoggingEventEventArgs(log4net.Core.LoggingEvent loggingEvent)
- {
- if (loggingEvent == null) throw new ArgumentNullException("loggingEvent");
- LoggingEvent = loggingEvent;
- }
+ public LoggingEventEventArgs(log4net.Core.LoggingEvent loggingEvent)
+ {
+ if (loggingEvent == null) throw new ArgumentNullException("loggingEvent");
+ LoggingEvent = loggingEvent;
+ }
+ }
+
+ /// <summary>
+ /// A log4net appender that raises an event each time a logging event is appended
+ /// </summary>
+ /// <remarks>
+ /// This class is intended to provide a way for test code to inspect logging
+ /// events as they are generated.
+ /// </remarks>
+ public class EventRaisingAppender : log4net.Appender.IAppender
+ {
+ public event EventHandler<LoggingEventEventArgs> LoggingEventAppended;
+
+ protected void OnLoggingEventAppended(LoggingEventEventArgs e)
+ {
+ var loggingEventAppended = LoggingEventAppended;
+ if (loggingEventAppended != null)
+ {
+ loggingEventAppended(this, e);
+ }
}
- /// <summary>
- /// A log4net appender that raises an event each time a logging event is appended
- /// </summary>
- /// <remarks>
- /// This class is intended to provide a way for test code to inspect logging
- /// events as they are generated.
- /// </remarks>
- public class EventRaisingAppender : log4net.Appender.IAppender
+ public void Close()
{
- public event EventHandler<LoggingEventEventArgs> LoggingEventAppended;
-
- protected void OnLoggingEventAppended(LoggingEventEventArgs e)
- {
- var loggingEventAppended = LoggingEventAppended;
- if (loggingEventAppended != null)
- {
- loggingEventAppended(this, e);
- }
- }
-
- public void Close()
- {
- }
-
- public void DoAppend(log4net.Core.LoggingEvent loggingEvent)
- {
- OnLoggingEventAppended(new LoggingEventEventArgs(loggingEvent));
- }
-
- public string Name
- {
- get; set;
- }
}
-}
-#endif
\ No newline at end of file
+
+ public void DoAppend(log4net.Core.LoggingEvent loggingEvent)
+ {
+ OnLoggingEventAppended(new LoggingEventEventArgs(loggingEvent));
+ }
+
+ public string Name
+ {
+ get; set;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/log4net.Tests/Appender/MemoryAppenderTest.cs b/src/log4net.Tests/Appender/MemoryAppenderTest.cs
index 7bb755b..9a6b0b2 100644
--- a/src/log4net.Tests/Appender/MemoryAppenderTest.cs
+++ b/src/log4net.Tests/Appender/MemoryAppenderTest.cs
@@ -19,8 +19,6 @@
*
*/
-#if NET_4_0 || MONO_3_5 || MONO_4_0 || NETSTANDARD
-
using System;
using System.Linq;
using System.Threading;
@@ -87,5 +85,4 @@
};
}
}
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/log4net.Tests/Appender/RecursiveLoggingTest.cs b/src/log4net.Tests/Appender/RecursiveLoggingTest.cs
index de0c196..56e54fb 100644
--- a/src/log4net.Tests/Appender/RecursiveLoggingTest.cs
+++ b/src/log4net.Tests/Appender/RecursiveLoggingTest.cs
@@ -19,7 +19,6 @@
*
*/
-#if !NET_2_0 && !MONO_2_0
using System;
using System.Globalization;
using log4net.Config;
@@ -28,53 +27,52 @@
namespace log4net.Tests.Appender
{
- [TestFixture]
- public class RecursiveLoggingTest
+ [TestFixture]
+ public class RecursiveLoggingTest
+ {
+ private EventRaisingAppender m_eventRaisingAppender;
+ private Repository.Hierarchy.Hierarchy m_hierarchy;
+ private int m_eventCount;
+ private ILogger m_logger;
+ private const int MaxRecursion = 3;
+
+ private void SetupRepository()
{
- private EventRaisingAppender m_eventRaisingAppender;
- private Repository.Hierarchy.Hierarchy m_hierarchy;
- private int m_eventCount;
- private ILogger m_logger;
- private const int MaxRecursion = 3;
+ m_hierarchy = new Repository.Hierarchy.Hierarchy();
- private void SetupRepository()
- {
- m_hierarchy = new Repository.Hierarchy.Hierarchy();
+ m_eventRaisingAppender = new EventRaisingAppender();
+ m_eventRaisingAppender.LoggingEventAppended += eventRaisingAppender_LoggingEventAppended;
- m_eventRaisingAppender = new EventRaisingAppender();
- m_eventRaisingAppender.LoggingEventAppended += eventRaisingAppender_LoggingEventAppended;
+ m_hierarchy.Root.Level = Level.All;
+ m_hierarchy.Root.AddAppender(m_eventRaisingAppender);
- m_hierarchy.Root.Level = Level.All;
- m_hierarchy.Root.AddAppender(m_eventRaisingAppender);
+ BasicConfigurator.Configure(m_hierarchy, m_eventRaisingAppender);
- BasicConfigurator.Configure(m_hierarchy, m_eventRaisingAppender);
-
- m_logger = m_hierarchy.GetLogger("test");
-
- }
-
- void eventRaisingAppender_LoggingEventAppended(object sender, LoggingEventEventArgs e)
- {
- if (m_eventCount < MaxRecursion && m_logger != null)
- {
- m_eventCount++;
- string message = String.Format(CultureInfo.CurrentCulture, "Log event {0} from EventRaisingAppender", m_eventCount);
- Console.WriteLine("Logging message: " + message);
- m_logger.Log(typeof(RecursiveLoggingTest), Level.Warn, message, null);
- }
- }
-
- [Test]
- public void TestAllowRecursiveLoggingFromAppender()
- {
- SetupRepository();
-
- m_eventCount = 0;
- m_logger.Log(typeof(RecursiveLoggingTest), Level.Warn, "Message logged", null);
-
- Assert.AreEqual(MaxRecursion, m_eventCount, "Expected MaxRecursion recursive calls");
- }
+ m_logger = m_hierarchy.GetLogger("test");
}
-}
-#endif
\ No newline at end of file
+
+ void eventRaisingAppender_LoggingEventAppended(object sender, LoggingEventEventArgs e)
+ {
+ if (m_eventCount < MaxRecursion && m_logger != null)
+ {
+ m_eventCount++;
+ string message = String.Format(CultureInfo.CurrentCulture, "Log event {0} from EventRaisingAppender", m_eventCount);
+ Console.WriteLine("Logging message: " + message);
+ m_logger.Log(typeof(RecursiveLoggingTest), Level.Warn, message, null);
+ }
+ }
+
+ [Test]
+ public void TestAllowRecursiveLoggingFromAppender()
+ {
+ SetupRepository();
+
+ m_eventCount = 0;
+ m_logger.Log(typeof(RecursiveLoggingTest), Level.Warn, "Message logged", null);
+
+ Assert.AreEqual(MaxRecursion, m_eventCount, "Expected MaxRecursion recursive calls");
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/src/log4net.Tests/Appender/RemotingAppenderTest.cs b/src/log4net.Tests/Appender/RemotingAppenderTest.cs
index 49a739f..644cd96 100644
--- a/src/log4net.Tests/Appender/RemotingAppenderTest.cs
+++ b/src/log4net.Tests/Appender/RemotingAppenderTest.cs
@@ -17,8 +17,8 @@
//
#endregion
-// .NET Compact Framework 1.0 && netstandard has no support for System.Runtime.Remoting
-#if NET_2_0
+// netstandard has no support for System.Runtime.Remoting
+#if NET462_OR_GREATER
using System;
using System.Collections;
@@ -235,11 +235,7 @@
// Setup remoting server
try
{
-#if NET_2_0 || MONO_2_0 || MONO_3_5 || MONO_4_0
ChannelServices.RegisterChannel(m_remotingChannel, false);
-#else
- ChannelServices.RegisterChannel(m_remotingChannel);
-#endif
}
catch (Exception ex)
{
@@ -457,4 +453,4 @@
}
}
-#endif // NET_2_0
\ No newline at end of file
+#endif // NET462_OR_GREATER
\ No newline at end of file
diff --git a/src/log4net.Tests/Appender/RollingFileAppenderTest.cs b/src/log4net.Tests/Appender/RollingFileAppenderTest.cs
index c6e5938..66f5d11 100644
--- a/src/log4net.Tests/Appender/RollingFileAppenderTest.cs
+++ b/src/log4net.Tests/Appender/RollingFileAppenderTest.cs
@@ -56,10 +56,8 @@
private int _MaxSizeRollBackups = 3;
private CountingAppender _caRoot;
private Logger _root;
-#if !NETSTANDARD1_3
private CultureInfo _currentCulture;
private CultureInfo _currentUICulture;
-#endif
private class SilentErrorHandler : IErrorHandler
{
private StringBuilder m_buffer = new StringBuilder();
@@ -121,14 +119,12 @@
ResetAndDeleteTestFiles();
InitializeVariables();
-#if !NETSTANDARD1_3
// set correct thread culture
_currentCulture = System.Threading.Thread.CurrentThread.CurrentCulture;
_currentUICulture = System.Threading.Thread.CurrentThread.CurrentUICulture;
System.Threading.Thread.CurrentThread.CurrentCulture =
System.Threading.Thread.CurrentThread.CurrentUICulture =
System.Globalization.CultureInfo.InvariantCulture;
-#endif
}
/// <summary>
@@ -139,11 +135,9 @@
{
ResetAndDeleteTestFiles();
-#if !NETSTANDARD1_3
// restore previous culture
System.Threading.Thread.CurrentThread.CurrentCulture = _currentCulture;
System.Threading.Thread.CurrentThread.CurrentUICulture = _currentUICulture;
-#endif
}
/// <summary>
@@ -1194,7 +1188,7 @@
_root.Level = Level.Debug;
_caRoot = new CountingAppender();
_root.AddAppender(_caRoot);
- Assert.AreEqual(_caRoot.Counter, 0);
+ Assert.AreEqual(0, _caRoot.Counter);
//
// Set the root appender with a RollingFileAppender
@@ -1602,8 +1596,7 @@
fs.Close();
AssertFileEquals(filename, "Test");
- Assert.AreEqual(sh.Message.Substring(0, 30), "Unable to acquire lock on file",
- "Expecting an error message");
+ StringAssert.StartsWith(sh.Message, "Unable to acquire lock on file", "Expecting an error message");
}
/// <summary>
@@ -1650,12 +1643,8 @@
}
catch (IOException e1)
{
-#if MONO
- Assert.AreEqual("Sharing violation on path ", e1.Message.Substring(0, 26), "Unexpected exception");
-#else
Assert.AreEqual("The process cannot access the file ", e1.Message.Substring(0, 35),
"Unexpected exception");
-#endif
locked = true;
}
@@ -1663,10 +1652,8 @@
DestroyLogger();
Assert.IsTrue(locked, "File was not locked");
-#if !MONO || MONO_3_5 || MONO_4_0 // at least on Linux with Mono 2.4 exclusive locking doesn't work as one would expect
AssertFileEquals(filename,
"This is a message" + Environment.NewLine + "This is a message 2" + Environment.NewLine);
-#endif
Assert.AreEqual("", sh.Message, "Unexpected error message");
}
@@ -1745,7 +1732,6 @@
Assert.AreEqual("", sh.Message, "Unexpected error message");
}
-#if !NETCF
/// <summary>
/// Verifies that attempting to log to a locked file fails gracefully
/// </summary>
@@ -1846,7 +1832,6 @@
AssertFileEquals(filename + ".1", "A" + Environment.NewLine);
Assert.IsEmpty(sh.Message);
}
-#endif
/// <summary>
/// Verify that the default LockModel is ExclusiveLock, to maintain backwards compatibility with previous behaviour
diff --git a/src/log4net.Tests/Appender/TraceAppenderTest.cs b/src/log4net.Tests/Appender/TraceAppenderTest.cs
index a164f74..2381525 100644
--- a/src/log4net.Tests/Appender/TraceAppenderTest.cs
+++ b/src/log4net.Tests/Appender/TraceAppenderTest.cs
@@ -55,7 +55,6 @@
categoryTraceListener.Category);
}
-#if !NETSTANDARD1_3 // "LocationInfo can't get method names on NETSTANDARD1_3 due to unavailable stack frame APIs"
[Test]
public void MethodNameCategoryTest()
{
@@ -81,7 +80,6 @@
System.Reflection.MethodInfo.GetCurrentMethod().Name,
categoryTraceListener.Category);
}
-#endif
}
public class CategoryTraceListener : TraceListener
diff --git a/src/log4net.Tests/Context/LogicalThreadContextTest.cs b/src/log4net.Tests/Context/LogicalThreadContextTest.cs
index ca8a7c1..8d61a39 100644
--- a/src/log4net.Tests/Context/LogicalThreadContextTest.cs
+++ b/src/log4net.Tests/Context/LogicalThreadContextTest.cs
@@ -17,7 +17,6 @@
//
#endregion
-#if NET_4_5 || NETSTANDARD
using System;
using System.Threading.Tasks;
using System.Linq;
@@ -340,5 +339,4 @@
}
}
}
-}
-#endif
+}
\ No newline at end of file
diff --git a/src/log4net.Tests/Core/EvaluatorTest.cs b/src/log4net.Tests/Core/EvaluatorTest.cs
index 30a31de..9ddabd9 100644
--- a/src/log4net.Tests/Core/EvaluatorTest.cs
+++ b/src/log4net.Tests/Core/EvaluatorTest.cs
@@ -70,7 +70,6 @@
Assert.AreEqual(3, m_countingAppender.Counter, "Test 3 events flushed on Info message.");
}
-#if !NETSTANDARD1_3
[Test]
public void TestExceptionEvaluator()
{
@@ -139,6 +138,5 @@
logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn message logged", new ApplicationException());
Assert.AreEqual(0, m_countingAppender.Counter, "Test 3 events buffered");
}
-#endif
}
-}
+}
\ No newline at end of file
diff --git a/src/log4net.Tests/Core/FixingTest.cs b/src/log4net.Tests/Core/FixingTest.cs
index 1431ce0..c66fd85 100644
--- a/src/log4net.Tests/Core/FixingTest.cs
+++ b/src/log4net.Tests/Core/FixingTest.cs
@@ -160,16 +160,14 @@
{
Assert.AreEqual("ReallySimpleApp", loggingEventData.Domain, "Domain is incorrect");
Assert.AreEqual("System.Exception: This is the exception", loggingEvent.GetExceptionString(), "Exception is incorrect");
- Assert.AreEqual(null, loggingEventData.Identity, "Identity is incorrect");
+ Assert.IsNull(loggingEventData.Identity, "Identity is incorrect");
Assert.AreEqual(Level.Warn, loggingEventData.Level, "Level is incorrect");
-#if !NETSTANDARD1_3 // NETSTANDARD1_3: LocationInfo can't get method names
Assert.AreEqual("get_LocationInformation", loggingEvent.LocationInformation.MethodName, "Location Info is incorrect");
-#endif
Assert.AreEqual("log4net.Tests.Core.FixingTest", loggingEventData.LoggerName, "LoggerName is incorrect");
Assert.AreEqual(LogManager.GetRepository(TEST_REPOSITORY), loggingEvent.Repository, "Repository is incorrect");
Assert.AreEqual(Thread.CurrentThread.Name, loggingEventData.ThreadName, "ThreadName is incorrect");
// This test is redundant as loggingEventData.TimeStamp is a value type and cannot be null
- // Assert.IsNotNull(loggingEventData.TimeStampUtc, "TimeStamp is incorrect");
+ //Assert.IsNotNull(loggingEventData.TimeStampUtc, "TimeStamp is incorrect");
Assert.AreEqual("TestUser", loggingEventData.UserName, "UserName is incorrect");
Assert.AreEqual("Logging event works", loggingEvent.RenderedMessage, "Message is incorrect");
}
diff --git a/src/log4net.Tests/Core/StringFormatTest.cs b/src/log4net.Tests/Core/StringFormatTest.cs
index 7aaf9b1..d13d37b 100644
--- a/src/log4net.Tests/Core/StringFormatTest.cs
+++ b/src/log4net.Tests/Core/StringFormatTest.cs
@@ -40,7 +40,6 @@
[TestFixture]
public class StringFormatTest
{
-#if !NETSTANDARD1_3
private CultureInfo _currentCulture;
private CultureInfo _currentUICulture;
@@ -60,7 +59,6 @@
System.Threading.Thread.CurrentThread.CurrentCulture = _currentCulture;
System.Threading.Thread.CurrentThread.CurrentUICulture = _currentUICulture;
}
-#endif
[Test]
public void TestFormatString()
diff --git a/src/log4net.Tests/Hierarchy/Hierarchy.cs b/src/log4net.Tests/Hierarchy/Hierarchy.cs
index 94dd017..09ae118 100644
--- a/src/log4net.Tests/Hierarchy/Hierarchy.cs
+++ b/src/log4net.Tests/Hierarchy/Hierarchy.cs
@@ -86,11 +86,7 @@
CountingAppender alpha = new CountingAppender();
CountingAppender beta = new CountingAppender();
-#if NETSTANDARD1_3
- BasicConfigurator.Configure(Utils.GetRepository(), alpha, beta);
-#else
- BasicConfigurator.Configure(alpha, beta);
-#endif
+ BasicConfigurator.Configure(Utils.GetRepository(), alpha, beta);
ILog log = LogManager.GetLogger(GetType());
log.Debug("Hello World");
diff --git a/src/log4net.Tests/Hierarchy/Logger.cs b/src/log4net.Tests/Hierarchy/Logger.cs
index 3d383f7..249e23b 100644
--- a/src/log4net.Tests/Hierarchy/Logger.cs
+++ b/src/log4net.Tests/Hierarchy/Logger.cs
@@ -18,9 +18,6 @@
#endregion
using System.Collections;
-#if NETSTANDARD1_3
-using System.Reflection;
-#endif
using log4net.Core;
using log4net.Repository.Hierarchy;
@@ -110,7 +107,7 @@
Assert.IsTrue(enumAppenders.MoveNext());
aHat = (CountingAppender)enumAppenders.Current;
Assert.AreEqual(a2, aHat);
- Assert.IsTrue(!enumAppenders.MoveNext());
+ Assert.IsFalse(enumAppenders.MoveNext());
aHat = (CountingAppender)log.GetAppender(a2.Name);
Assert.AreEqual(a2, aHat);
@@ -129,15 +126,15 @@
a.AddAppender(ca);
a.Repository.Configured = true;
- Assert.AreEqual(ca.Counter, 0);
+ Assert.AreEqual(0, ca.Counter);
ab.Log(Level.Debug, MSG, null);
- Assert.AreEqual(ca.Counter, 1);
+ Assert.AreEqual(1, ca.Counter);
ab.Log(Level.Info, MSG, null);
- Assert.AreEqual(ca.Counter, 2);
+ Assert.AreEqual(2, ca.Counter);
ab.Log(Level.Warn, MSG, null);
- Assert.AreEqual(ca.Counter, 3);
+ Assert.AreEqual(3, ca.Counter);
ab.Log(Level.Error, MSG, null);
- Assert.AreEqual(ca.Counter, 4);
+ Assert.AreEqual(4, ca.Counter);
}
/// <summary>
@@ -158,20 +155,20 @@
abc.AddAppender(ca2);
a.Repository.Configured = true;
- Assert.AreEqual(ca1.Counter, 0);
- Assert.AreEqual(ca2.Counter, 0);
+ Assert.AreEqual(0, ca1.Counter);
+ Assert.AreEqual(0, ca2.Counter);
ab.Log(Level.Debug, MSG, null);
- Assert.AreEqual(ca1.Counter, 1);
- Assert.AreEqual(ca2.Counter, 0);
+ Assert.AreEqual(1, ca1.Counter);
+ Assert.AreEqual(2, ca2.Counter);
abc.Log(Level.Debug, MSG, null);
- Assert.AreEqual(ca1.Counter, 2);
- Assert.AreEqual(ca2.Counter, 1);
+ Assert.AreEqual(2, ca1.Counter);
+ Assert.AreEqual(1, ca2.Counter);
x.Log(Level.Debug, MSG, null);
- Assert.AreEqual(ca1.Counter, 2);
- Assert.AreEqual(ca2.Counter, 1);
+ Assert.AreEqual(2, ca1.Counter);
+ Assert.AreEqual(1, ca2.Counter);
}
/// <summary>
@@ -194,26 +191,26 @@
abc.AddAppender(caABC);
a.Repository.Configured = true;
- Assert.AreEqual(caRoot.Counter, 0);
- Assert.AreEqual(caA.Counter, 0);
- Assert.AreEqual(caABC.Counter, 0);
+ Assert.AreEqual(0, caRoot.Counter);
+ Assert.AreEqual(0, caA.Counter);
+ Assert.AreEqual(0, caABC.Counter);
ab.Additivity = false;
a.Log(Level.Debug, MSG, null);
- Assert.AreEqual(caRoot.Counter, 1);
- Assert.AreEqual(caA.Counter, 1);
- Assert.AreEqual(caABC.Counter, 0);
+ Assert.AreEqual(1, caRoot.Counter);
+ Assert.AreEqual(1, caA.Counter);
+ Assert.AreEqual(0, caABC.Counter);
ab.Log(Level.Debug, MSG, null);
- Assert.AreEqual(caRoot.Counter, 1);
- Assert.AreEqual(caA.Counter, 1);
- Assert.AreEqual(caABC.Counter, 0);
+ Assert.AreEqual(1, caRoot.Counter);
+ Assert.AreEqual(1, caA.Counter);
+ Assert.AreEqual(0, caABC.Counter);
abc.Log(Level.Debug, MSG, null);
- Assert.AreEqual(caRoot.Counter, 1);
- Assert.AreEqual(caA.Counter, 1);
- Assert.AreEqual(caABC.Counter, 1);
+ Assert.AreEqual(1, caRoot.Counter);
+ Assert.AreEqual(1, caA.Counter);
+ Assert.AreEqual(1, caABC.Counter);
}
/// <summary>
@@ -230,42 +227,42 @@
h.Threshold = Level.Info;
h.Configured = true;
- Assert.AreEqual(caRoot.Counter, 0);
+ Assert.AreEqual(0, caRoot.Counter);
root.Log(Level.Debug, MSG, null);
- Assert.AreEqual(caRoot.Counter, 0);
+ Assert.AreEqual(0, caRoot.Counter);
root.Log(Level.Info, MSG, null);
- Assert.AreEqual(caRoot.Counter, 1);
+ Assert.AreEqual(1, caRoot.Counter);
root.Log(Level.Warn, MSG, null);
- Assert.AreEqual(caRoot.Counter, 2);
+ Assert.AreEqual(2, caRoot.Counter);
root.Log(Level.Warn, MSG, null);
- Assert.AreEqual(caRoot.Counter, 3);
+ Assert.AreEqual(3, caRoot.Counter);
h.Threshold = Level.Warn;
root.Log(Level.Debug, MSG, null);
- Assert.AreEqual(caRoot.Counter, 3);
+ Assert.AreEqual(3, caRoot.Counter);
root.Log(Level.Info, MSG, null);
- Assert.AreEqual(caRoot.Counter, 3);
+ Assert.AreEqual(3, caRoot.Counter);
root.Log(Level.Warn, MSG, null);
- Assert.AreEqual(caRoot.Counter, 4);
+ Assert.AreEqual(4, caRoot.Counter);
root.Log(Level.Error, MSG, null);
- Assert.AreEqual(caRoot.Counter, 5);
+ Assert.AreEqual(5, caRoot.Counter);
root.Log(Level.Error, MSG, null);
- Assert.AreEqual(caRoot.Counter, 6);
+ Assert.AreEqual(6, caRoot.Counter);
h.Threshold = Level.Off;
root.Log(Level.Debug, MSG, null);
- Assert.AreEqual(caRoot.Counter, 6);
+ Assert.AreEqual(6, caRoot.Counter);
root.Log(Level.Info, MSG, null);
- Assert.AreEqual(caRoot.Counter, 6);
+ Assert.AreEqual(6, caRoot.Counter);
root.Log(Level.Warn, MSG, null);
- Assert.AreEqual(caRoot.Counter, 6);
+ Assert.AreEqual(6, caRoot.Counter);
root.Log(Level.Error, MSG, null);
- Assert.AreEqual(caRoot.Counter, 6);
+ Assert.AreEqual(6, caRoot.Counter);
root.Log(Level.Fatal, MSG, null);
- Assert.AreEqual(caRoot.Counter, 6);
+ Assert.AreEqual(6, caRoot.Counter);
root.Log(Level.Fatal, MSG, null);
- Assert.AreEqual(caRoot.Counter, 6);
+ Assert.AreEqual(6, caRoot.Counter);
}
/// <summary>
@@ -279,15 +276,6 @@
object a_b_c = Utils.GetLogger("a.b.c");
object t;
-#if NETSTANDARD1_3
- Assert.IsNull(LogManager.Exists(GetType().GetTypeInfo().Assembly, "xx"));
- t = LogManager.Exists(GetType().GetTypeInfo().Assembly, "a");
- Assert.AreSame(a, t);
- t = LogManager.Exists(GetType().GetTypeInfo().Assembly, "a.b");
- Assert.AreSame(a_b, t);
- t = LogManager.Exists(GetType().GetTypeInfo().Assembly, "a.b.c");
- Assert.AreSame(a_b_c, t);
-#else
t = LogManager.Exists("xx");
Assert.IsNull(t);
t = LogManager.Exists("a");
@@ -296,7 +284,6 @@
Assert.AreSame(a_b, t);
t = LogManager.Exists("a.b.c");
Assert.AreSame(a_b_c, t);
-#endif
}
/// <summary>
diff --git a/src/log4net.Tests/Layout/PatternLayoutTest.cs b/src/log4net.Tests/Layout/PatternLayoutTest.cs
index ebfbfd7..9804020 100644
--- a/src/log4net.Tests/Layout/PatternLayoutTest.cs
+++ b/src/log4net.Tests/Layout/PatternLayoutTest.cs
@@ -19,9 +19,7 @@
using System;
using System.IO;
-#if !NETSTANDARD1_3
using System.Globalization;
-#endif
using log4net.Config;
using log4net.Core;
@@ -44,7 +42,6 @@
[TestFixture]
public class PatternLayoutTest
{
-#if !NETSTANDARD1_3
private CultureInfo _currentCulture;
private CultureInfo _currentUICulture;
@@ -66,7 +63,6 @@
System.Threading.Thread.CurrentThread.CurrentCulture = _currentCulture;
System.Threading.Thread.CurrentThread.CurrentUICulture = _currentUICulture;
}
-#endif
protected virtual PatternLayout NewPatternLayout()
{
@@ -106,7 +102,6 @@
stringAppender.Reset();
}
-#if !NETSTANDARD1_3
[Test]
public void TestStackTracePattern()
{
@@ -122,7 +117,6 @@
StringAssert.EndsWith("PatternLayoutTest.TestStackTracePattern", stringAppender.GetString(), "stack trace value set");
stringAppender.Reset();
}
-#endif
[Test]
public void TestGlobalPropertiesPattern()
diff --git a/src/log4net.Tests/Layout/XmlLayoutTest.cs b/src/log4net.Tests/Layout/XmlLayoutTest.cs
index 6160dc5..bbe89b5 100644
--- a/src/log4net.Tests/Layout/XmlLayoutTest.cs
+++ b/src/log4net.Tests/Layout/XmlLayoutTest.cs
@@ -36,7 +36,6 @@
[TestFixture]
public class XmlLayoutTest
{
-#if !NETSTANDARD1_3
private CultureInfo _currentCulture;
private CultureInfo _currentUICulture;
@@ -56,7 +55,6 @@
System.Threading.Thread.CurrentThread.CurrentCulture = _currentCulture;
System.Threading.Thread.CurrentThread.CurrentUICulture = _currentUICulture;
}
-#endif
/// <summary>
/// Build a basic <see cref="LoggingEventData"/> object with some default values.
@@ -82,25 +80,14 @@
private static string CreateEventNode(string message)
{
- return String.Format("<event logger=\"TestLogger\" timestamp=\"{0}\" level=\"INFO\" thread=\"TestThread\" domain=\"Tests\" identity=\"TestRunner\" username=\"TestRunner\"><message>{1}</message></event>" + Environment.NewLine,
-#if NET_2_0 || MONO_2_0 || MONO_3_5 || MONO_4_0 || NETSTANDARD
- XmlConvert.ToString(DateTime.Today, XmlDateTimeSerializationMode.Local),
-#else
- XmlConvert.ToString(DateTime.Today),
-#endif
- message);
+ return String.Format("<event logger=\"TestLogger\" timestamp=\"{0}\" level=\"INFO\" thread=\"TestThread\" domain=\"Tests\" identity=\"TestRunner\" username=\"TestRunner\"><message>{1}</message></event>" + Environment.NewLine, XmlConvert.ToString(DateTime.Today, XmlDateTimeSerializationMode.Local),
+ message);
}
private static string CreateEventNode(string key, string value)
{
return String.Format("<event logger=\"TestLogger\" timestamp=\"{0}\" level=\"INFO\" thread=\"TestThread\" domain=\"Tests\" identity=\"TestRunner\" username=\"TestRunner\"><message>Test message</message><properties><data name=\"{1}\" value=\"{2}\" /></properties></event>" + Environment.NewLine,
-#if NET_2_0 || MONO_2_0 || MONO_3_5 || MONO_4_0 || NETSTANDARD
- XmlConvert.ToString(DateTime.Today, XmlDateTimeSerializationMode.Local),
-#else
- XmlConvert.ToString(DateTime.Today),
-#endif
- key,
- value);
+ XmlConvert.ToString(DateTime.Today, XmlDateTimeSerializationMode.Local), key, value);
}
[Test]
@@ -305,7 +292,6 @@
Assert.AreEqual(expected, stringAppender.GetString());
}
-#if NET_4_0 || MONO_4_0 || NETSTANDARD
[Test]
public void BracketsInStackTracesKeepLogWellFormed()
{
@@ -358,13 +344,8 @@
bar(42);
var log = stringAppender.GetString();
-#if NETSTANDARD1_3
- var startOfExceptionText = log.IndexOf("<exception>", StringComparison.Ordinal) + 11;
- var endOfExceptionText = log.IndexOf("</exception>", StringComparison.Ordinal);
-#else
var startOfExceptionText = log.IndexOf("<exception>", StringComparison.InvariantCulture) + 11;
var endOfExceptionText = log.IndexOf("</exception>", StringComparison.InvariantCulture);
-#endif
var sub = log.Substring(startOfExceptionText, endOfExceptionText - startOfExceptionText);
if (sub.StartsWith("<![CDATA["))
{
@@ -376,6 +357,5 @@
StringAssert.DoesNotContain(">", sub);
}
}
-#endif
}
}
\ No newline at end of file
diff --git a/src/log4net.Tests/Util/EnvironmentPatternConverterTest.cs b/src/log4net.Tests/Util/EnvironmentPatternConverterTest.cs
index da11594..04a8ef1 100644
--- a/src/log4net.Tests/Util/EnvironmentPatternConverterTest.cs
+++ b/src/log4net.Tests/Util/EnvironmentPatternConverterTest.cs
@@ -19,10 +19,6 @@
*
*/
-// .NET Compact Framework 1.0 has no support for Environment.GetEnvironmentVariable()
-// .NET Framework version 1.0 / 1.1 do not have support for SetEnvironmentVariable which is used in these tests.
-#if !NETCF && (NET_2_0 || NETSTANDARD2_0)
-
using System;
using System.IO;
using NUnit.Framework;
@@ -113,6 +109,4 @@
}
}
}
-}
-
-#endif
+}
\ No newline at end of file
diff --git a/src/log4net.Tests/Util/PatternStringTest.cs b/src/log4net.Tests/Util/PatternStringTest.cs
index 3f5d52e..b418ffe 100644
--- a/src/log4net.Tests/Util/PatternStringTest.cs
+++ b/src/log4net.Tests/Util/PatternStringTest.cs
@@ -19,7 +19,7 @@
*
*/
-#if NET_2_0
+#if NET462_OR_GREATER
using System;
using log4net.Util;
@@ -112,4 +112,4 @@
}
}
}
-#endif
+#endif
\ No newline at end of file
diff --git a/src/log4net.Tests/Util/PropertiesDictionaryTest.cs b/src/log4net.Tests/Util/PropertiesDictionaryTest.cs
index 8f12f60..51cf6bf 100644
--- a/src/log4net.Tests/Util/PropertiesDictionaryTest.cs
+++ b/src/log4net.Tests/Util/PropertiesDictionaryTest.cs
@@ -17,7 +17,7 @@
//
#endregion
-#if NETFRAMEWORK
+#if NET462_OR_GREATER
using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
diff --git a/src/log4net.Tests/Util/SystemInfoTest.cs b/src/log4net.Tests/Util/SystemInfoTest.cs
index 34d57e4..f4c0c66 100644
--- a/src/log4net.Tests/Util/SystemInfoTest.cs
+++ b/src/log4net.Tests/Util/SystemInfoTest.cs
@@ -23,10 +23,8 @@
using NUnit.Framework;
-#if NET_4_0 || MONO_4_0 || NETSTANDARD
using System.Linq.Expressions;
using System.Reflection;
-#endif
namespace log4net.Tests.Util
{
@@ -37,7 +35,6 @@
public class SystemInfoTest
{
-#if NET_4_0 || MONO_4_0 || NETSTANDARD
/// <summary>
/// It's "does not throw not supported exception" NOT
/// "returns 'Dynamic Assembly' string for dynamic assemblies" by purpose.
@@ -65,13 +62,8 @@
public static string TestAssemblyLocationInfoMethod()
{
-#if NETSTANDARD1_3
- return SystemInfo.AssemblyLocationInfo(typeof(SystemInfoTest).GetTypeInfo().Assembly);
-#else
return SystemInfo.AssemblyLocationInfo(Assembly.GetCallingAssembly());
-#endif
}
-#endif
[Test]
public void TestGetTypeFromStringFullyQualified()
@@ -88,7 +80,6 @@
Assert.AreSame(typeof(SystemInfoTest), t, "Test explicit case in-sensitive type load lower");
}
-#if !NETSTANDARD1_3
[Test]
[Platform(Include = "Win")]
public void TestGetTypeFromStringCaseInsensitiveOnAssemblyName()
@@ -101,7 +92,6 @@
t = GetTypeFromString("log4net.tests.util.systeminfotest,log4net.tests", false, true);
Assert.AreSame(typeof(SystemInfoTest), t, "Test explicit case in-sensitive type load lower");
}
-#endif
[Test]
public void TestGetTypeFromStringRelative()
@@ -118,7 +108,6 @@
Assert.AreSame(typeof(SystemInfoTest), t, "Test explicit case in-sensitive type load lower");
}
-#if !NETSTANDARD1_3
[Test]
public void TestGetTypeFromStringSearch()
{
@@ -135,7 +124,6 @@
t = GetTypeFromString("log4net.util.systeminfo", false, true);
Assert.AreSame(typeof(SystemInfo), t, "Test explicit case in-sensitive type load lower");
}
-#endif
[Test]
public void TestGetTypeFromStringFails1()
@@ -164,11 +152,7 @@
// are exposed for NETSTANDARD1_3.
private Type GetTypeFromString(string typeName, bool throwOnError, bool ignoreCase)
{
-#if NETSTANDARD1_3
- return SystemInfo.GetTypeFromString(GetType().GetTypeInfo().Assembly, typeName, throwOnError, ignoreCase);
-#else
return SystemInfo.GetTypeFromString(typeName, throwOnError, ignoreCase);
-#endif
}
[Test]
diff --git a/src/log4net.Tests/Utils.cs b/src/log4net.Tests/Utils.cs
index 5264ad5..67b2842 100644
--- a/src/log4net.Tests/Utils.cs
+++ b/src/log4net.Tests/Utils.cs
@@ -39,30 +39,17 @@
public static object CreateInstance(Type targetType)
{
-#if NETSTANDARD1_3
-
- return targetType.GetConstructor(new Type[0]).Invoke(null);
-#else
- return targetType.GetConstructor(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, new Type[0], null).Invoke(null);
-#endif
+ return targetType.GetConstructor(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, Type.EmptyTypes, null).Invoke(null);
}
public static object InvokeMethod(object target, string name, params object[] args)
{
-#if NETSTANDARD1_3
- return target.GetType().GetTypeInfo().GetDeclaredMethod(name).Invoke(target, args);
-#else
return target.GetType().GetMethod(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance, null, GetTypesArray(args), null).Invoke(target, args);
-#endif
}
public static object InvokeMethod(Type target, string name, params object[] args)
{
-#if NETSTANDARD1_3
- return target.GetTypeInfo().GetDeclaredMethod(name).Invoke(null, args);
-#else
return target.GetMethod(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static, null, GetTypesArray(args), null).Invoke(null, args);
-#endif
}
public static object GetField(object target, string name)
@@ -120,28 +107,18 @@
{
GlobalContext.Properties.Remove(PROPERTY_KEY);
ThreadContext.Properties.Remove(PROPERTY_KEY);
-#if !NETCF
LogicalThreadContext.Properties.Remove(PROPERTY_KEY);
-#endif
}
// Wrappers because repository/logger retrieval APIs require an Assembly argument on NETSTANDARD1_3
internal static ILog GetLogger(string name)
{
-#if NETSTANDARD1_3
- return LogManager.GetLogger(typeof(Utils).GetTypeInfo().Assembly, name);
-#else
return LogManager.GetLogger(name);
-#endif
}
internal static ILoggerRepository GetRepository()
{
-#if NETSTANDARD1_3
- return LogManager.GetRepository(typeof(Utils).GetTypeInfo().Assembly);
-#else
return LogManager.GetRepository();
-#endif
}
}
}
\ No newline at end of file
diff --git a/src/log4net.Tests/log4net.Tests.csproj b/src/log4net.Tests/log4net.Tests.csproj
index f841d0b..cc1e2ad 100644
--- a/src/log4net.Tests/log4net.Tests.csproj
+++ b/src/log4net.Tests/log4net.Tests.csproj
@@ -19,7 +19,6 @@
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
