Author: asoldano Date: 2015-01-19 11:41:21 -0500 (Mon, 19 Jan 2015) New Revision: 19387 Removed: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java Log: Misc cleanup Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java 2015-01-19 10:39:27 UTC (rev 19386) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java 2015-01-19 16:41:21 UTC (rev 19387) @@ -161,10 +161,7 @@ Object retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); } - /** todo: - * Arquillian does not have like function to deploy client app. - * Need to create functionality to run this test in aqruillian. - **/ + @Test @RunAsClient @OperateOnDeployment(DEP_WAR) Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2015-01-19 10:39:27 UTC (rev 19386) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2015-01-19 16:41:21 UTC (rev 19387) @@ -41,8 +41,6 @@ protected ClassLoader origClassLoader; protected String origLog4jConf; protected String oldCPProp; - protected boolean integrationNative = false; - protected boolean integrationCXF = false; private static final String LOG4J_CONF = "log4j.configuration"; @@ -67,20 +65,10 @@ { list.add(c.getName()); } - if (list.contains(StackConfigurable.class.getName())) - { - clazz.getMethod("setIsNative", boolean.class).invoke(delegate, integrationNative); - clazz.getMethod("setIsCXF", boolean.class).invoke(delegate, integrationCXF); - } } protected void setupClasspath() throws Exception { - if (!(integrationCXF || integrationNative)) - { - //the integration stack is not set yet, doing it before mangling with the classpath - readIntegrationStack(); - } String classpath = System.getProperty("surefire.test.class.path"); if (classpath == null) //no maven surefire classpath hacks required return; @@ -96,8 +84,6 @@ String s = st.nextToken(); if(s.endsWith(".jar")) // JBWS-2175: skip target/classes and target/test-classes { - if( filtered(s) ) - continue; jarURLs.add( new File(s).toURI().toURL() ); jarURLString.append( s ).append(File.pathSeparator); } @@ -129,8 +115,6 @@ System.setProperty(LOG4J_CONF, log4jXmlUrl.toString()); } - protected abstract boolean filtered(String jarName); - protected void restoreClasspath() { if(this.origClassLoader !=null) @@ -148,10 +132,4 @@ } } } - - protected void readIntegrationStack() - { - this.integrationNative = false; - this.integrationCXF = isIntegrationCXF(); - } } Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java 2015-01-19 10:39:27 UTC (rev 19386) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java 2015-01-19 16:41:21 UTC (rev 19387) @@ -1,29 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.ws.jaxws.smoke.tools; - -public interface StackConfigurable -{ - public void setIsNative(boolean integrationNative); - - public void setIsCXF(boolean integrationCXF); -} Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2015-01-19 10:39:27 UTC (rev 19386) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2015-01-19 16:41:21 UTC (rev 19387) @@ -44,7 +44,7 @@ * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; * @author alessio.soldano(a)jboss.com */ -public class WSConsumerPlugin extends JBossWSTest implements StackConfigurable +public class WSConsumerPlugin extends JBossWSTest { // Tools delegate. Recreated for every test. See setup(...) WSContractConsumer consumer; @@ -57,11 +57,6 @@ private final File workDirectory; - protected boolean integrationNative; - protected boolean integrationMetro; - protected boolean integrationCXF; - - public WSConsumerPlugin() { // create a new consumer for every test case @@ -311,16 +306,7 @@ System.out.println(messageOut); System.out.println("--- End captured output --"); - if (getIsCXF()) - { - assertTrue("Tools output not correctly redirected", messageOut.indexOf("wsdl2java -exsh false -p org.jboss.test.ws.tools.testMessageStream") != -1); - } - else - { - assertTrue("Tools output not correctly redirected", - messageOut.replace('\\', '/').indexOf("org/jboss/test/ws/tools/testMessageStream/EndpointInterface.java")!=-1 - ); - } + assertTrue("Tools output not correctly redirected", messageOut.indexOf("wsdl2java -exsh false -p org.jboss.test.ws.tools.testMessageStream") != -1); } /** @@ -448,26 +434,4 @@ return loader; } - - public boolean getIsNative() - { - return integrationNative; - } - - public boolean getIsCXF() - { - return integrationCXF; - } - - @Override - public void setIsNative(boolean integrationNative) - { - this.integrationNative = integrationNative; - } - - @Override - public void setIsCXF(boolean integrationCXF) - { - this.integrationCXF = integrationCXF; - } } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2015-01-19 10:39:27 UTC (rev 19386) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2015-01-19 16:41:21 UTC (rev 19387) @@ -240,9 +240,4 @@ dispatch("testAdditionalHeaders"); tearDown(); } - - protected boolean filtered(String jarName) - { - return false; - } } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2015-01-19 10:39:27 UTC (rev 19386) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2015-01-19 16:41:21 UTC (rev 19387) @@ -146,14 +146,4 @@ tearDown(); } - /** - * Filter sun jaxws implementation because it clashes - * with the native one (ServiceLoader...) - * @param jarName - * @return - */ - protected boolean filtered(String jarName) - { - return false; - } }