From jboss-remoting-commits at lists.jboss.org Thu Mar 6 23:52:57 2008 Content-Type: multipart/mixed; boundary="===============2014061167597722500==" 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: r3583 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compress. Date: Thu, 06 Mar 2008 23:52:57 -0500 Message-ID: --===============2014061167597722500== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ron.sigal(a)jboss.com Date: 2008-03-06 23:52:56 -0500 (Thu, 06 Mar 2008) New Revision: 3583 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compre= ss/BisocketCompressionStressTestCase.java remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compre= ss/CompressionStressTestParent.java remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compre= ss/HttpCompressionStressTestCase.java remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compre= ss/RMICompressionStressTestCase.java remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compre= ss/SocketCompressionStressTestCase.java Log: JBREM-677: New unit tests. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/co= mpress/BisocketCompressionStressTestCase.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.x/src/tests/org/jboss/test/remoting/marshall/compr= ess/BisocketCompressionStressTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compr= ess/BisocketCompressionStressTestCase.java 2008-03-07 04:52:56 UTC (rev 358= 3) @@ -0,0 +1,42 @@ +/* +* 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.marshall.compress; + +import org.jboss.test.remoting.marshall.compress.CompressionStressTestPare= nt; + +/** + * Unit test for JBREM-677. + * = + * @author Ron Sigal + * @version $Revision: 1.1 $ + *

+ * Copyright Mar 6, 2008 + *

+ */ +public class BisocketCompressionStressTestCase extends CompressionStressTe= stParent +{ + protected String getTransport() + { + return "bisocket"; + } +} + Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/co= mpress/CompressionStressTestParent.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.x/src/tests/org/jboss/test/remoting/marshall/compr= ess/CompressionStressTestParent.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compr= ess/CompressionStressTestParent.java 2008-03-07 04:52:56 UTC (rev 3583) @@ -0,0 +1,189 @@ +/* +* 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.marshall.compress; + +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.Client; +import org.jboss.remoting.InvocationRequest; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.MicroRemoteClientInvoker; +import org.jboss.remoting.ServerInvocationHandler; +import org.jboss.remoting.ServerInvoker; +import org.jboss.remoting.callback.InvokerCallbackHandler; +import org.jboss.remoting.marshal.MarshalFactory; +import org.jboss.remoting.marshal.compress.CompressingMarshaller; +import org.jboss.remoting.marshal.compress.CompressingUnMarshaller; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; + + +/** + * Unit test for JBREM-677. + * = + * @author Ron Sigal + * @version $Revision: 1.1 $ + *

+ * Copyright Mar 6, 2008 + *

+ */ +abstract public class CompressionStressTestParent extends TestCase +{ + private static Logger log =3D Logger.getLogger(CompressionStressTestPar= ent.class); + = + private static boolean firstTime =3D true; + = + 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); = + MarshalFactory.addMarshaller("compress", new CompressingMarshalle= r(), new CompressingUnMarshaller()); + } + } + + = + public void tearDown() + { + } + = + = + public void testCompression() 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"); + addExtraClientConfig(clientConfig); + Client client =3D new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + = + // Test connections. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + = + // Verify CompressingMarshaller / CompressingUnMarshaller are being = used. + MicroRemoteClientInvoker invoker =3D (MicroRemoteClientInvoker) clie= nt.getInvoker(); + assertTrue(invoker.getMarshaller() instanceof CompressingMarshaller); + assertTrue(invoker.getUnMarshaller() instanceof CompressingUnMarshal= ler); + = + StringBuffer sb =3D new StringBuffer(10000); + for (int i =3D 0; i < 40000; i++) + { + sb.append(((char) i % 10)); + String msg =3D sb.toString(); + Object result =3D client.invoke(msg); + assertEquals("failed on invocation " + i, msg, result); + + if ((i + 1) % 1000 =3D=3D 0) + { + log.info("invocations: " + (i + 1)); + log.info("length: " + msg.length()); + } + } + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + = + = + abstract protected String getTransport(); + = + = + 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 + "/?datat= ype=3Dcompress"; = + String parameters =3D System.getProperty("remoting.metadata"); = + if (parameters !=3D null) locatorURI +=3D "&" + parameters; + 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 + { +// log.info("parameter: " + invocation.getParameter()); +// log.info("server: type: " + invocation.getParameter().getClass(= )); +// log.info("server length: " + ((String)invocation.getParameter()= ).length()); + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } +} \ No newline at end of file Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/co= mpress/HttpCompressionStressTestCase.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.x/src/tests/org/jboss/test/remoting/marshall/compr= ess/HttpCompressionStressTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compr= ess/HttpCompressionStressTestCase.java 2008-03-07 04:52:56 UTC (rev 3583) @@ -0,0 +1,42 @@ +/* +* 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.marshall.compress; + +import org.jboss.test.remoting.marshall.compress.CompressionStressTestPare= nt; + +/** + * Unit test for JBREM-677. + * = + * @author Ron Sigal + * @version $Revision: 1.1 $ + *

+ * Copyright Mar 6, 2008 + *

+ */ +public class HttpCompressionStressTestCase extends CompressionStressTestPa= rent +{ + protected String getTransport() + { + return "http"; + } +} + Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/co= mpress/RMICompressionStressTestCase.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.x/src/tests/org/jboss/test/remoting/marshall/compr= ess/RMICompressionStressTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compr= ess/RMICompressionStressTestCase.java 2008-03-07 04:52:56 UTC (rev 3583) @@ -0,0 +1,42 @@ +/* +* 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.marshall.compress; + +import org.jboss.test.remoting.marshall.compress.CompressionStressTestPare= nt; + +/** + * Unit test for JBREM-677. + * = + * @author Ron Sigal + * @version $Revision: 1.1 $ + *

+ * Copyright Mar 6, 2008 + *

+ */ +public class RMICompressionStressTestCase extends CompressionStressTestPar= ent +{ + protected String getTransport() + { + return "rmi"; + } +} + Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/co= mpress/SocketCompressionStressTestCase.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.x/src/tests/org/jboss/test/remoting/marshall/compr= ess/SocketCompressionStressTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compr= ess/SocketCompressionStressTestCase.java 2008-03-07 04:52:56 UTC (rev 3583) @@ -0,0 +1,43 @@ +/* +* 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.marshall.compress; + +import org.jboss.test.remoting.marshall.compress.CompressionStressTestPare= nt; + + +/** + * Unit test for JBREM-677. + * = + * @author Ron Sigal + * @version $Revision: 1.1 $ + *

+ * Copyright Mar 6, 2008 + *

+ */ +public class SocketCompressionStressTestCase extends CompressionStressTest= Parent +{ + protected String getTransport() + { + return "socket"; + } +} + --===============2014061167597722500==--