[jboss-remoting-commits] JBoss Remoting SVN: r5245 - in remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal: noconfig and 1 other directory.

Author: ron.sigal(a)jboss.com Date: 2009-05-16 19:15:30 -0400 (Sat, 16 May 2009) New Revision: 5245 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml Removed: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/ServletConfigurationMapTestClient.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/WEB-INF/ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/remoting-servlet-service.xml Log: JBREM-1102: Broke org.jboss.tests.remoting.transport.servlet.marshal into ...marshal.config and ...marshal.noconfig. Deleted: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/ServletConfigurationMapTestClient.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/ServletConfigurationMapTestClient.java 2009-05-16 23:15:09 UTC (rev 5244) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/ServletConfigurationMapTestClient.java 2009-05-16 23:15:30 UTC (rev 5245) @@ -1,71 +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.servlet.marshal; - -import java.util.Map; - -import org.apache.log4j.Logger; -import org.jboss.test.remoting.marshall.config.ConfigurationMapTestParent; - -/** - * Unit tests for JBREM-1102. - * - * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> - * @version - * <p> - * Copyright Mar 21, 2009 - * </p> - */ -public class ServletConfigurationMapTestClient extends ConfigurationMapTestParent -{ - protected static Logger log = Logger.getLogger(ServletConfigurationMapTestClient.class); - - public void testDatatypeConfig() throws Throwable - { - log.info("skipping " + getName()); - } - - protected int configTestMarshallerCount() - { - return 1; - } - - protected int configTestUnmarshallerCount() - { - return 1; - } - - protected String getTransport() - { - return "servlet"; - } - - protected void setupServer(String parameter, Map extraConfig) throws Exception - { - locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?" + - "marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&" + - "unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller"; - - log.info("setting InvokerLocator to " + locatorURI); - } -} - Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/ServletConfigurationMapTestClient.java 2009-05-16 23:15:30 UTC (rev 5245) @@ -0,0 +1,96 @@ +/* + * 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.servlet.marshal.noconfig; + +import java.util.Map; + +import org.apache.log4j.Logger; +import org.jboss.test.remoting.marshall.config.ConfigurationMapTestParent; + +/** + * Unit tests for JBREM-1102. + * + * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> + * @version + * <p> + * Copyright Mar 21, 2009 + * </p> + */ +public class ServletConfigurationMapTestClient extends ConfigurationMapTestParent +{ + protected static Logger log = Logger.getLogger(ServletConfigurationMapTestClient.class); + + public void testDatatypePassConfigMapTrue() throws Throwable + { + log.info("skipping " + getName()); + } + + public void testFQNConfigPassConfigMapTrue() throws Throwable + { + log.info("skipping " + getName()); + } + + protected int marshallerCountDatatype() + { + return 2; + } + + protected int unmarshallerCountDatatype() + { + return 2; + } + + protected int marshallerCountFQN() + { + return 1; + } + + protected int unmarshallerCountFQN() + { + return 1; + } + + protected int marshallerDatatypeUnused() + { + return 0; + } + + protected int marshallerFQNUnused() + { + return 0; + } + + protected String getTransport() + { + return "servlet"; + } + + protected void setupServer(String parameter, Map extraConfig) throws Exception + { + locatorURI = "servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?" + parameter; +// "marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&" + +// "unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller"; + + log.info("setting InvokerLocator to " + locatorURI); + } +} + Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/noconfig/remoting-servlet-service.xml 2009-05-16 23:15:30 UTC (rev 5245) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<server> + + <mbean code="org.jboss.remoting.transport.Connector" + name="jboss.remoting:service=Connector,transport=Servlet,target=tests" + display-name="Servlet transport Connector"> + + <attribute name="InvokerLocator"> + servlet://localhost:8080/servlet-invoker/ServerInvokerServlet + </attribute> + + <attribute name="Configuration"> + <config> + <handlers> + <handler subsystem="test">org.jboss.test.remoting.marshall.config.TestInvocationHandler</handler> + </handlers> + </config> + </attribute> + </mbean> + + +</server> Deleted: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/remoting-servlet-service.xml =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/remoting-servlet-service.xml 2009-05-16 23:15:09 UTC (rev 5244) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal/remoting-servlet-service.xml 2009-05-16 23:15:30 UTC (rev 5245) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<server> - - <mbean code="org.jboss.remoting.transport.Connector" - name="jboss.remoting:service=Connector,transport=Servlet,target=tests" - display-name="Servlet transport Connector"> - - <attribute name="InvokerLocator"> - servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?marshaller=org.jboss.test.remoting.marshall.config.ConfigTestMarshaller&amp;unmarshaller=org.jboss.test.remoting.marshall.config.ConfigTestUnmarshaller - </attribute> - - <attribute name="Configuration"> - <config> - <handlers> - <handler subsystem="test">org.jboss.test.remoting.marshall.config.TestInvocationHandler</handler> - </handlers> - </config> - </attribute> - </mbean> - - -</server>