From jboss-remoting-commits at lists.jboss.org Thu Aug 20 10:56:45 2009 Content-Type: multipart/mixed; boundary="===============1699279471457380619==" 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: r5383 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal. Date: Thu, 20 Aug 2009 10:56:45 -0400 Message-ID: <200908201456.n7KEujpI024842@svn01.web.mwc.hst.phx2.redhat.com> --===============1699279471457380619== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ron.sigal(a)jboss.com Date: 2009-08-20 10:56:44 -0400 (Thu, 20 Aug 2009) New Revision: 5383 Removed: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/= marshal/ContentTypeTestCase.java Log: JBREM-1145: Renamed ContentTypeTestCase to HttpContentTypeTestCase. Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport= /http/marshal/ContentTypeTestCase.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/transport/http= /marshal/ContentTypeTestCase.java 2009-08-20 14:56:09 UTC (rev 5382) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http= /marshal/ContentTypeTestCase.java 2009-08-20 14:56:44 UTC (rev 5383) @@ -1,291 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.marshal; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.InetAddress; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -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.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.marshal.MarshalFactory; -import org.jboss.remoting.marshal.Marshaller; -import org.jboss.remoting.marshal.UnMarshaller; -import org.jboss.remoting.marshal.http.HTTPMarshaller; -import org.jboss.remoting.marshal.http.HTTPUnMarshaller; -import org.jboss.remoting.transport.Connector; -import org.jboss.remoting.transport.PortUtil; -import org.jboss.remoting.transport.http.HTTPMetadataConstants; - - -/** - * Unit tests for JBREM-1145. - * = - * @author Ron Sigal - * @version = - *
- * Copyright Aug 17, 2009 - *
- */ -public class ContentTypeTestCase extends TestCase -{ - private static Logger log =3D Logger.getLogger(ContentTypeTestCase.clas= s); - = - 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(Level.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); = - } - = - TestMarshaller.marshallers.clear(); - TestUnMarshaller.unmarshallers.clear(); - MarshalFactory.addMarshaller("test", new TestMarshaller(), new TestU= nMarshaller()); - } - - = - public void tearDown() - { - } - = - = - public void testOrdinaryInvocation() 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"); - = - // Check remoting content type handling. - assertEquals(6, TestMarshaller.marshallers.size()); = - assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_NON_STRING,= ((TestMarshaller)TestMarshaller.marshallers.get(3)).type); - assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_NON_STRING,= ((TestMarshaller)TestMarshaller.marshallers.get(5)).type); - assertEquals(4, TestUnMarshaller.unmarshallers.size()); - assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_NON_STRING,= ((TestUnMarshaller)TestUnMarshaller.unmarshallers.get(1)).type); - assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_NON_STRING,= ((TestUnMarshaller)TestUnMarshaller.unmarshallers.get(3)).type); - = - = - client.disconnect(); - shutdownServer(); - log.info(getName() + " PASSES"); - } - = - = - public void testRawStringMessage() 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. - Map metadata =3D new HashMap(); - metadata.put(Client.RAW, "true"); - assertEquals("abc", client.invoke("abc", metadata)); - log.info("connection is good"); - = - // Check remoting content type handling. - assertEquals(6, TestMarshaller.marshallers.size()); = - assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_STRING, ((T= estMarshaller)TestMarshaller.marshallers.get(3)).type); - assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_STRING, ((T= estMarshaller)TestMarshaller.marshallers.get(5)).type); - assertEquals(4, TestUnMarshaller.unmarshallers.size()); - assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_STRING, ((T= estUnMarshaller)TestUnMarshaller.unmarshallers.get(1)).type); - assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_STRING, ((T= estUnMarshaller)TestUnMarshaller.unmarshallers.get(3)).type); - = - = - client.disconnect(); - shutdownServer(); - log.info(getName() + " PASSES"); - } - = - = - protected String getTransport() - { - return "http"; - } - = - = - 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; - locatorURI +=3D "/?datatype=3Dtest"; - String metadata =3D System.getProperty("remoting.metadata"); - if (metadata !=3D null) - { - locatorURI +=3D "&" + metadata; - } - 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 - { - Map responseMap =3D invocation.getReturnPayload(); - responseMap.put(HTTPMetadataConstants.CONTENTTYPE, "text/html"); - return invocation.getParameter(); - } - public void removeListener(InvokerCallbackHandler callbackHandler) {} - public void setMBeanServer(MBeanServer server) {} - public void setInvoker(ServerInvoker invoker) {} - } - = - - static class TestMarshaller extends HTTPMarshaller - { - public static ArrayList marshallers =3D new ArrayList(); - private static final long serialVersionUID =3D -7528137229006015488L; - public String type; - = - public void write(Object dataObject, OutputStream output, int versio= n) throws IOException - { - log.info(this + " writing " + dataObject); - type =3D (dataObject instanceof String) ? HTTPMetadataConstants.R= EMOTING_CONTENT_TYPE_STRING : HTTPMetadataConstants.REMOTING_CONTENT_TYPE_N= ON_STRING; - super.write(dataObject, output, version); - } - = - public Marshaller cloneMarshaller() throws CloneNotSupportedException - { - TestMarshaller marshaller =3D new TestMarshaller(); - marshallers.add(marshaller); - log.info("returning " + marshaller); - return marshaller; - } - } - = - static class TestUnMarshaller extends HTTPUnMarshaller - { - public static ArrayList unmarshallers =3D new ArrayList(); - private static final long serialVersionUID =3D -6422222480047910351L; - public String type; - = - public Object read(InputStream inputStream, Map metadata, int versio= n) throws IOException, ClassNotFoundException - { - Object o =3D metadata.get(HTTPMetadataConstants.REMOTING_CONTENT_= TYPE); - if (o instanceof List) - { - type =3D (String) ((List) o).get(0); - } - else if (o instanceof String) - { - type =3D (String) o; - } - else = - { - log.warn(this + " unrecognized remotingContentType: " + o); - } - = - o =3D super.read(inputStream, metadata, version); - log.info(this + " read " + o); - return o; - } - = - public UnMarshaller cloneUnMarshaller() throws CloneNotSupportedExce= ption - { - TestUnMarshaller unmarshaller =3D new TestUnMarshaller(); - unmarshallers.add(unmarshaller); - unmarshaller.setClassLoader(this.customClassLoader); - log.info("returning " + unmarshaller); - return unmarshaller; - } - } -} \ No newline at end of file --===============1699279471457380619==--