[jbossws-commits] JBossWS SVN: r14374 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 8 other directories.

Author: richard.opalka(a)jboss.com Date: 2011-05-11 09:33:26 -0400 (Wed, 11 May 2011) New Revision: 14374 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java Log: removing Metro & AS5 integration related stuff Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -201,60 +201,26 @@ return JBossWSTestHelper.getServer(); } - public static boolean isTargetJBoss5() - { - return JBossWSTestHelper.isTargetJBoss5(); - } - - public static boolean isTargetJBoss51() - { - return JBossWSTestHelper.isTargetJBoss51(); - } - - public static boolean isTargetJBoss50() - { - return JBossWSTestHelper.isTargetJBoss50(); - } - public static boolean isTargetJBoss6() { return JBossWSTestHelper.isTargetJBoss6(); } - public static boolean isTargetJBoss61() - { - return JBossWSTestHelper.isTargetJBoss61(); - } - - public static boolean isTargetJBoss60() - { - return JBossWSTestHelper.isTargetJBoss60(); - } - public static boolean isIntegrationNative() { return JBossWSTestHelper.isIntegrationNative(); } - public static boolean isIntegrationMetro() - { - return JBossWSTestHelper.isIntegrationMetro(); - } - public static boolean isIntegrationCXF() { return JBossWSTestHelper.isIntegrationCXF(); } - /** Deploy the given archive - */ public static void deploy(String archive) throws Exception { JBossWSTestHelper.deploy(archive); } - /** Undeploy the given archive - */ public static void undeploy(String archive) throws Exception { JBossWSTestHelper.undeploy(archive); @@ -298,7 +264,7 @@ /** Get the client's env context for a given name. */ - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) protected static InitialContext getInitialContext(String clientName) throws NamingException { InitialContext iniCtx = new InitialContext(); Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -62,7 +62,6 @@ private static final String SYSPROP_JBOSS_BIND_ADDRESS = "jboss.bind.address"; private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory"; private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory"; - private static final boolean DEPLOY_PROCESS_ENABLED = !Boolean.getBoolean("test.disable.deployment"); private static final Deployer DEPLOYER; private static MBeanServerConnection server; @@ -83,76 +82,30 @@ */ public static void deploy(String archive) throws Exception { - if ( DEPLOY_PROCESS_ENABLED ) - { - URL archiveURL = getArchiveFile(archive).toURI().toURL(); - DEPLOYER.deploy(archiveURL); - } + URL archiveURL = getArchiveFile(archive).toURI().toURL(); + DEPLOYER.deploy(archiveURL); } /** Undeploy the given archive */ public static void undeploy(String archive) throws Exception { - if ( DEPLOY_PROCESS_ENABLED ) - { - URL archiveURL = getArchiveFile(archive).toURI().toURL(); - DEPLOYER.undeploy(archiveURL); - } + URL archiveURL = getArchiveFile(archive).toURI().toURL(); + DEPLOYER.undeploy(archiveURL); } - /** True, if -Djbossws.integration.target=jboss5x */ - public static boolean isTargetJBoss5() - { - return isTargetJBoss51() || isTargetJBoss50(); - } - - /** True, if -Djbossws.integration.target=jboss50x */ - public static boolean isTargetJBoss50() - { - String target = getIntegrationTarget(); - return target.startsWith("jboss50"); - } - - /** True, if -Djbossws.integration.target=jboss51x */ - public static boolean isTargetJBoss51() - { - String target = getIntegrationTarget(); - return target.startsWith("jboss51"); - } - - /** True, if -Djbossws.integration.target=jboss6x */ public static boolean isTargetJBoss6() { - return isTargetJBoss61() || isTargetJBoss60(); + String target = getIntegrationTarget(); + return target.startsWith("jboss6"); } - /** True, if -Djbossws.integration.target=jboss60x */ - public static boolean isTargetJBoss60() - { - String target = getIntegrationTarget(); - return target.startsWith("jboss60"); - } - - /** True, if -Djbossws.integration.target=jboss61x */ - public static boolean isTargetJBoss61() - { - String target = getIntegrationTarget(); - return target.startsWith("jboss61"); - } - public static boolean isIntegrationNative() { String vendor = getImplementationVendor(); return vendor.toLowerCase().indexOf("jboss") != -1; } - public static boolean isIntegrationMetro() - { - String vendor = getImplementationVendor(); - return vendor.toLowerCase().indexOf("sun") != -1; - } - public static boolean isIntegrationCXF() { String vendor = getImplementationVendor(); Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-05-11 13:33:26 UTC (rev 14374) @@ -15,12 +15,6 @@ <target name="tests-prepare" depends="prepare"> <!-- Define jboss.home --> - <condition property="jboss.home" value="${jboss501.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </condition> - <condition property="jboss.home" value="${jboss510.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss510"/> - </condition> <condition property="jboss.home" value="${jboss600.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss600"/> </condition> @@ -111,7 +105,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss70,tests-classpath-jboss60,tests-classpath-jboss51,tests-classpath-jboss50"> + <target name="tests-classpath" depends="tests-classpath-jboss70,tests-classpath-jboss60"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="integration.target.javac.classpath"/> @@ -122,166 +116,6 @@ </path> </target> - <target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50"> - - <path id="integration.target.javac.classpath"> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.client}/jboss-appclient.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.client}/jboss-metadata.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/jbossxb.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/servlet-api.jar"/> - </path> - - <!-- - The 's.client.classpath' contains jars that are available in the target container's client directory. - There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. - - The 'ws.stack.classpath' contains jars that come with a specific stack distribution. - The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. - --> - <path id="integration.target.client.classpath"> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jaxb-xjc.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-appclient.jar"/> - <pathelement location="${jboss.client}/jboss-container-metadata.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> - <pathelement location="${jboss.client}/jboss-metadata.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/jbossxb.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/trove.jar"/> - <pathelement location="${jboss.client}/jboss-javaee.jar"/> - <!-- FIXME jars should be available in the client dir --> - <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss.lib}/jboss-classloader.jar"/> - <pathelement location="${jboss.lib}/jboss-classloading.jar"/> - <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/> - <pathelement location="${jboss.lib}/jboss-container.jar"/> - <pathelement location="${jboss.lib}/jboss-dependency.jar"/> - <pathelement location="${jboss.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss.lib}/jboss-kernel.jar"/> - <pathelement location="${jboss.lib}/jboss-reflect.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/jbossws-native-core.jar"/> <!-- For jaxrpc tests --> - <pathelement location="${jboss.server.lib}/hibernate3.jar"/> - <pathelement location="${jboss.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/> - <pathelement location="${jboss.server.lib}/hibernate-core.jar"/> - <pathelement location="${jboss.server.lib}/netty.jar"/> <!-- For jaxrpc tests --> - <pathelement location="${jboss.server.lib}/servlet-api.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <pathelement location="${tools.jar}"/> - </path> - </target> - - <target name="tests-classpath-jboss51" depends="tests-prepare" if="jbossws.integration.jboss51"> - - <path id="integration.target.javac.classpath"> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.client}/jboss-appclient.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.client}/jboss-metadata.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/jbossxb.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/servlet-api.jar"/> - </path> - - <!-- - The 's.client.classpath' contains jars that are available in the target container's client directory. - There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. - - The 'ws.stack.classpath' contains jars that come with a specific stack distribution. - The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. - --> - <path id="integration.target.client.classpath"> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jaxb-xjc.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-appclient.jar"/> - <pathelement location="${jboss.client}/jboss-container-metadata.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> - <pathelement location="${jboss.client}/jboss-metadata.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/jbossxb.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/trove.jar"/> - <pathelement location="${jboss.client}/jboss-javaee.jar"/> - <!-- FIXME jars should be available in the client dir --> - <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss.lib}/jboss-classloader.jar"/> - <pathelement location="${jboss.lib}/jboss-classloading.jar"/> - <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/> - <pathelement location="${jboss.lib}/jboss-container.jar"/> - <pathelement location="${jboss.lib}/jboss-dependency.jar"/> - <pathelement location="${jboss.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss.lib}/jboss-kernel.jar"/> - <pathelement location="${jboss.lib}/jboss-reflect.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/jbossws-native-core.jar"/> <!-- For jaxrpc tests --> - <pathelement location="${jboss.server.lib}/hibernate3.jar"/> - <pathelement location="${jboss.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/> - <pathelement location="${jboss.server.lib}/hibernate-core.jar"/> - <pathelement location="${jboss.server.lib}/netty.jar"/> <!-- For jaxrpc tests --> - <pathelement location="${jboss.server.lib}/servlet-api.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <pathelement location="${tools.jar}"/> - </path> - </target> - <target name="tests-classpath-jboss60" depends="tests-prepare" if="jbossws.integration.jboss60"> <path id="integration.target.javac.classpath"> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -74,10 +74,6 @@ { stackName = "cxf"; } - else if (isIntegrationMetro()) - { - stackName = "metro"; - } else if (isIntegrationNative()) { stackName = "native"; Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -86,7 +86,7 @@ String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS; executeCommand(command, "wsprovide"); - File wsdl = new File(destDir, isIntegrationMetro() || isIntegrationCXF() ? "JBWS2529EndpointService_schema1.xsd" : "JBWS2529EndpointService.wsdl"); + File wsdl = new File(destDir, isIntegrationCXF() ? "JBWS2529EndpointService_schema1.xsd" : "JBWS2529EndpointService.wsdl"); Element root = DOMUtils.parse(new FileInputStream(wsdl)); QName schemaQName = new QName(XML_SCHEMA_NS,"schema"); Element schema = null; Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -51,10 +51,6 @@ public void testWSDL() throws Exception { URL url = new URL(endpointAddress + "?wsdl"); - if (isIntegrationMetro()) - { - url = new URL(endpointAddress + "?xsd=1"); - } BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); String line = br.readLine(); StringBuilder sb = new StringBuilder(); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -64,7 +64,7 @@ public void testServletAccess() throws Exception { - boolean clCheck = !(isTargetJBoss5() || isTargetJBoss6()); + boolean clCheck = !isTargetJBoss6(); URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3223-servlet?param=hello-world&clCheck=" + clCheck); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("hello-world", br.readLine()); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -71,12 +71,6 @@ public void testMessageContextProperties() throws Exception { - if (isIntegrationMetro()) - { - System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties"); - return; - } - String retStr = port.testMessageContextProperties(); assertEquals("pass", retStr); } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -70,12 +70,6 @@ public void testMessageContextProperties() throws Exception { - if (isIntegrationMetro()) - { - System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties"); - return; - } - String retStr = port.testMessageContextProperties(); assertEquals("pass", retStr); } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -88,11 +88,6 @@ private void assertCookies() throws Exception { - if (isIntegrationMetro()) - { - System.out.println("FIXME: [JBWS-1671] Metro client handler cannot set mime header"); - return; - } if (isIntegrationCXF()) { System.out.println("FIXME: [CXF-1507] CXF client handler cannot set mime header"); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -43,7 +43,6 @@ protected String origLog4jConf; protected String oldCPProp; protected boolean integrationNative = false; - protected boolean integrationMetro = false; protected boolean integrationCXF = false; private static final String LOG4J_CONF = "log4j.configuration"; @@ -72,14 +71,13 @@ if (list.contains(StackConfigurable.class.getName())) { clazz.getMethod("setIsNative", boolean.class).invoke(delegate, integrationNative); - clazz.getMethod("setIsMetro", boolean.class).invoke(delegate, integrationMetro); clazz.getMethod("setIsCXF", boolean.class).invoke(delegate, integrationCXF); } } protected void setupClasspath() throws Exception { - if (!(integrationCXF || integrationMetro || integrationNative)) + if (!(integrationCXF || integrationNative)) { //the integration stack is not set yet, doing it before mangling with the classpath readIntegrationStack(); @@ -155,7 +153,6 @@ protected void readIntegrationStack() { this.integrationNative = isIntegrationNative(); - this.integrationMetro = isIntegrationMetro(); this.integrationCXF = isIntegrationCXF(); } } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -280,13 +280,6 @@ */ public void testMessageStream() throws Exception { - - if(isIntegrationMetro()) - { - System.out.println("FIXME: [JBWS-1777] WSProvide output is not correctly redirected"); - return; - } - ByteArrayOutputStream bout = new ByteArrayOutputStream(); PrintStream pout = new PrintStream(bout); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-05-11 12:53:19 UTC (rev 14373) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-05-11 13:33:26 UTC (rev 14374) @@ -86,12 +86,6 @@ @SuppressWarnings("unchecked") public void testGetRecordsByOperation() throws Exception { - if (isIntegrationMetro()) - { - //The WSDL_OPERATION ctx property is required for the operation filter to work - System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties"); - return; - } Endpoint port = getPort(); MBeanServerConnection server = getServer(); ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder"); @@ -155,12 +149,6 @@ @SuppressWarnings("unchecked") public void testGetMatchingRecords() throws Exception { - if (isIntegrationMetro()) - { - //The WSDL_OPERATION ctx property is required for the operation filter to work - System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties"); - return; - } Endpoint port = getPort(); MBeanServerConnection server = getServer(); ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder"); @@ -187,12 +175,6 @@ @SuppressWarnings("unchecked") public void testAddRemoveFilter() throws Exception { - if (isIntegrationMetro()) - { - //The WSDL_OPERATION ctx property is required for the operation filter to work - System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties"); - return; - } Endpoint port = getPort(); MBeanServerConnection server = getServer(); ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder");