This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 7fbeda0f115752a2042515c83f4fd77a7077527f (commit) from ef8c30e3a4eebe0bfdf07720fee75da99b979a35 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=7fbeda0f115752a2042515c83... http://github.com/ceki/logback/commit/7fbeda0f115752a2042515c83f4fd77a707752... commit 7fbeda0f115752a2042515c83f4fd77a7077527f Author: Ceki Gulcu <ceki@qos.ch> Date: Tue Jan 18 13:30:12 2011 +0100 costmetic changes diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java index 17331fd..d1e472c 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java @@ -159,8 +159,8 @@ public class ReconfigureOnChangeTest { loggerContext.getStatusManager().add( new InfoStatus("end of execution ", this)); - long expectedRreconfigurations = runnableArray[0].getCounter(); - verify(expectedRreconfigurations); + long expectedReconfigurations = runnableArray[0].getCounter(); + verify(expectedReconfigurations); } void verify(long expectedReconfigurations) { @@ -172,10 +172,10 @@ public class ReconfigureOnChangeTest { // the number of effective resets must be equal or less than // expectedReconfigurations assertTrue(effectiveResets <= expectedReconfigurations); + // however, there should be some effective resets String failMsg = "effective=" + effectiveResets + ", expected=" + expectedReconfigurations; - // we can't have the test succeed under JDK 1.5, punt and require 1.6+ if (Env.isJDK6OrHigher()) { assertTrue(failMsg, diff --git a/logback-core/src/test/java/ch/qos/logback/core/spi/AppenderAttachableImplLockTest.java b/logback-core/src/test/java/ch/qos/logback/core/spi/AppenderAttachableImplLockTest.java index 89e4a94..e9e1130 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/spi/AppenderAttachableImplLockTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/spi/AppenderAttachableImplLockTest.java @@ -13,11 +13,7 @@ */ package ch.qos.logback.core.spi; -import static org.easymock.EasyMock.createStrictMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.makeThreadSafe; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import org.easymock.EasyMock; import org.junit.Test; @@ -57,9 +53,9 @@ public class AppenderAttachableImplLockTest { @Test(timeout = 1000) public void getAppenderBoom() { - Appender<Integer> mockAppender1 = createStrictMock(Appender.class); - expect(mockAppender1.getName()).andThrow(new OutOfMemoryError("oops")); - replay(mockAppender1); + Appender<Integer> mockAppender1 = EasyMock.createStrictMock(Appender.class); + EasyMock.expect(mockAppender1.getName()).andThrow(new OutOfMemoryError("oops")); + EasyMock.replay(mockAppender1); aai.addAppender(mockAppender1); try { @@ -69,20 +65,20 @@ public class AppenderAttachableImplLockTest { // this leaves the read lock locked. } - Appender<Integer> mockAppender2=createStrictMock(Appender.class); + Appender<Integer> mockAppender2=EasyMock.createStrictMock(Appender.class); // the next call will lock - aai.addAppender(mockAppender2); - verify(mockAppender1); + aai.addAppender(mockAppender2); + EasyMock.verify(mockAppender1); } @SuppressWarnings("unchecked") @Test(timeout = 1000) public void detachAppenderBoom() throws InterruptedException { - Appender<Integer> mockAppender = createStrictMock(Appender.class); - makeThreadSafe(mockAppender, true); - expect(mockAppender.getName()).andThrow(new OutOfMemoryError("oops")); + Appender<Integer> mockAppender = EasyMock.createStrictMock(Appender.class); + EasyMock.makeThreadSafe(mockAppender, true); + EasyMock.expect(mockAppender.getName()).andThrow(new OutOfMemoryError("oops")); mockAppender.doAppend(17); - replay(mockAppender); + EasyMock.replay(mockAppender); aai.addAppender(mockAppender); Thread t = new Thread(new Runnable() { @@ -101,7 +97,7 @@ public class AppenderAttachableImplLockTest { // the next call will lock aai.appendLoopOnAppenders(17); - verify(mockAppender); + EasyMock.verify(mockAppender); } } ----------------------------------------------------------------------- Summary of changes: .../classic/turbo/ReconfigureOnChangeTest.java | 6 ++-- .../core/spi/AppenderAttachableImplLockTest.java | 28 ++++++++----------- 2 files changed, 15 insertions(+), 19 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.