From jboss-remoting-commits at lists.jboss.org Thu Mar  6 03:17:46 2008
Content-Type: multipart/mixed; boundary="===============2403570237769571328=="
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: r3574 - in
 remoting2/branches/2.x/src/tests/org/jboss/test/remoting: version and 1 other
 directory.
Date: Thu, 06 Mar 2008 03:17:45 -0500
Message-ID: <E1JXBIP-0001Nv-VX@committer01.frg.pub.inap.atl.jboss.com>

--===============2403570237769571328==
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 03:17:45 -0500 (Thu, 06 Mar 2008)
New Revision: 3574

Added:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/Configu=
rableVersionTestParent.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/HttpCon=
figurableVersionTestCase.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/RMIConf=
igurableVersionTestCase.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/SocketC=
onfigurableVersionTestCase.java
Log:
JBREM-764: New unit tests.

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/Con=
figurableVersionTestParent.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/version/Config=
urableVersionTestParent.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/Config=
urableVersionTestParent.java	2008-03-06 08:17:45 UTC (rev 3574)
@@ -0,0 +1,194 @@
+/*
+* 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.version;
+
+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.Remoting;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.Version;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+
+
+/**
+ * Unit test for JBREM-764.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Mar 6, 2008
+ * </p>
+ */
+public abstract class ConfigurableVersionTestParent extends TestCase
+{
+   private static Logger log =3D Logger.getLogger(ConfigurableVersionTestP=
arent.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);  =

+      }
+   }
+
+   =

+   public void tearDown()
+   {
+   }
+   =

+   =

+   public void testVersions() throws Throwable
+   {
+      log.info("entering " + getName());
+      =

+      // Start servers.
+      Connector connector1 =3D setupServer(Version.VERSION_1);
+      Connector connector2 =3D setupServer(Version.VERSION_2);
+      Connector connector22 =3D setupServer(Version.VERSION_2_2);
+      Connector connector0 =3D setupServer(-1);
+      =

+      // Create clients.
+      Client client1 =3D setupClient(connector1);
+      Client client2 =3D setupClient(connector2);
+      Client client22 =3D setupClient(connector22);
+      Client client0 =3D setupClient(connector0);
+      =

+      // Test connections.
+      assertEquals("abc", client1.invoke("abc"));
+      assertEquals("abc", client2.invoke("abc"));
+      assertEquals("abc", client22.invoke("abc"));
+      assertEquals("abc", client0.invoke("abc"));
+      =

+      client1.disconnect();
+      client2.disconnect();
+      client22.disconnect();
+      client0.disconnect();
+      =

+      connector1.stop();
+      connector2.stop();
+      connector22.stop();
+      connector0.stop();
+      =

+      log.info(getName() + " PASSES");
+   }
+   =

+   =

+   abstract protected String getTransport();
+   =

+   =

+   protected void addExtraClientConfig(Map config) {}
+   protected void addExtraServerConfig(Map config) {}
+   =

+
+   protected Connector setupServer(int version) throws Exception
+   {
+      host =3D InetAddress.getLocalHost().getHostAddress();
+      port =3D PortUtil.findFreePort(host);
+      locatorURI =3D getTransport() + "://" + host + ":" + port + "/?";
+      =

+      if (version > 0)
+      {
+         locatorURI +=3D Remoting.REMOTING_VERSION + "=3D" + version;
+      }
+      else
+      {
+         locatorURI +=3D "x=3Dy";
+      }
+      =

+      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();
+      return connector;
+   }
+   =

+   =

+   protected Client setupClient(Connector connector) throws Exception
+   {
+      InvokerLocator locator =3D connector.getLocator();
+      HashMap config =3D new HashMap();
+      config.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraClientConfig(config);
+      Client client =3D new Client(locator, config);
+      client.connect();
+      log.info("client is connected to: " + locator);
+      return client;
+   }
+   =

+   =

+   static class TestInvocationHandler implements ServerInvocationHandler
+   {
+      public void addListener(InvokerCallbackHandler callbackHandler) {}
+      public Object invoke(final InvocationRequest invocation) throws Thro=
wable
+      {
+         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/version/Htt=
pConfigurableVersionTestCase.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/version/HttpCo=
nfigurableVersionTestCase.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/HttpCo=
nfigurableVersionTestCase.java	2008-03-06 08:17:45 UTC (rev 3574)
@@ -0,0 +1,41 @@
+/*
+* 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.version;
+
+
+/**
+ * Unit test for JBREM-764.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Mar 6, 2008
+ * </p>
+ */
+public class HttpConfigurableVersionTestCase extends ConfigurableVersionTe=
stParent
+{
+   protected String getTransport()
+   {
+      return "http";
+   }
+}
+

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/RMI=
ConfigurableVersionTestCase.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/version/RMICon=
figurableVersionTestCase.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/RMICon=
figurableVersionTestCase.java	2008-03-06 08:17:45 UTC (rev 3574)
@@ -0,0 +1,41 @@
+/*
+* 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.version;
+
+
+/**
+ * Unit test for JBREM-764.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Mar 6, 2008
+ * </p>
+ */
+public class RMIConfigurableVersionTestCase extends ConfigurableVersionTes=
tParent
+{
+   protected String getTransport()
+   {
+      return "rmi";
+   }
+}
+

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/Soc=
ketConfigurableVersionTestCase.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/version/Socket=
ConfigurableVersionTestCase.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/version/Socket=
ConfigurableVersionTestCase.java	2008-03-06 08:17:45 UTC (rev 3574)
@@ -0,0 +1,41 @@
+/*
+* 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.version;
+
+
+/**
+ * Unit test for JBREM-764.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Mar 6, 2008
+ * </p>
+ */
+public class SocketConfigurableVersionTestCase extends ConfigurableVersion=
TestParent
+{
+   protected String getTransport()
+   {
+      return "socket";
+   }
+}
+


--===============2403570237769571328==--