From e5f1639f241213d45b354753a721c1600edc1fde Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Mon, 25 Aug 2008 12:46:33 +0000 Subject: [PATCH] * JdkLogger passes null method name now - it's allowed in the specification explicitly. * Better failure tracking in ServerBootStrapTest (still not sure if it's reproduceable) --- .../java/org/jboss/netty/logging/JdkLogger.java | 16 ++++++++-------- .../netty/bootstrap/ServerBootstrapTest.java | 8 +++++--- .../org/jboss/netty/logging/JdkLoggerTest.java | 16 ++++++++-------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/jboss/netty/logging/JdkLogger.java b/src/main/java/org/jboss/netty/logging/JdkLogger.java index e4ad915bfb..fd446c5438 100644 --- a/src/main/java/org/jboss/netty/logging/JdkLogger.java +++ b/src/main/java/org/jboss/netty/logging/JdkLogger.java @@ -43,27 +43,27 @@ class JdkLogger implements InternalLogger { } public void debug(String msg) { - logger.logp(Level.FINE, loggerName, "-", msg); + logger.logp(Level.FINE, loggerName, null, msg); } public void debug(String msg, Throwable cause) { - logger.logp(Level.FINE, loggerName, "-", msg, cause); + logger.logp(Level.FINE, loggerName, null, msg, cause); } public void error(String msg) { - logger.logp(Level.SEVERE, loggerName, "-", msg); + logger.logp(Level.SEVERE, loggerName, null, msg); } public void error(String msg, Throwable cause) { - logger.logp(Level.SEVERE, loggerName, "-", msg, cause); + logger.logp(Level.SEVERE, loggerName, null, msg, cause); } public void info(String msg) { - logger.logp(Level.INFO, loggerName, "-", msg); + logger.logp(Level.INFO, loggerName, null, msg); } public void info(String msg, Throwable cause) { - logger.logp(Level.INFO, loggerName, "-", msg, cause); + logger.logp(Level.INFO, loggerName, null, msg, cause); } public boolean isDebugEnabled() { @@ -83,11 +83,11 @@ class JdkLogger implements InternalLogger { } public void warn(String msg) { - logger.logp(Level.WARNING, loggerName, "-", msg); + logger.logp(Level.WARNING, loggerName, null, msg); } public void warn(String msg, Throwable cause) { - logger.logp(Level.WARNING, loggerName, "-", msg, cause); + logger.logp(Level.WARNING, loggerName, null, msg, cause); } @Override diff --git a/src/test/java/org/jboss/netty/bootstrap/ServerBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/ServerBootstrapTest.java index e6ecbbe155..43a68e7210 100644 --- a/src/test/java/org/jboss/netty/bootstrap/ServerBootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/ServerBootstrapTest.java @@ -79,7 +79,6 @@ public class ServerBootstrapTest { } } - @Test(timeout = 10000, expected = ChannelException.class) public void testFailedBindAttempt() throws Exception { ServerBootstrap bootstrap = new ServerBootstrap(); @@ -88,7 +87,7 @@ public class ServerBootstrapTest { bootstrap.bind(); } - @Test //(timeout = 10000) + @Test(timeout = 10000) public void testSuccessfulBindAttempt() throws Exception { ServerBootstrap bootstrap = new ServerBootstrap( new OioServerSocketChannelFactory(executor, executor)); @@ -134,9 +133,12 @@ public class ServerBootstrapTest { Thread.yield(); } - while ("12".equals(pch.result.toString())) { + // FIXME Sometimes hangs here (seems like childChannelClosed is not called at all?) + while (pch.result.length() < 2) { Thread.yield(); } + + assertEquals("12", pch.result.toString()); } @Test(expected = ChannelPipelineException.class) diff --git a/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java b/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java index d977366521..887147f425 100644 --- a/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java +++ b/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java @@ -99,7 +99,7 @@ public class JdkLoggerTest { java.util.logging.Logger mock = createStrictMock(java.util.logging.Logger.class); - mock.logp(Level.FINE, "foo", "-", "a"); + mock.logp(Level.FINE, "foo", null, "a"); replay(mock); InternalLogger logger = new JdkLogger(mock, "foo"); @@ -112,7 +112,7 @@ public class JdkLoggerTest { java.util.logging.Logger mock = createStrictMock(java.util.logging.Logger.class); - mock.logp(Level.FINE, "foo", "-", "a", e); + mock.logp(Level.FINE, "foo", null, "a", e); replay(mock); InternalLogger logger = new JdkLogger(mock, "foo"); @@ -125,7 +125,7 @@ public class JdkLoggerTest { java.util.logging.Logger mock = createStrictMock(java.util.logging.Logger.class); - mock.logp(Level.INFO, "foo", "-", "a"); + mock.logp(Level.INFO, "foo", null, "a"); replay(mock); InternalLogger logger = new JdkLogger(mock, "foo"); @@ -138,7 +138,7 @@ public class JdkLoggerTest { java.util.logging.Logger mock = createStrictMock(java.util.logging.Logger.class); - mock.logp(Level.INFO, "foo", "-", "a", e); + mock.logp(Level.INFO, "foo", null, "a", e); replay(mock); InternalLogger logger = new JdkLogger(mock, "foo"); @@ -151,7 +151,7 @@ public class JdkLoggerTest { java.util.logging.Logger mock = createStrictMock(java.util.logging.Logger.class); - mock.logp(Level.WARNING, "foo", "-", "a"); + mock.logp(Level.WARNING, "foo", null, "a"); replay(mock); InternalLogger logger = new JdkLogger(mock, "foo"); @@ -164,7 +164,7 @@ public class JdkLoggerTest { java.util.logging.Logger mock = createStrictMock(java.util.logging.Logger.class); - mock.logp(Level.WARNING, "foo", "-", "a", e); + mock.logp(Level.WARNING, "foo", null, "a", e); replay(mock); InternalLogger logger = new JdkLogger(mock, "foo"); @@ -177,7 +177,7 @@ public class JdkLoggerTest { java.util.logging.Logger mock = createStrictMock(java.util.logging.Logger.class); - mock.logp(Level.SEVERE, "foo", "-", "a"); + mock.logp(Level.SEVERE, "foo", null, "a"); replay(mock); InternalLogger logger = new JdkLogger(mock, "foo"); @@ -190,7 +190,7 @@ public class JdkLoggerTest { java.util.logging.Logger mock = createStrictMock(java.util.logging.Logger.class); - mock.logp(Level.SEVERE, "foo", "-", "a", e); + mock.logp(Level.SEVERE, "foo", null, "a", e); replay(mock); InternalLogger logger = new JdkLogger(mock, "foo");