Author: alessio.soldano(a)jboss.com
Date: 2009-08-04 06:14:29 -0400 (Tue, 04 Aug 2009)
New Revision: 10469
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:
[JBWS-2508] Removing FIXMEs
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-08-04
10:10:29 UTC (rev 10468)
+++
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2009-08-04
10:14:29 UTC (rev 10469)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * 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.
*
@@ -203,7 +203,6 @@
boolean match = false;
boolean annotationFound = false;
- String prevLine = null;
String l = bin.readLine();
while(l!=null)
{
@@ -228,12 +227,6 @@
*/
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);
@@ -247,9 +240,16 @@
System.out.println(messageOut);
System.out.println("--- End captured output --");
- assertTrue("Tools output not correctly redirected",
- messageOut.replace('\\',
'/').indexOf("org/jboss/test/ws/tools/testMessageStream/EndpointInterface.java")!=-1
- );
+ if (isIntegrationCXF())
+ {
+ assertTrue("Tools output not correctly redirected",
messageOut.indexOf("wsdl2java -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
+ );
+ }
}
/**
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-08-04
10:10:29 UTC (rev 10468)
+++
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2009-08-04
10:14:29 UTC (rev 10469)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * 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.
*
@@ -270,11 +270,6 @@
System.out.println("FIXME: [JBWS-1777] WSProvide output is not correctly
redirected");
return;
}
- else if(isIntegrationCXF())
- {
- System.out.println("FIXME: [JBWS-2508] Tools output is not correctly
redirected");
- return;
- }
ByteArrayOutputStream bout = new ByteArrayOutputStream();
PrintStream pout = new PrintStream(bout);
@@ -288,8 +283,15 @@
System.out.println(messageOut);
System.out.println("-- End captured output --");
- assertTrue("Provider messages not correctly redirected",
- messageOut.replace('\\',
'/').indexOf("org/jboss/test/ws/jaxws/smoke/tools/jaxws/Add.class") !=
-1 );
+ if (isIntegrationCXF())
+ {
+ assertTrue("Provider messages not correctly redirected",
messageOut.indexOf("java2ws -s") != -1 );
+ }
+ else
+ {
+ assertTrue("Provider messages not correctly redirected",
+ messageOut.replace('\\',
'/').indexOf("org/jboss/test/ws/jaxws/smoke/tools/jaxws/Add.class") !=
-1 );
+ }
}
private void provide() throws Exception
Show replies by date