Skip to content

Commit fa042ed

Browse files
committed
DATAMONGO-1645 - Polishing.
Clean up appender and log level after test run. Suppress log output during tests. Original pull request: #450.
1 parent 64066e3 commit fa042ed

File tree

1 file changed

+28
-6
lines changed

1 file changed

+28
-6
lines changed

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListenerTests.java

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,58 @@
2222
import ch.qos.logback.classic.spi.ILoggingEvent;
2323
import ch.qos.logback.core.read.ListAppender;
2424

25+
import org.junit.After;
2526
import org.junit.Before;
2627
import org.junit.Test;
2728
import org.slf4j.LoggerFactory;
2829

2930
import com.mongodb.BasicDBObject;
3031

3132
/**
33+
* Tests for {@link LoggingEventListener}.
34+
*
3235
* @author Christoph Strobl
36+
* @author Mark Paluch
3337
*/
3438
public class LoggingEventListenerTests {
3539

36-
LoggingEventListener listener;
3740
ListAppender<ILoggingEvent> appender;
41+
ch.qos.logback.classic.Logger logger;
42+
LoggingEventListener listener;
3843

3944
@Before
4045
public void setUp() {
4146

47+
appender = new ListAppender<ILoggingEvent>();
48+
4249
// set log level for LoggingEventListener to "info" and set up an appender capturing events.
43-
ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger) LoggerFactory
44-
.getLogger(LoggingEventListener.class);
45-
logger.setLevel(Level.toLevel("info"));
50+
logger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(LoggingEventListener.class);
4651

47-
appender = new ListAppender();
52+
logger.setAdditive(false);
53+
logger.setLevel(Level.INFO);
4854
logger.addAppender(appender);
55+
4956
appender.start();
5057

5158
listener = new LoggingEventListener();
5259
}
5360

61+
@After
62+
public void tearDown() {
63+
64+
// cleanup
65+
if (logger != null) {
66+
67+
logger.detachAppender(appender);
68+
logger.setAdditive(true);
69+
logger.setLevel(null);
70+
}
71+
72+
if (appender != null) {
73+
appender.stop();
74+
}
75+
}
76+
5477
@Test // DATAMONGO-1645
5578
public void shouldSerializeAfterConvertEventCorrectly() {
5679

@@ -98,5 +121,4 @@ public void shouldSerializeAfterDeleteEventEventCorrectly() {
98121
static class Foo {
99122

100123
}
101-
102124
}

0 commit comments

Comments
 (0)