From jboss-remoting-commits at lists.jboss.org Wed Aug 4 22:10:58 2010 Content-Type: multipart/mixed; boundary="===============1150574167906901768==" MIME-Version: 1.0 From: jboss-remoting-commits at lists.jboss.org To: jboss-remoting-commits at lists.jboss.org Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6042 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/interrupt. Date: Wed, 04 Aug 2010 22:10:58 -0400 Message-ID: <201008050210.o752Aw21020848@svn01.web.mwc.hst.phx2.redhat.com> --===============1150574167906901768== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ron.sigal(a)jboss.com Date: 2010-08-04 22:10:57 -0400 (Wed, 04 Aug 2010) New Revision: 6042 Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socke= t/interrupt/InterruptedExceptionTestCase.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socke= t/interrupt/MockInvokerInterruptTestCase.java Log: JBREM-1241: Added svn:eol-style subversion property. Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transpor= t/socket/interrupt/InterruptedExceptionTestCase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/sock= et/interrupt/InterruptedExceptionTestCase.java 2010-08-05 02:10:04 UTC (rev= 6041) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/sock= et/interrupt/InterruptedExceptionTestCase.java 2010-08-05 02:10:57 UTC (rev= 6042) @@ -1,364 +1,364 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.remoting.transport.socket.interrupt; - -import java.net.InetAddress; -import java.util.HashMap; -import java.util.Map; - -import javax.management.MBeanServer; - -import junit.framework.TestCase; - -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.PatternLayout; -import org.jboss.logging.XLevel; -import org.jboss.remoting.CannotConnectException; -import org.jboss.remoting.Client; -import org.jboss.remoting.InvocationRequest; -import org.jboss.remoting.InvokerLocator; -import org.jboss.remoting.ServerInvocationHandler; -import org.jboss.remoting.ServerInvoker; -import org.jboss.remoting.callback.InvokerCallbackHandler; -import org.jboss.remoting.transport.Connector; -import org.jboss.remoting.transport.PortUtil; -import org.jboss.remoting.transport.socket.MicroSocketClientInvoker; - - -/** - * Unit test for JBREM-955. - * = - * @author Ron Sigal - * @version $Revision: 1.1 $ - *

- * Copyright Apr 25, 2008 - *

- */ -public class InterruptedExceptionTestCase extends TestCase -{ - private static Logger log =3D Logger.getLogger(InterruptedExceptionTest= Case.class); - = - private static boolean firstTime =3D true; - private static String FAST =3D "fast"; - = - protected String host; - protected int port; - protected String locatorURI; - protected InvokerLocator serverLocator; - protected Connector connector; - protected TestInvocationHandler invocationHandler; - - = - public void setUp() throws Exception - { - if (firstTime) - { - firstTime =3D false; - Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO); - Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO); - String pattern =3D "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n"; - PatternLayout layout =3D new PatternLayout(pattern); - ConsoleAppender consoleAppender =3D new ConsoleAppender(layout); - Logger.getRootLogger().addAppender(consoleAppender); = - } - } - - = - public void tearDown() - { - } - = - = - public void testNotWrappedInterruptedExceptionDefault() throws Throwable - { - log.info("entering " + getName()); - = - // Start server. - setupServer(); - = - // Create client. - InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); - HashMap clientConfig =3D new HashMap(); - clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); - clientConfig.put(MicroSocketClientInvoker.MAX_POOL_SIZE_FLAG, "1"); - clientConfig.put("numberOfCallRetries", "1"); - addExtraClientConfig(clientConfig); - Client client =3D new Client(clientLocator, clientConfig); - client.connect(); - log.info("client is connected"); - = - // Test connections. - assertEquals(FAST, client.invoke(FAST)); - log.info("connection is good"); - = - InvokerThread t1 =3D new InvokerThread(client, "abc"); - InvokerThread t2 =3D new InvokerThread(client, "xyz"); - = - // Start first invocation. - t1.start(); - log.info("started first invocation"); - = - // Give first invocation time to start. - Thread.sleep(5000); - = - // Start second invocation. - t2.start(); - log.info("started second invocation"); - = - // Give second invocation time to start. - Thread.sleep(5000); - = - // Interrupt second invocation as it waits for a semaphore. - t2.interrupt(); - log.info("interrupted second invocation"); - - // Wait until second invocation throws an exception. - synchronized (t2) - { - t2.wait(10000); - } - = - // Verify exception is an CannotConnectException (not wrapped in a R= untimeException). - Throwable t =3D t2.throwable; - log.info("throwable: " + t); - assertTrue(t instanceof CannotConnectException); - assertTrue(t.getCause() instanceof InterruptedException); - = - client.disconnect(); - shutdownServer(); - log.info(getName() + " PASSES"); - } - = - = - public void testNotWrappedInterruptedExceptionConfigured() throws Throw= able - { - log.info("entering " + getName()); - = - // Start server. - setupServer(); - = - // Create client. - InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); - HashMap clientConfig =3D new HashMap(); - clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); - clientConfig.put(MicroSocketClientInvoker.MAX_POOL_SIZE_FLAG, "1"); - clientConfig.put("numberOfCallRetries", "1"); - clientConfig.put(MicroSocketClientInvoker.WRAP_INTERRUPTED_EXCEPTION= , "false"); - addExtraClientConfig(clientConfig); - Client client =3D new Client(clientLocator, clientConfig); - client.connect(); - log.info("client is connected"); - = - // Test connections. - assertEquals(FAST, client.invoke(FAST)); - log.info("connection is good"); - = - InvokerThread t1 =3D new InvokerThread(client, "abc"); - InvokerThread t2 =3D new InvokerThread(client, "xyz"); - = - // Start first invocation. - t1.start(); - log.info("started first invocation"); - = - // Give first invocation time to start. - Thread.sleep(5000); - = - // Start second invocation. - t2.start(); - log.info("started second invocation"); - = - // Give second invocation time to start. - Thread.sleep(5000); - = - // Interrupt second invocation as it waits for a semaphore. - t2.interrupt(); - log.info("interrupted second invocation"); - - // Wait until second invocation throws an exception. - synchronized (t2) - { - t2.wait(10000); - } - = - // Verify exception is an CannotConnectException (not wrapped in a R= untimeException). - Throwable t =3D t2.throwable; - log.info("throwable: " + t); - assertTrue(t instanceof CannotConnectException); - assertTrue(t.getCause() instanceof InterruptedException); - = - client.disconnect(); - shutdownServer(); - log.info(getName() + " PASSES"); - } - = - = - public void testWrappedInterruptedException() throws Throwable - { - log.info("entering " + getName()); - = - // Start server. - setupServer(); - = - // Create client. - InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); - HashMap clientConfig =3D new HashMap(); - clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); - clientConfig.put(MicroSocketClientInvoker.MAX_POOL_SIZE_FLAG, "1"); - clientConfig.put("numberOfCallRetries", "1"); - clientConfig.put(MicroSocketClientInvoker.WRAP_INTERRUPTED_EXCEPTION= , "true"); - addExtraClientConfig(clientConfig); - Client client =3D new Client(clientLocator, clientConfig); - client.connect(); - log.info("client is connected"); - = - // Test connections. - assertEquals(FAST, client.invoke(FAST)); - log.info("connection is good"); - = - InvokerThread t1 =3D new InvokerThread(client, "abc"); - InvokerThread t2 =3D new InvokerThread(client, "xyz"); - = - // Start first invocation. - t1.start(); - log.info("started first invocation"); - = - // Give first invocation time to start. - Thread.sleep(5000); - = - // Start second invocation. - t2.start(); - log.info("started second invocation"); - = - // Give second invocation time to start. - Thread.sleep(5000); - = - // Interrupt second invocation as it waits for a semaphore. - t2.interrupt(); - log.info("interrupted second invocation"); - - // Wait until second invocation throws an exception. - synchronized (t2) - { - t2.wait(10000); - } - = - // Verify exception is an InterruptedException wrapped in a RuntimeE= xception. - Throwable t =3D t2.throwable; - log.info("throwable: " + t); - assertTrue(t instanceof RuntimeException); - assertFalse(t instanceof CannotConnectException); - assertTrue(t.getCause() instanceof InterruptedException); - = - client.disconnect(); - shutdownServer(); - log.info(getName() + " PASSES"); - } - = - = - protected String getTransport() - { - return "socket"; - } - = - = - protected void addExtraClientConfig(Map config) {} - protected void addExtraServerConfig(Map config) {} - = - - protected void setupServer() throws Exception - { - host =3D InetAddress.getLocalHost().getHostAddress(); - port =3D PortUtil.findFreePort(host); - locatorURI =3D getTransport() + "://" + host + ":" + port; = - serverLocator =3D new InvokerLocator(locatorURI); - log.info("Starting remoting server with locator uri of: " + locatorU= RI); - HashMap config =3D new HashMap(); - config.put(InvokerLocator.FORCE_REMOTE, "true"); - addExtraServerConfig(config); - connector =3D new Connector(serverLocator, config); - connector.create(); - invocationHandler =3D new TestInvocationHandler(); - connector.addInvocationHandler("test", invocationHandler); - connector.start(); - } - = - = - protected void shutdownServer() throws Exception - { - if (connector !=3D null) - connector.stop(); - } - = - = - static class TestInvocationHandler implements ServerInvocationHandler - { - public void addListener(InvokerCallbackHandler callbackHandler) {} - public Object invoke(final InvocationRequest invocation) throws Thro= wable - { - Object o =3D invocation.getParameter(); - if (!FAST.equals(o)) - { - Thread.sleep(20000); - } - return invocation.getParameter(); - } - public void removeListener(InvokerCallbackHandler callbackHandler) {} - public void setMBeanServer(MBeanServer server) {} - public void setInvoker(ServerInvoker invoker) {} - } - = - = - static class InvokerThread extends Thread - { - static int counter; - Client client; - String message; - Throwable throwable; - = - public InvokerThread(Client client, String message) - { - this.client =3D client; - this.message =3D message; - setName("InvokerThread:" + counter++); - } - = - public void run() - { - try - { - log.info("invocation succeeded: " + client.invoke(message)); - } - catch (Throwable t) - { - throwable =3D t; - log.error("invocation error: " + t.getMessage()); - } - = - synchronized (this) - { - notify(); - } - } - } +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.remoting.transport.socket.interrupt; + +import java.net.InetAddress; +import java.util.HashMap; +import java.util.Map; + +import javax.management.MBeanServer; + +import junit.framework.TestCase; + +import org.apache.log4j.ConsoleAppender; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.apache.log4j.PatternLayout; +import org.jboss.logging.XLevel; +import org.jboss.remoting.CannotConnectException; +import org.jboss.remoting.Client; +import org.jboss.remoting.InvocationRequest; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.ServerInvocationHandler; +import org.jboss.remoting.ServerInvoker; +import org.jboss.remoting.callback.InvokerCallbackHandler; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; +import org.jboss.remoting.transport.socket.MicroSocketClientInvoker; + + +/** + * Unit test for JBREM-955. + * = + * @author Ron Sigal + * @version $Revision: 1.1 $ + *

+ * Copyright Apr 25, 2008 + *

+ */ +public class InterruptedExceptionTestCase extends TestCase +{ + private static Logger log =3D Logger.getLogger(InterruptedExceptionTest= Case.class); + = + private static boolean firstTime =3D true; + private static String FAST =3D "fast"; + = + protected String host; + protected int port; + protected String locatorURI; + protected InvokerLocator serverLocator; + protected Connector connector; + protected TestInvocationHandler invocationHandler; + + = + public void setUp() throws Exception + { + if (firstTime) + { + firstTime =3D false; + Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO); + Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO); + String pattern =3D "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n"; + PatternLayout layout =3D new PatternLayout(pattern); + ConsoleAppender consoleAppender =3D new ConsoleAppender(layout); + Logger.getRootLogger().addAppender(consoleAppender); = + } + } + + = + public void tearDown() + { + } + = + = + public void testNotWrappedInterruptedExceptionDefault() throws Throwable + { + log.info("entering " + getName()); + = + // Start server. + setupServer(); + = + // Create client. + InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); + HashMap clientConfig =3D new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(MicroSocketClientInvoker.MAX_POOL_SIZE_FLAG, "1"); + clientConfig.put("numberOfCallRetries", "1"); + addExtraClientConfig(clientConfig); + Client client =3D new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + = + // Test connections. + assertEquals(FAST, client.invoke(FAST)); + log.info("connection is good"); + = + InvokerThread t1 =3D new InvokerThread(client, "abc"); + InvokerThread t2 =3D new InvokerThread(client, "xyz"); + = + // Start first invocation. + t1.start(); + log.info("started first invocation"); + = + // Give first invocation time to start. + Thread.sleep(5000); + = + // Start second invocation. + t2.start(); + log.info("started second invocation"); + = + // Give second invocation time to start. + Thread.sleep(5000); + = + // Interrupt second invocation as it waits for a semaphore. + t2.interrupt(); + log.info("interrupted second invocation"); + + // Wait until second invocation throws an exception. + synchronized (t2) + { + t2.wait(10000); + } + = + // Verify exception is an CannotConnectException (not wrapped in a R= untimeException). + Throwable t =3D t2.throwable; + log.info("throwable: " + t); + assertTrue(t instanceof CannotConnectException); + assertTrue(t.getCause() instanceof InterruptedException); + = + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + = + = + public void testNotWrappedInterruptedExceptionConfigured() throws Throw= able + { + log.info("entering " + getName()); + = + // Start server. + setupServer(); + = + // Create client. + InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); + HashMap clientConfig =3D new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(MicroSocketClientInvoker.MAX_POOL_SIZE_FLAG, "1"); + clientConfig.put("numberOfCallRetries", "1"); + clientConfig.put(MicroSocketClientInvoker.WRAP_INTERRUPTED_EXCEPTION= , "false"); + addExtraClientConfig(clientConfig); + Client client =3D new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + = + // Test connections. + assertEquals(FAST, client.invoke(FAST)); + log.info("connection is good"); + = + InvokerThread t1 =3D new InvokerThread(client, "abc"); + InvokerThread t2 =3D new InvokerThread(client, "xyz"); + = + // Start first invocation. + t1.start(); + log.info("started first invocation"); + = + // Give first invocation time to start. + Thread.sleep(5000); + = + // Start second invocation. + t2.start(); + log.info("started second invocation"); + = + // Give second invocation time to start. + Thread.sleep(5000); + = + // Interrupt second invocation as it waits for a semaphore. + t2.interrupt(); + log.info("interrupted second invocation"); + + // Wait until second invocation throws an exception. + synchronized (t2) + { + t2.wait(10000); + } + = + // Verify exception is an CannotConnectException (not wrapped in a R= untimeException). + Throwable t =3D t2.throwable; + log.info("throwable: " + t); + assertTrue(t instanceof CannotConnectException); + assertTrue(t.getCause() instanceof InterruptedException); + = + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + = + = + public void testWrappedInterruptedException() throws Throwable + { + log.info("entering " + getName()); + = + // Start server. + setupServer(); + = + // Create client. + InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); + HashMap clientConfig =3D new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(MicroSocketClientInvoker.MAX_POOL_SIZE_FLAG, "1"); + clientConfig.put("numberOfCallRetries", "1"); + clientConfig.put(MicroSocketClientInvoker.WRAP_INTERRUPTED_EXCEPTION= , "true"); + addExtraClientConfig(clientConfig); + Client client =3D new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + = + // Test connections. + assertEquals(FAST, client.invoke(FAST)); + log.info("connection is good"); + = + InvokerThread t1 =3D new InvokerThread(client, "abc"); + InvokerThread t2 =3D new InvokerThread(client, "xyz"); + = + // Start first invocation. + t1.start(); + log.info("started first invocation"); + = + // Give first invocation time to start. + Thread.sleep(5000); + = + // Start second invocation. + t2.start(); + log.info("started second invocation"); + = + // Give second invocation time to start. + Thread.sleep(5000); + = + // Interrupt second invocation as it waits for a semaphore. + t2.interrupt(); + log.info("interrupted second invocation"); + + // Wait until second invocation throws an exception. + synchronized (t2) + { + t2.wait(10000); + } + = + // Verify exception is an InterruptedException wrapped in a RuntimeE= xception. + Throwable t =3D t2.throwable; + log.info("throwable: " + t); + assertTrue(t instanceof RuntimeException); + assertFalse(t instanceof CannotConnectException); + assertTrue(t.getCause() instanceof InterruptedException); + = + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + = + = + protected String getTransport() + { + return "socket"; + } + = + = + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + = + + protected void setupServer() throws Exception + { + host =3D InetAddress.getLocalHost().getHostAddress(); + port =3D PortUtil.findFreePort(host); + locatorURI =3D getTransport() + "://" + host + ":" + port; = + serverLocator =3D new InvokerLocator(locatorURI); + log.info("Starting remoting server with locator uri of: " + locatorU= RI); + HashMap config =3D new HashMap(); + config.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraServerConfig(config); + connector =3D new Connector(serverLocator, config); + connector.create(); + invocationHandler =3D new TestInvocationHandler(); + connector.addInvocationHandler("test", invocationHandler); + connector.start(); + } + = + = + protected void shutdownServer() throws Exception + { + if (connector !=3D null) + connector.stop(); + } + = + = + static class TestInvocationHandler implements ServerInvocationHandler + { + public void addListener(InvokerCallbackHandler callbackHandler) {} + public Object invoke(final InvocationRequest invocation) throws Thro= wable + { + Object o =3D invocation.getParameter(); + if (!FAST.equals(o)) + { + Thread.sleep(20000); + } + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } + = + = + static class InvokerThread extends Thread + { + static int counter; + Client client; + String message; + Throwable throwable; + = + public InvokerThread(Client client, String message) + { + this.client =3D client; + this.message =3D message; + setName("InvokerThread:" + counter++); + } + = + public void run() + { + try + { + log.info("invocation succeeded: " + client.invoke(message)); + } + catch (Throwable t) + { + throwable =3D t; + log.error("invocation error: " + t.getMessage()); + } + = + synchronized (this) + { + notify(); + } + } + } } \ No newline at end of file Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoti= ng/transport/socket/interrupt/InterruptedExceptionTestCase.java ___________________________________________________________________ Name: svn:eol-style + native Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoti= ng/transport/socket/interrupt/MockInvokerInterruptTestCase.java ___________________________________________________________________ Name: svn:eol-style + native --===============1150574167906901768==--