[jboss-remoting-commits] JBoss Remoting SVN: r4407 - in remoting2/branches/2.2/src/tests/org/jboss/test/remoting: transport/bisocket/socketfactory and 8 other directories.

Author: ron.sigal(a)jboss.com Date: 2008-07-18 23:57:10 -0400 (Fri, 18 Jul 2008) New Revision: 4407 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SSLSocketFactoryClassNameTestRoot.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SocketFactoryClassNameTestRoot.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/socketfactory/SocketFactoryClassNameTestCase.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/socketfactory/ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/socketfactory/SocketFactoryClassNameTestCase.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/rmi/socketfactory/SocketFactoryClassNameTestCase.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/rmi/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketfactory/SocketFactoryClassNameTestCase.java Log: JBREM-1014: New and updated unit tests. Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SSLSocketFactoryClassNameTestRoot.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SSLSocketFactoryClassNameTestRoot.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SSLSocketFactoryClassNameTestRoot.java 2008-07-19 03:57:10 UTC (rev 4407) @@ -0,0 +1,100 @@ + +/* +* 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.socketfactory; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.Socket; +import java.net.UnknownHostException; + +import javax.net.SocketFactory; +import javax.net.ssl.SSLSocketFactory; + +import org.jboss.test.remoting.socketfactory.SocketFactoryClassNameTestRoot.TestSocketFactory; + + +/** + * + * Unit test for JBREM-1014. + * + * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Jul 18, 2008 + * </p> + */ +public abstract class SSLSocketFactoryClassNameTestRoot extends SocketFactoryClassNameTestRoot +{ + public void setUp() throws Exception + { + super.setUp(); + String trustStoreFilePath = this.getClass().getResource("../.truststore").getFile(); + System.setProperty("javax.net.ssl.trustStore", trustStoreFilePath); + System.setProperty("javax.net.ssl.trustStorePassword", "unit-tests-client"); + String keyStoreFilePath = this.getClass().getResource("../.keystore").getFile(); + System.setProperty("javax.net.ssl.keyStore", keyStoreFilePath); + System.setProperty("javax.net.ssl.keyStorePassword", "unit-tests-server"); + System.setProperty("org.jboss.security.ignoreHttpsHost", "true"); + } + + protected Class getSocketFactoryClass() + { + return TestSSLSocketFactory.class; + } + + public static class TestSSLSocketFactory extends SocketFactory + { + SocketFactory sf = SSLSocketFactory.getDefault(); + + public TestSSLSocketFactory() + { + } + + public Socket createSocket() throws IOException, UnknownHostException + { + return sf.createSocket(); + } + + public Socket createSocket(String arg0, int arg1) throws IOException, UnknownHostException + { + return sf.createSocket(arg0, arg1); + } + + public Socket createSocket(InetAddress arg0, int arg1) throws IOException + { + return sf.createSocket(arg0, arg1); + } + + public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3) throws IOException, + UnknownHostException + { + return sf.createSocket(arg0, arg1, arg2, arg3); + } + + public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2, int arg3) throws IOException + { + return sf.createSocket(arg0, arg1, arg2, arg3); + } + } +} + Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SocketFactoryClassNameTestRoot.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SocketFactoryClassNameTestRoot.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SocketFactoryClassNameTestRoot.java 2008-07-19 03:57:10 UTC (rev 4407) @@ -0,0 +1,227 @@ +package org.jboss.test.remoting.socketfactory; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.Socket; +import java.net.UnknownHostException; +import java.util.HashMap; +import java.util.Map; + +import javax.management.MBeanServer; +import javax.net.SocketFactory; + +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.AbstractInvoker; +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.callback.InvokerCallbackHandler; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; + + +/** + * Unit test for JBREM-1014. + * + * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Jul 18, 2008 + * </p> + */ +public abstract class SocketFactoryClassNameTestRoot extends TestCase +{ + private static Logger log = Logger.getLogger(SocketFactoryClassNameTestRoot.class); + + private static boolean firstTime = 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 = false; + Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO); + Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO); + String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n"; + PatternLayout layout = new PatternLayout(pattern); + ConsoleAppender consoleAppender = new ConsoleAppender(layout); + Logger.getRootLogger().addAppender(consoleAppender); + } + } + + + public void tearDown() + { + } + + + public void testSocketFactoryClassNameInLocator() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + String clientLocatorURI = locatorURI; + clientLocatorURI += "/?" + Remoting.SOCKET_FACTORY_CLASS_NAME + "=" + getSocketFactoryClass().getName(); + InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected to " + clientLocatorURI); + + // Test connections. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + // Verify client invoker is using configured SocketFactory. + AbstractInvoker invoker = (AbstractInvoker) client.getInvoker(); + SocketFactory socketFactory = invoker.getSocketFactory(); + log.info("SocketFactory: " + socketFactory); + assertTrue(getSocketFactoryClass().isInstance(socketFactory)); + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + public void testSocketFactoryClassNameInConfigMap() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(Remoting.SOCKET_FACTORY_CLASS_NAME, getSocketFactoryClass().getName()); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Test connections. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + // Verify client invoker is using configured SocketFactory. + AbstractInvoker invoker = (AbstractInvoker) client.getInvoker(); + SocketFactory socketFactory = invoker.getSocketFactory(); + log.info("SocketFactory: " + socketFactory); + assertTrue(getSocketFactoryClass().isInstance(socketFactory)); + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + protected abstract String getTransport(); + + + protected Class getSocketFactoryClass() + { + return TestSocketFactory.class; + } + + + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + + + protected void setupServer() throws Exception + { + host = InetAddress.getLocalHost().getHostAddress(); + port = PortUtil.findFreePort(host); + locatorURI = getTransport() + "://" + host + ":" + port; + serverLocator = new InvokerLocator(locatorURI); + log.info("Starting remoting server with locator uri of: " + locatorURI); + HashMap config = new HashMap(); + config.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraServerConfig(config); + connector = new Connector(serverLocator, config); + connector.create(); + invocationHandler = new TestInvocationHandler(); + connector.addInvocationHandler("test", invocationHandler); + connector.start(); + } + + + protected void shutdownServer() throws Exception + { + if (connector != null) + connector.stop(); + } + + + static class TestInvocationHandler implements ServerInvocationHandler + { + public void addListener(InvokerCallbackHandler callbackHandler) {} + public Object invoke(final InvocationRequest invocation) throws Throwable + { + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } + + + public static class TestSocketFactory extends SocketFactory + { + SocketFactory sf = SocketFactory.getDefault(); + + public TestSocketFactory() + { + } + + public Socket createSocket() throws IOException, UnknownHostException + { + return sf.createSocket(); + } + + public Socket createSocket(String arg0, int arg1) throws IOException, UnknownHostException + { + return sf.createSocket(arg0, arg1); + } + + public Socket createSocket(InetAddress arg0, int arg1) throws IOException + { + return sf.createSocket(arg0, arg1); + } + + public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3) throws IOException, + UnknownHostException + { + return sf.createSocket(arg0, arg1, arg2, arg3); + } + + public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2, int arg3) throws IOException + { + return sf.createSocket(arg0, arg1, arg2, arg3); + } + } +} \ No newline at end of file Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/socketfactory/SocketFactoryClassNameTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/socketfactory/SocketFactoryClassNameTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/socketfactory/SocketFactoryClassNameTestCase.java 2008-07-19 03:57:10 UTC (rev 4407) @@ -0,0 +1,22 @@ +package org.jboss.test.remoting.transport.bisocket.socketfactory; + +import org.jboss.test.remoting.socketfactory.SocketFactoryClassNameTestRoot; + + +/** + * + * Unit test for JBREM-1014. + * + * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Jul 18, 2008 + * </p> + */ +public class SocketFactoryClassNameTestCase extends SocketFactoryClassNameTestRoot +{ + protected String getTransport() + { + return "bisocket"; + } +} \ No newline at end of file Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java 2008-07-19 03:57:10 UTC (rev 4407) @@ -0,0 +1,44 @@ + +/* +* 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.bisocket.ssl.socketfactory; + +import org.jboss.test.remoting.socketfactory.SSLSocketFactoryClassNameTestRoot; + + +/** + * Unit test for JBREM-1014. + * + * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Jul 18, 2008 + * </p> + */ +public class SSLSocketFactoryClassNameTestCase extends SSLSocketFactoryClassNameTestRoot +{ + protected String getTransport() + { + return "sslbisocket"; + } +} + Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/socketfactory/SocketFactoryClassNameTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/socketfactory/SocketFactoryClassNameTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/socketfactory/SocketFactoryClassNameTestCase.java 2008-07-19 03:57:10 UTC (rev 4407) @@ -0,0 +1,22 @@ +package org.jboss.test.remoting.transport.http.socketfactory; + +import org.jboss.test.remoting.socketfactory.SocketFactoryClassNameTestRoot; + + +/** + * + * Unit test for JBREM-1014. + * + * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Jul 18, 2008 + * </p> + */ +public class SocketFactoryClassNameTestCase extends SocketFactoryClassNameTestRoot +{ + protected String getTransport() + { + return "http"; + } +} \ No newline at end of file Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java 2008-07-19 03:57:10 UTC (rev 4407) @@ -0,0 +1,44 @@ + +/* +* 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.http.ssl.socketfactory; + +import org.jboss.test.remoting.socketfactory.SSLSocketFactoryClassNameTestRoot; + + +/** + * Unit test for JBREM-1014. + * + * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Jul 18, 2008 + * </p> + */ +public class SSLSocketFactoryClassNameTestCase extends SSLSocketFactoryClassNameTestRoot +{ + protected String getTransport() + { + return "https"; + } +} + Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/rmi/socketfactory/SocketFactoryClassNameTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/rmi/socketfactory/SocketFactoryClassNameTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/rmi/socketfactory/SocketFactoryClassNameTestCase.java 2008-07-19 03:57:10 UTC (rev 4407) @@ -0,0 +1,22 @@ +package org.jboss.test.remoting.transport.rmi.socketfactory; + +import org.jboss.test.remoting.socketfactory.SocketFactoryClassNameTestRoot; + + +/** + * + * Unit test for JBREM-1014. + * + * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Jul 18, 2008 + * </p> + */ +public class SocketFactoryClassNameTestCase extends SocketFactoryClassNameTestRoot +{ + protected String getTransport() + { + return "rmi"; + } +} \ No newline at end of file Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/rmi/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/rmi/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/rmi/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java 2008-07-19 03:57:10 UTC (rev 4407) @@ -0,0 +1,44 @@ + +/* +* 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.rmi.ssl.socketfactory; + +import org.jboss.test.remoting.socketfactory.SSLSocketFactoryClassNameTestRoot; + + +/** + * Unit test for JBREM-1014. + * + * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Jul 18, 2008 + * </p> + */ +public class SSLSocketFactoryClassNameTestCase extends SSLSocketFactoryClassNameTestRoot +{ + protected String getTransport() + { + return "sslrmi"; + } +} + Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketfactory/SocketFactoryClassNameTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketfactory/SocketFactoryClassNameTestCase.java 2008-07-19 03:54:45 UTC (rev 4406) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketfactory/SocketFactoryClassNameTestCase.java 2008-07-19 03:57:10 UTC (rev 4407) @@ -1,34 +1,8 @@ package org.jboss.test.remoting.transport.socket.socketfactory; -import java.io.IOException; -import java.net.InetAddress; -import java.net.Socket; -import java.net.UnknownHostException; -import java.util.HashMap; -import java.util.Map; +import org.jboss.test.remoting.socketfactory.SocketFactoryClassNameTestRoot; -import javax.management.MBeanServer; -import javax.net.SocketFactory; -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.AbstractInvoker; -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.callback.InvokerCallbackHandler; -import org.jboss.remoting.transport.Connector; -import org.jboss.remoting.transport.PortUtil; - - /** * * Unit test for JBREM-1014. @@ -39,152 +13,10 @@ * Copyright Jul 18, 2008 * </p> */ -public class SocketFactoryClassNameTestCase extends TestCase +public class SocketFactoryClassNameTestCase extends SocketFactoryClassNameTestRoot { - private static Logger log = Logger.getLogger(SocketFactoryClassNameTestCase.class); - - private static boolean firstTime = 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 = false; - Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO); - Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO); - String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n"; - PatternLayout layout = new PatternLayout(pattern); - ConsoleAppender consoleAppender = new ConsoleAppender(layout); - Logger.getRootLogger().addAppender(consoleAppender); - } - } - - - public void tearDown() - { - } - - - public void testSocketFactoryClassName() throws Throwable - { - log.info("entering " + getName()); - - // Start server. - setupServer(); - - // Create client. - InvokerLocator clientLocator = new InvokerLocator(locatorURI); - HashMap clientConfig = new HashMap(); - clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); - clientConfig.put(Remoting.SOCKET_FACTORY_CLASS_NAME, TestSocketFactory.class.getName()); - addExtraClientConfig(clientConfig); - Client client = new Client(clientLocator, clientConfig); - client.connect(); - log.info("client is connected"); - - // Test connections. - assertEquals("abc", client.invoke("abc")); - log.info("connection is good"); - - // Verify client invoker is using configured SocketFactory. - AbstractInvoker invoker = (AbstractInvoker) client.getInvoker(); - SocketFactory socketFactory = invoker.getSocketFactory(); - log.info("SocketFactory: " + socketFactory); - assertTrue(socketFactory instanceof TestSocketFactory); - - 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 = InetAddress.getLocalHost().getHostAddress(); - port = PortUtil.findFreePort(host); - locatorURI = getTransport() + "://" + host + ":" + port; - serverLocator = new InvokerLocator(locatorURI); - log.info("Starting remoting server with locator uri of: " + locatorURI); - HashMap config = new HashMap(); - config.put(InvokerLocator.FORCE_REMOTE, "true"); - addExtraServerConfig(config); - connector = new Connector(serverLocator, config); - connector.create(); - invocationHandler = new TestInvocationHandler(); - connector.addInvocationHandler("test", invocationHandler); - connector.start(); - } - - - protected void shutdownServer() throws Exception - { - if (connector != null) - connector.stop(); - } - - - static class TestInvocationHandler implements ServerInvocationHandler - { - public void addListener(InvokerCallbackHandler callbackHandler) {} - public Object invoke(final InvocationRequest invocation) throws Throwable - { - return invocation.getParameter(); - } - public void removeListener(InvokerCallbackHandler callbackHandler) {} - public void setMBeanServer(MBeanServer server) {} - public void setInvoker(ServerInvoker invoker) {} - } - - public static class TestSocketFactory extends SocketFactory - { - private SocketFactory sf = SocketFactory.getDefault(); - - public TestSocketFactory() - { - } - - public Socket createSocket() throws IOException, UnknownHostException - { - return sf.createSocket(); - } - - public Socket createSocket(String arg0, int arg1) throws IOException, UnknownHostException - { - return sf.createSocket(arg0, arg1); - } - - public Socket createSocket(InetAddress arg0, int arg1) throws IOException - { - return sf.createSocket(arg0, arg1); - } - - public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3) throws IOException, - UnknownHostException - { - return sf.createSocket(arg0, arg1, arg2, arg3); - } - - public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2, int arg3) throws IOException - { - return sf.createSocket(arg0, arg1, arg2, arg3); - } - } } \ No newline at end of file Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/socketfactory/SSLSocketFactoryClassNameTestCase.java 2008-07-19 03:57:10 UTC (rev 4407) @@ -0,0 +1,44 @@ + +/* +* 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.ssl.socketfactory; + +import org.jboss.test.remoting.socketfactory.SSLSocketFactoryClassNameTestRoot; + + +/** + * Unit test for JBREM-1014. + * + * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Jul 18, 2008 + * </p> + */ +public class SSLSocketFactoryClassNameTestCase extends SSLSocketFactoryClassNameTestRoot +{ + protected String getTransport() + { + return "sslsocket"; + } +} +