Skip to content

Commit 86f728c

Browse files
hazzikhazzik
committed
test: fix log4net configuration for .NET 6
1 parent 8956a40 commit 86f728c

File tree

5 files changed

+51
-48
lines changed

5 files changed

+51
-48
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ available-test-configurations
4040
current-test-configuration
4141
NHibernate.VisualState.xml
4242
.vs/
43+
.idea/
4344
consumable/
4445
employee/
4546
employer/

‎src/NHibernate.Search.Tests/App.config

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<configuration>
33
<configSections>
44
<section name="hibernate-configuration" type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate"/>
5-
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
65
</configSections>
76

87
<connectionStrings>
@@ -41,49 +40,4 @@
4140
<listener class="NHibernate.Search.Event.FullTextIndexCollectionEventListener, NHibernate.Search" type="post-collection-update"/>
4241
</session-factory>
4342
</hibernate-configuration>
44-
45-
<!-- This section contains the log4net configuration settings -->
46-
<log4net debug="false">
47-
<appender name="trace" type="log4net.Appender.TraceAppender, log4net">
48-
<layout type="log4net.Layout.PatternLayout,log4net">
49-
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/>
50-
</layout>
51-
</appender>
52-
53-
<appender name="console" type="log4net.Appender.ConsoleAppender, log4net">
54-
<layout type="log4net.Layout.PatternLayout,log4net">
55-
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/>
56-
</layout>
57-
</appender>
58-
59-
<appender name="rollingFile" type="log4net.Appender.RollingFileAppender,log4net">
60-
<param name="File" value="log.txt"/>
61-
<param name="AppendToFile" value="false"/>
62-
<param name="RollingStyle" value="Date"/>
63-
<param name="DatePattern" value="yyyy.MM.dd"/>
64-
<param name="StaticLogFileName" value="true"/>
65-
66-
<layout type="log4net.Layout.PatternLayout,log4net">
67-
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
68-
</layout>
69-
</appender>
70-
71-
<!-- Setup the root category, add the appenders and set the default priority -->
72-
<root>
73-
<priority value="WARN"/>
74-
<appender-ref ref="rollingFile"/>
75-
</root>
76-
77-
<logger name="NHibernate.Bytecode.CodeDom">
78-
<priority value="OFF"/>
79-
</logger>
80-
81-
<logger name="NHibernate.SQL">
82-
<level value="OFF"/>
83-
</logger>
84-
85-
<logger name="NHibernate.Tool.hbm2ddl.SchemaExport">
86-
<level value="WARN"/>
87-
</logger>
88-
</log4net>
8943
</configuration>

‎src/NHibernate.Search.Tests/NHibernate.Search.Tests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
</PropertyGroup>
55
<ItemGroup>
66
<None Remove="**/*.hbm.xml" />
7+
<None Update="log4net.config">
8+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
9+
</None>
710
</ItemGroup>
811
<ItemGroup>
912
<EmbeddedResource Include="**/*.hbm.xml" />

‎src/NHibernate.Search.Tests/TestCase.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace NHibernate.Test
2222

2323
public abstract partial class TestCase
2424
{
25-
private static readonly ILog log = LogManager.GetLogger(typeof(TestCase));
25+
private static readonly ILog log;
2626
private const bool OutputDdl = false;
2727

2828
protected Configuration cfg;
@@ -70,7 +70,8 @@ protected virtual bool RunFixtureSetUpAndTearDownForEachTest
7070
static TestCase()
7171
{
7272
// Configure log4net here since configuration through an attribute doesn't always work.
73-
XmlConfigurator.Configure();
73+
XmlConfigurator.Configure(new FileInfo("log4net.config"));
74+
log = LogManager.GetLogger(typeof(TestCase));
7475
}
7576

7677
#region Public methods

‎src/NHibernate.Search.Tests/log4net.config

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0"?>
2+
<log4net debug="false">
3+
<appender name="trace" type="log4net.Appender.TraceAppender, log4net">
4+
<layout type="log4net.Layout.PatternLayout,log4net">
5+
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/>
6+
</layout>
7+
</appender>
8+
9+
<appender name="console" type="log4net.Appender.ConsoleAppender, log4net">
10+
<layout type="log4net.Layout.PatternLayout,log4net">
11+
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/>
12+
</layout>
13+
</appender>
14+
15+
<appender name="rollingFile" type="log4net.Appender.RollingFileAppender,log4net">
16+
<param name="File" value="log.txt"/>
17+
<param name="AppendToFile" value="false"/>
18+
<param name="RollingStyle" value="Date"/>
19+
<param name="DatePattern" value="yyyy.MM.dd"/>
20+
<param name="StaticLogFileName" value="true"/>
21+
22+
<layout type="log4net.Layout.PatternLayout,log4net">
23+
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
24+
</layout>
25+
</appender>
26+
27+
<!-- Setup the root category, add the appenders and set the default priority -->
28+
<root>
29+
<priority value="WARN"/>
30+
<appender-ref ref="rollingFile"/>
31+
</root>
32+
33+
<logger name="NHibernate.Bytecode.CodeDom">
34+
<priority value="OFF"/>
35+
</logger>
36+
37+
<logger name="NHibernate.SQL">
38+
<level value="OFF"/>
39+
</logger>
40+
41+
<logger name="NHibernate.Tool.hbm2ddl.SchemaExport">
42+
<level value="WARN"/>
43+
</logger>
44+
</log4net>

0 commit comments

Comments
 (0)