Skip to content

Commit 1a655ba

Browse files
committed
NH-2779 - Use provided LogSpy which restores log level on dispose
1 parent ae3f056 commit 1a655ba

File tree

1 file changed

+5
-32
lines changed
  • src/NHibernate.Test/NHSpecificTest/NH2779

1 file changed

+5
-32
lines changed
Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
using System;
2-
using log4net;
3-
using log4net.Appender;
1+
using log4net;
42
using log4net.Core;
5-
using log4net.Layout;
6-
using log4net.Repository.Hierarchy;
73
using NUnit.Framework;
84

95
namespace NHibernate.Test.NHSpecificTest.NH2779
@@ -17,14 +13,14 @@ public void Test()
1713
using (ISession session = OpenSession())
1814
using (ITransaction tx = session.BeginTransaction())
1915
{
20-
Order order = new Order() { OrderId = "Order-1", InternalOrderId = 1 };
16+
Order order = new Order { OrderId = "Order-1", InternalOrderId = 1 };
2117
session.Save(order);
2218
tx.Commit();
2319
}
2420

25-
using (ISession session = OpenSession())
26-
using (ITransaction tx = session.BeginTransaction())
27-
using (LogSpy logSpy = new LogSpy()) // <-- Logging must be set DEBUG to reproduce bug
21+
using (var session = OpenSession())
22+
using (var tx = session.BeginTransaction())
23+
using (new LogSpy(LogManager.GetLogger("NHibernate"), Level.All)) // <-- Logging must be set DEBUG to reproduce bug
2824
{
2925
Order order = session.Get<Order>("Order-1");
3026
Assert.IsNotNull(order);
@@ -34,28 +30,5 @@ public void Test()
3430
tx.Commit();
3531
}
3632
}
37-
38-
public class LogSpy : IDisposable
39-
{
40-
private readonly DebugAppender appender;
41-
private readonly Logger loggerImpl;
42-
43-
public LogSpy()
44-
{
45-
appender = new DebugAppender
46-
{
47-
Layout = new PatternLayout("%message"),
48-
Threshold = Level.All
49-
};
50-
loggerImpl = (Logger)LogManager.GetLogger("NHibernate").Logger;
51-
loggerImpl.AddAppender(appender);
52-
loggerImpl.Level = Level.All;
53-
}
54-
55-
public void Dispose()
56-
{
57-
loggerImpl.RemoveAppender(appender);
58-
}
59-
}
6033
}
6134
}

0 commit comments

Comments
 (0)