Skip to content

Commit f745a69

Browse files
FreeAndNilFreeAndNil
authored
use raw strings for config files in unit tests (#203)
* - use raw strings for config files in unt tests - fixed more warnings * - normalized indentation for raw strings - removed type prefixes from parameters in RollingFileAppenderTest
1 parent f0cbfea commit f745a69

22 files changed

+694
-790
lines changed

‎src/log4net.Tests/Appender/AdoNetAppenderTest.cs

+145-139
Large diffs are not rendered by default.

‎src/log4net.Tests/Appender/AppenderCollectionTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class AppenderCollectionTest
3838
[Test]
3939
public void ToArrayTest()
4040
{
41-
AppenderCollection appenderCollection = new();
41+
AppenderCollection appenderCollection = [];
4242
IAppender appender = new MemoryAppender();
4343
appenderCollection.Add(appender);
4444

@@ -51,7 +51,7 @@ public void ToArrayTest()
5151
[Test]
5252
public void ReadOnlyToArrayTest()
5353
{
54-
AppenderCollection appenderCollection = new();
54+
AppenderCollection appenderCollection = [];
5555
IAppender appender = new MemoryAppender();
5656
appenderCollection.Add(appender);
5757
AppenderCollection readonlyAppenderCollection = AppenderCollection.ReadOnly(appenderCollection);

‎src/log4net.Tests/Appender/FileAppenderTest.cs

+44-42
Original file line numberDiff line numberDiff line change
@@ -72,27 +72,28 @@ public void FilenameWithPatternStringTest()
7272
try
7373
{
7474
XmlDocument log4NetConfig = new();
75-
log4NetConfig.LoadXml("""
76-
<log4net>
77-
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
78-
<layout type="log4net.Layout.PatternLayout">
79-
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
80-
</layout>
81-
</appender>
82-
<appender name="GeneralFileAppender" type="log4net.Appender.FileAppender">
83-
<file type="log4net.Util.PatternString" value="Logs\file_%property{LogName}_%date{yyyyMMddHHmmss}.Log"/>
84-
<appendToFile value="true"/>
85-
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
86-
<layout type="log4net.Layout.PatternLayout">
87-
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
88-
</layout>
89-
</appender>
90-
<root>
91-
<level value="INFO"/>
92-
<appender-ref ref="GeneralFileAppender"/>
93-
</root>
94-
</log4net>
95-
""");
75+
log4NetConfig.LoadXml(
76+
"""
77+
<log4net>
78+
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
79+
<layout type="log4net.Layout.PatternLayout">
80+
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
81+
</layout>
82+
</appender>
83+
<appender name="GeneralFileAppender" type="log4net.Appender.FileAppender">
84+
<file type="log4net.Util.PatternString" value="Logs\file_%property{LogName}_%date{yyyyMMddHHmmss}.Log"/>
85+
<appendToFile value="true"/>
86+
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
87+
<layout type="log4net.Layout.PatternLayout">
88+
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
89+
</layout>
90+
</appender>
91+
<root>
92+
<level value="INFO"/>
93+
<appender-ref ref="GeneralFileAppender"/>
94+
</root>
95+
</log4net>
96+
""");
9697
ILoggerRepository rep = LogManager.CreateRepository(Guid.NewGuid().ToString());
9798
XmlConfigurator.Configure(rep, log4NetConfig["log4net"]!);
9899
}
@@ -119,27 +120,28 @@ public void FilenameWithGlobalContextPatternStringTest()
119120
}
120121

121122
XmlDocument log4NetConfig = new();
122-
log4NetConfig.LoadXml("""
123-
<log4net>
124-
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
125-
<layout type="log4net.Layout.PatternLayout">
126-
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
127-
</layout>
128-
</appender>
129-
<appender name="GeneralFileAppender" type="log4net.Appender.FileAppender">
130-
<file type="log4net.Util.PatternString" value="Logs\file_%property{LogName}_%date{yyyyMMddHHmmss}.Log"/>
131-
<appendToFile value="true"/>
132-
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
133-
<layout type="log4net.Layout.PatternLayout">
134-
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
135-
</layout>
136-
</appender>
137-
<root>
138-
<level value="INFO"/>
139-
<appender-ref ref="GeneralFileAppender"/>
140-
</root>
141-
</log4net>
142-
""");
123+
log4NetConfig.LoadXml(
124+
"""
125+
<log4net>
126+
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
127+
<layout type="log4net.Layout.PatternLayout">
128+
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
129+
</layout>
130+
</appender>
131+
<appender name="GeneralFileAppender" type="log4net.Appender.FileAppender">
132+
<file type="log4net.Util.PatternString" value="Logs\file_%property{LogName}_%date{yyyyMMddHHmmss}.Log"/>
133+
<appendToFile value="true"/>
134+
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
135+
<layout type="log4net.Layout.PatternLayout">
136+
<conversionPattern value="%date{ABSOLUTE} [%logger] %level - %message%newline%exception"/>
137+
</layout>
138+
</appender>
139+
<root>
140+
<level value="INFO"/>
141+
<appender-ref ref="GeneralFileAppender"/>
142+
</root>
143+
</log4net>
144+
""");
143145
ILoggerRepository rep = LogManager.CreateRepository(Guid.NewGuid().ToString());
144146
// latest possible moment to set GlobalContext property used in filename
145147
GlobalContext.Properties["LogName"] = "custom_log_issue_193";

0 commit comments

Comments
 (0)