Author: alessio.soldano(a)jboss.com Date: 2009-02-02 13:09:14 -0500 (Mon, 02 Feb 2009) New Revision: 9202 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java Log: Updating test to support cxf stack too Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2009-02-02 15:21:30 UTC (rev 9201) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2009-02-02 18:09:14 UTC (rev 9202) @@ -197,20 +197,20 @@ BufferedReader bin = new BufferedReader( new FileReader(sei) ); boolean match = false; + boolean annotationFound = false; String prevLine = null; String l = bin.readLine(); while(l!=null) { - if(l.indexOf("public class TestService")!=-1) + if (l.startsWith("@WebServiceClient")) { - if(prevLine!=null && prevLine.startsWith("@WebServiceClient")) - { - match = true; - break; - } + annotationFound = true; } - - prevLine = l; + if (l.indexOf("public class TestService")!=-1 && annotationFound) + { + match = true; + break; + } l = bin.readLine(); } @@ -223,6 +223,12 @@ */ public void testMessageStream() throws Exception { + if (isIntegrationCXF()) + { + System.out.println("FIXME [JBWS-2508] Tools output is not correctly redirected"); + return; + } + ByteArrayOutputStream bout = new ByteArrayOutputStream(); PrintStream pout = new PrintStream(bout); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2009-02-02 15:21:30 UTC (rev 9201) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2009-02-02 18:09:14 UTC (rev 9202) @@ -276,7 +276,7 @@ } else if(isIntegrationCXF()) { - System.out.println("FIXME [JBWS-2508] WSProvide output is not correctly redirected"); + System.out.println("FIXME [JBWS-2508] Tools output is not correctly redirected"); return; }