Skip to content

use raw strings for config files in unit tests #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 1, 2024
Merged

use raw strings for config files in unit tests #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9154f44
- use raw strings for config files in unt tests
FreeAndNil Oct 31, 2024
8408611
- normalized indentation for raw strings
FreeAndNil Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
284 changes: 145 additions & 139 deletions src/log4net.Tests/Appender/AdoNetAppenderTest.cs
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/log4net.Tests/Appender/AppenderCollectionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class AppenderCollectionTest
[Test]
public void ToArrayTest()
{
AppenderCollection appenderCollection = new();
AppenderCollection appenderCollection = [];
IAppender appender = new MemoryAppender();
appenderCollection.Add(appender);

Expand All @@ -51,7 +51,7 @@ public void ToArrayTest()
[Test]
public void ReadOnlyToArrayTest()
{
AppenderCollection appenderCollection = new();
AppenderCollection appenderCollection = [];
IAppender appender = new MemoryAppender();
appenderCollection.Add(appender);
AppenderCollection readonlyAppenderCollection = AppenderCollection.ReadOnly(appenderCollection);
Expand Down
86 changes: 44 additions & 42 deletions src/log4net.Tests/Appender/FileAppenderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,27 +72,28 @@ public void FilenameWithPatternStringTest()
try
{
XmlDocument log4NetConfig = new();
log4NetConfig.LoadXml("""
<log4net>
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
</layout>
</appender>
<appender name="GeneralFileAppender" type="log4net.Appender.FileAppender">
<file type="log4net.Util.PatternString" value="Logs\file_%property{LogName}_%date{yyyyMMddHHmmss}.Log"/>
<appendToFile value="true"/>
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
</layout>
</appender>
<root>
<level value="INFO"/>
<appender-ref ref="GeneralFileAppender"/>
</root>
</log4net>
""");
log4NetConfig.LoadXml(
"""
<log4net>
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
</layout>
</appender>
<appender name="GeneralFileAppender" type="log4net.Appender.FileAppender">
<file type="log4net.Util.PatternString" value="Logs\file_%property{LogName}_%date{yyyyMMddHHmmss}.Log"/>
<appendToFile value="true"/>
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
</layout>
</appender>
<root>
<level value="INFO"/>
<appender-ref ref="GeneralFileAppender"/>
</root>
</log4net>
""");
ILoggerRepository rep = LogManager.CreateRepository(Guid.NewGuid().ToString());
XmlConfigurator.Configure(rep, log4NetConfig["log4net"]!);
}
Expand All @@ -119,27 +120,28 @@ public void FilenameWithGlobalContextPatternStringTest()
}

XmlDocument log4NetConfig = new();
log4NetConfig.LoadXml("""
<log4net>
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
</layout>
</appender>
<appender name="GeneralFileAppender" type="log4net.Appender.FileAppender">
<file type="log4net.Util.PatternString" value="Logs\file_%property{LogName}_%date{yyyyMMddHHmmss}.Log"/>
<appendToFile value="true"/>
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
</layout>
</appender>
<root>
<level value="INFO"/>
<appender-ref ref="GeneralFileAppender"/>
</root>
</log4net>
""");
log4NetConfig.LoadXml(
"""
<log4net>
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
</layout>
</appender>
<appender name="GeneralFileAppender" type="log4net.Appender.FileAppender">
<file type="log4net.Util.PatternString" value="Logs\file_%property{LogName}_%date{yyyyMMddHHmmss}.Log"/>
<appendToFile value="true"/>
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
</layout>
</appender>
<root>
<level value="INFO"/>
<appender-ref ref="GeneralFileAppender"/>
</root>
</log4net>
""");
ILoggerRepository rep = LogManager.CreateRepository(Guid.NewGuid().ToString());
// latest possible moment to set GlobalContext property used in filename
GlobalContext.Properties["LogName"] = "custom_log_issue_193";
Expand Down
Loading