natas_hw
/
slf4j
mirror of https://github.com/qos-ch/slf4j
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Unit test update for JUL record parameters" 

This reverts commit 5e3eebc08d.

Reasons explained in comments to pull request 97.
This commit is contained in:
Ceki Gulcu 2015-10-16 11:41:01 +02:00
parent f29c85d0ad
commit 014780fde9
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
slf4j-jdk14/src/test/java/org/slf4j/InvocationTest.java
View File

@ -71,7 +71,6 @@ public class InvocationTest {
Logger logger = LoggerFactory.getLogger("test1");
logger.debug("Hello world.");
assertLogMessage("Hello world.", 0);
assertParameters(null, 0);
}
@Test
@ -84,48 +83,28 @@ public class InvocationTest {
int index = 0;
logger.debug("Hello world");
assertLogMessage("Hello world", index);
assertParameters(null, index++);
assertLogMessage("Hello world", index++);
logger.debug("Hello world {}", i1);
assertLogMessage("Hello world " + i1, index);
assertParameters(new Object[] { i1 }, index++);
assertLogMessage("Hello world " + i1, index++);
logger.debug("val={} val={}", i1, i2);
assertLogMessage("val=1 val=2", index);
assertParameters(new Object[] { i1, i2 }, index++);
assertLogMessage("val=1 val=2", index++);
logger.debug("val={} val={} val={}", new Object[] { i1, i2, i3 });
assertLogMessage("val=1 val=2 val=3", index);
assertParameters(new Object[] { i1, i2, i3 }, index++);
logger.debug("val={} val={} val={}", i1, i2, i3, e);
assertLogMessage("val=1 val=2 val=3", index);
assertException(e.getClass(), index);
assertParameters(new Object[] { i1, i2, i3 }, index++);
assertLogMessage("val=1 val=2 val=3", index++);
logger.debug("Hello world 2", e);
assertLogMessage("Hello world 2", index);
assertException(e.getClass(), index);
assertParameters(null, index++);
assertException(e.getClass(), index++);
logger.info("Hello world 2.");
assertParameters(null, index++);
logger.warn("Hello world 3.");
assertParameters(null, index++);
logger.warn("Hello world 3", e);
assertParameters(null, index++);
logger.error("Hello world 4.");
assertParameters(null, index++);
logger.error("Hello world {}", new Integer(3));
assertParameters(new Object[] { i3 }, index++);
logger.error("Hello world 4.", e);
assertParameters(null, index++);
}
@Test
@ -190,12 +169,6 @@ public class InvocationTest {
assertEquals(expected, logRecord.getMessage());
}
private void assertParameters(Object[] parameters, int index) {
LogRecord logRecord = listHandler.recordList.get(index);
Assert.assertNotNull(logRecord);
Assert.assertArrayEquals(parameters, logRecord.getParameters());
}
private void assertException(Class<? extends Throwable> exceptionType, int index) {
LogRecord logRecord = listHandler.recordList.get(index);
Assert.assertNotNull(logRecord);