From jboss-remoting-commits at lists.jboss.org Wed Aug 4 21:30:49 2010 Content-Type: multipart/mixed; boundary="===============7465558514245123349==" 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: r6013 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/lines. Date: Wed, 04 Aug 2010 21:30:49 -0400 Message-ID: <201008050130.o751Unu3010209@svn01.web.mwc.hst.phx2.redhat.com> --===============7465558514245123349== 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 21:30:48 -0400 (Wed, 04 Aug 2010) New Revision: 6013 Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/= lines/HttpLinePreservationTestCase.java Log: JBREM-1241: Added svn:eol-style subversion property. Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transpor= t/http/lines/HttpLinePreservationTestCase.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/http= /lines/HttpLinePreservationTestCase.java 2010-08-05 01:30:19 UTC (rev 6012) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http= /lines/HttpLinePreservationTestCase.java 2010-08-05 01:30:48 UTC (rev 6013) @@ -1,411 +1,411 @@ -/* -* 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.lines; - -import java.net.InetAddress; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -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.ServerInvocationHandler; -import org.jboss.remoting.ServerInvoker; -import org.jboss.remoting.callback.InvokerCallbackHandler; -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; -import org.jboss.remoting.transport.web.WebUtil; - - -/** - * = - * Unit tests for JBREM-809. - * = - * @author Ron Sigal - * @version $Revision: 1.1 $ - *
- * Copyright Feb 8, 2008 - *
- */ -public class HttpLinePreservationTestCase extends TestCase -{ - private static Logger log =3D Logger.getLogger(HttpLinePreservationTest= Case.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 testLinePreservationClientConfig() throws Throwable - { - log.info("entering " + getName()); - = - // Start server. - setupServer(true, "true"); - = - // Create client. - InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); - HashMap clientConfig =3D new HashMap(); - clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); - clientConfig.put(HTTPUnMarshaller.PRESERVE_LINES, "true"); - addExtraClientConfig(clientConfig); - Client client =3D new Client(clientLocator, clientConfig); - client.connect(); - log.info("client is connected"); - = - Properties headerProps =3D new Properties(); - headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); - HashMap metadata =3D new HashMap(); - metadata.put("HEADER", headerProps); - metadata.put(Client.RAW, "true"); - = - StringBuffer sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789").append("\r\n"); - String message =3D sb.toString(); - assertEquals(message, client.invoke(message, metadata)); - = - client.disconnect(); - shutdownServer(); - log.info(getName() + " PASSES"); - } - = - = - public void testLinePreservationClientMetadata() throws Throwable - { - log.info("entering " + getName()); - = - // Start server. - setupServer(true, "true"); - = - // 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"); - = - Properties headerProps =3D new Properties(); - headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); - HashMap metadata =3D new HashMap(); - metadata.put("HEADER", headerProps); - metadata.put(Client.RAW, "true"); - metadata.put(HTTPUnMarshaller.PRESERVE_LINES, "true"); - = - StringBuffer sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789"); - String message =3D sb.toString(); - assertEquals(message, client.invoke(message, metadata)); - = - client.disconnect(); - shutdownServer(); - log.info(getName() + " PASSES"); - } - = - = - public void testNoLinePreservationClientConfigServerConfig() throws Thr= owable - { - log.info("entering " + getName()); - = - // Start server. - setupServer(true, "false"); - = - // Create client. - InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); - HashMap clientConfig =3D new HashMap(); - clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); - clientConfig.put(HTTPUnMarshaller.PRESERVE_LINES, "false"); - addExtraClientConfig(clientConfig); - Client client =3D new Client(clientLocator, clientConfig); - client.connect(); - log.info("client is connected"); - = - Properties headerProps =3D new Properties(); - headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); - HashMap metadata =3D new HashMap(); - metadata.put("HEADER", headerProps); - metadata.put(Client.RAW, "true"); - = - StringBuffer sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789").append("\r\n"); - String sent =3D sb.toString(); - sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789"); - String received =3D sb.toString(); - assertEquals(received, client.invoke(sent, metadata)); - = - client.disconnect(); - shutdownServer(); - log.info(getName() + " PASSES"); - } - = - = - public void testNoLinePreservationClientMetadataServerConfig() throws T= hrowable - { - log.info("entering " + getName()); - = - // Start server. - setupServer(true, "false"); - = - // 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"); - = - Properties headerProps =3D new Properties(); - headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); - HashMap metadata =3D new HashMap(); - metadata.put("HEADER", headerProps); - metadata.put(Client.RAW, "true"); - metadata.put(HTTPUnMarshaller.PRESERVE_LINES, "false"); - = - StringBuffer sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789").append("\r\n"); - String sent =3D sb.toString(); - sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789"); - String received =3D sb.toString(); - assertEquals(received, client.invoke(sent, metadata)); - = - client.disconnect(); - shutdownServer(); - log.info(getName() + " PASSES"); - } - = - = - public void testNoLinePreservationClientConfigServerDefault() throws Th= rowable - { - log.info("entering " + getName()); - = - // Start server. - setupServer(false, null); - = - // Create client. - InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); - HashMap clientConfig =3D new HashMap(); - clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); - clientConfig.put(HTTPUnMarshaller.PRESERVE_LINES, "false"); - addExtraClientConfig(clientConfig); - Client client =3D new Client(clientLocator, clientConfig); - client.connect(); - log.info("client is connected"); - = - Properties headerProps =3D new Properties(); - headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); - HashMap metadata =3D new HashMap(); - metadata.put("HEADER", headerProps); - metadata.put(Client.RAW, "true"); - = - StringBuffer sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789").append("\r\n"); - String sent =3D sb.toString(); - sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789"); - String received =3D sb.toString(); - assertEquals(received, client.invoke(sent, metadata)); - = - client.disconnect(); - shutdownServer(); - log.info(getName() + " PASSES"); - } - = - = - public void testNoLinePreservationClientMetadataServerDefault() throws = Throwable - { - log.info("entering " + getName()); - = - // Start server. - setupServer(false, null); - = - // 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"); - = - Properties headerProps =3D new Properties(); - headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); - HashMap metadata =3D new HashMap(); - metadata.put("HEADER", headerProps); - metadata.put(Client.RAW, "true"); - metadata.put(HTTPUnMarshaller.PRESERVE_LINES, "false"); - = - StringBuffer sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789").append("\r\n"); - String sent =3D sb.toString(); - sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789"); - String received =3D sb.toString(); - assertEquals(received, client.invoke(sent, metadata)); - = - client.disconnect(); - shutdownServer(); - log.info(getName() + " PASSES"); - } - = - = - public void testNoLinePreservationClientServerDefault() throws Throwable - { - log.info("entering " + getName()); - = - // Start server. - setupServer(false, null); - = - // 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"); - = - Properties headerProps =3D new Properties(); - headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); - HashMap metadata =3D new HashMap(); - metadata.put("HEADER", headerProps); - metadata.put(Client.RAW, "true"); - = - StringBuffer sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789").append("\r\n"); - String sent =3D sb.toString(); - sb =3D new StringBuffer(); - for (int i =3D 0; i < 1000; i++) - sb.append("0123456789"); - String received =3D sb.toString(); - assertEquals(received, client.invoke(sent, metadata)); - = - 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(boolean addConfig, String preserveLines) thr= ows 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"); - = - if (addConfig) - { - config.put(HTTPUnMarshaller.PRESERVE_LINES, preserveLines); - } - = - 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 - { - return invocation.getParameter(); - } - public void removeListener(InvokerCallbackHandler callbackHandler) {} - public void setMBeanServer(MBeanServer server) {} - public void setInvoker(ServerInvoker invoker) {} - } +/* +* 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.lines; + +import java.net.InetAddress; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +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.ServerInvocationHandler; +import org.jboss.remoting.ServerInvoker; +import org.jboss.remoting.callback.InvokerCallbackHandler; +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; +import org.jboss.remoting.transport.web.WebUtil; + + +/** + * = + * Unit tests for JBREM-809. + * = + * @author Ron Sigal + * @version $Revision: 1.1 $ + *+ * Copyright Feb 8, 2008 + *
+ */ +public class HttpLinePreservationTestCase extends TestCase +{ + private static Logger log =3D Logger.getLogger(HttpLinePreservationTest= Case.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 testLinePreservationClientConfig() throws Throwable + { + log.info("entering " + getName()); + = + // Start server. + setupServer(true, "true"); + = + // Create client. + InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); + HashMap clientConfig =3D new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(HTTPUnMarshaller.PRESERVE_LINES, "true"); + addExtraClientConfig(clientConfig); + Client client =3D new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + = + Properties headerProps =3D new Properties(); + headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); + HashMap metadata =3D new HashMap(); + metadata.put("HEADER", headerProps); + metadata.put(Client.RAW, "true"); + = + StringBuffer sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789").append("\r\n"); + String message =3D sb.toString(); + assertEquals(message, client.invoke(message, metadata)); + = + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + = + = + public void testLinePreservationClientMetadata() throws Throwable + { + log.info("entering " + getName()); + = + // Start server. + setupServer(true, "true"); + = + // 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"); + = + Properties headerProps =3D new Properties(); + headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); + HashMap metadata =3D new HashMap(); + metadata.put("HEADER", headerProps); + metadata.put(Client.RAW, "true"); + metadata.put(HTTPUnMarshaller.PRESERVE_LINES, "true"); + = + StringBuffer sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789"); + String message =3D sb.toString(); + assertEquals(message, client.invoke(message, metadata)); + = + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + = + = + public void testNoLinePreservationClientConfigServerConfig() throws Thr= owable + { + log.info("entering " + getName()); + = + // Start server. + setupServer(true, "false"); + = + // Create client. + InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); + HashMap clientConfig =3D new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(HTTPUnMarshaller.PRESERVE_LINES, "false"); + addExtraClientConfig(clientConfig); + Client client =3D new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + = + Properties headerProps =3D new Properties(); + headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); + HashMap metadata =3D new HashMap(); + metadata.put("HEADER", headerProps); + metadata.put(Client.RAW, "true"); + = + StringBuffer sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789").append("\r\n"); + String sent =3D sb.toString(); + sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789"); + String received =3D sb.toString(); + assertEquals(received, client.invoke(sent, metadata)); + = + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + = + = + public void testNoLinePreservationClientMetadataServerConfig() throws T= hrowable + { + log.info("entering " + getName()); + = + // Start server. + setupServer(true, "false"); + = + // 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"); + = + Properties headerProps =3D new Properties(); + headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); + HashMap metadata =3D new HashMap(); + metadata.put("HEADER", headerProps); + metadata.put(Client.RAW, "true"); + metadata.put(HTTPUnMarshaller.PRESERVE_LINES, "false"); + = + StringBuffer sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789").append("\r\n"); + String sent =3D sb.toString(); + sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789"); + String received =3D sb.toString(); + assertEquals(received, client.invoke(sent, metadata)); + = + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + = + = + public void testNoLinePreservationClientConfigServerDefault() throws Th= rowable + { + log.info("entering " + getName()); + = + // Start server. + setupServer(false, null); + = + // Create client. + InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); + HashMap clientConfig =3D new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(HTTPUnMarshaller.PRESERVE_LINES, "false"); + addExtraClientConfig(clientConfig); + Client client =3D new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + = + Properties headerProps =3D new Properties(); + headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); + HashMap metadata =3D new HashMap(); + metadata.put("HEADER", headerProps); + metadata.put(Client.RAW, "true"); + = + StringBuffer sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789").append("\r\n"); + String sent =3D sb.toString(); + sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789"); + String received =3D sb.toString(); + assertEquals(received, client.invoke(sent, metadata)); + = + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + = + = + public void testNoLinePreservationClientMetadataServerDefault() throws = Throwable + { + log.info("entering " + getName()); + = + // Start server. + setupServer(false, null); + = + // 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"); + = + Properties headerProps =3D new Properties(); + headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); + HashMap metadata =3D new HashMap(); + metadata.put("HEADER", headerProps); + metadata.put(Client.RAW, "true"); + metadata.put(HTTPUnMarshaller.PRESERVE_LINES, "false"); + = + StringBuffer sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789").append("\r\n"); + String sent =3D sb.toString(); + sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789"); + String received =3D sb.toString(); + assertEquals(received, client.invoke(sent, metadata)); + = + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + = + = + public void testNoLinePreservationClientServerDefault() throws Throwable + { + log.info("entering " + getName()); + = + // Start server. + setupServer(false, null); + = + // 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"); + = + Properties headerProps =3D new Properties(); + headerProps.put(HTTPMetadataConstants.CONTENTTYPE, WebUtil.PLAIN); + HashMap metadata =3D new HashMap(); + metadata.put("HEADER", headerProps); + metadata.put(Client.RAW, "true"); + = + StringBuffer sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789").append("\r\n"); + String sent =3D sb.toString(); + sb =3D new StringBuffer(); + for (int i =3D 0; i < 1000; i++) + sb.append("0123456789"); + String received =3D sb.toString(); + assertEquals(received, client.invoke(sent, metadata)); + = + 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(boolean addConfig, String preserveLines) thr= ows 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"); + = + if (addConfig) + { + config.put(HTTPUnMarshaller.PRESERVE_LINES, preserveLines); + } + = + 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 + { + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } } \ No newline at end of file Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoti= ng/transport/http/lines/HttpLinePreservationTestCase.java ___________________________________________________________________ Name: svn:eol-style + native --===============7465558514245123349==--