Use generics
This commit is contained in:
@@ -70,7 +70,7 @@ public class CustomConfigTestCase extends DefaultConfigTestCase {
|
|||||||
/**
|
/**
|
||||||
* <p>The expected log records.</p>
|
* <p>The expected log records.</p>
|
||||||
*/
|
*/
|
||||||
protected List expected;
|
protected List<LogRecord> expected;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>The message strings that should have been logged.</p>
|
* <p>The message strings that should have been logged.</p>
|
||||||
@@ -109,18 +109,17 @@ public class CustomConfigTestCase extends DefaultConfigTestCase {
|
|||||||
|
|
||||||
/** Hook for subclasses */
|
/** Hook for subclasses */
|
||||||
protected void checkDecoratedDateTime() {
|
protected void checkDecoratedDateTime() {
|
||||||
assertEquals("yyyy/MM/dd HH:mm:ss:SSS zzz",
|
assertEquals("yyyy/MM/dd HH:mm:ss:SSS zzz", ((DecoratedSimpleLog) log).getDateTimeFormat());
|
||||||
((DecoratedSimpleLog) log).getDateTimeFormat());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check the actual log records against the expected ones
|
// Check the actual log records against the expected ones
|
||||||
protected void checkExpected() {
|
protected void checkExpected() {
|
||||||
final List acts = ((DecoratedSimpleLog) log).getCache();
|
final List<LogRecord> acts = ((DecoratedSimpleLog) log).getCache();
|
||||||
final Iterator exps = expected.iterator();
|
final Iterator<LogRecord> exps = expected.iterator();
|
||||||
int n = 0;
|
int n = 0;
|
||||||
while (exps.hasNext()) {
|
while (exps.hasNext()) {
|
||||||
final LogRecord exp = (LogRecord) exps.next();
|
final LogRecord exp = exps.next();
|
||||||
final LogRecord act = (LogRecord) acts.get(n++);
|
final LogRecord act = acts.get(n++);
|
||||||
assertEquals("Row " + n + " type", exp.type, act.type);
|
assertEquals("Row " + n + " type", exp.type, act.type);
|
||||||
assertEquals("Row " + n + " message", exp.message, act.message);
|
assertEquals("Row " + n + " message", exp.message, act.message);
|
||||||
assertEquals("Row " + n + " throwable", exp.t, act.t);
|
assertEquals("Row " + n + " throwable", exp.t, act.t);
|
||||||
@@ -197,7 +196,7 @@ public class CustomConfigTestCase extends DefaultConfigTestCase {
|
|||||||
public void setUp() throws Exception {
|
public void setUp() throws Exception {
|
||||||
LogFactory.releaseAll();
|
LogFactory.releaseAll();
|
||||||
setProperties();
|
setProperties();
|
||||||
expected = new ArrayList();
|
expected = new ArrayList<>();
|
||||||
setUpFactory();
|
setUpFactory();
|
||||||
setUpLog("DecoratedLogger");
|
setUpLog("DecoratedLogger");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user