Author: jlukas(a)redhat.com Date: 2010-11-04 09:35:05 -0400 (Thu, 04 Nov 2010) New Revision: 26251 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/SampleWebService.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSClient.java Log: minor tweaks, unused imports, logging Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/SampleWebService.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/SampleWebService.java 2010-11-04 13:23:40 UTC (rev 26250) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/SampleWebService.java 2010-11-04 13:35:05 UTC (rev 26251) @@ -34,7 +34,6 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewSampleWSWizardAction; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.TreeItemAction; @@ -86,7 +85,7 @@ } assertTrue(dd.exists()); createSampleRESTWS(project, "RESTSample", "rest.sample", "Sample", "RESTApp"); - checkRESTService(project, "RESTSample", "rest.sample", "Sample", "You", "RESTApp"); + checkRESTService(project, "RESTSample", "rest.sample", "Sample", "Hello World!", "RESTApp"); } private void createDD(String project) { @@ -132,7 +131,6 @@ } private void checkService(Type type, String project, String svcName, String svcPkg, String svcClass, String msgContent, String appCls) { - //"RESTSample", "rest.sample", "Sample", "RESTApp" SWTBotEditor ed = bot.activeEditor(); assertEquals(svcClass + ".java", ed.getTitle()); String code = ed.toTextEditor().getText(); @@ -156,7 +154,7 @@ try { URL u = new URL("http://" + SERVER_URL + "/" + project + "/" + svcName); String s = readStream(u.openConnection().getInputStream()); - assertEquals("Hello World!", s); + assertEquals(msgContent, s); } catch (MalformedURLException e) { L.log(Level.WARNING, e.getMessage(), e); } catch (IOException e) { Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSClient.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSClient.java 2010-11-04 13:23:40 UTC (rev 26250) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSClient.java 2010-11-04 13:35:05 UTC (rev 26251) @@ -13,26 +13,21 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; -import java.io.StringWriter; -import java.net.MalformedURLException; import java.net.URL; -import java.util.Iterator; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.xml.namespace.QName; -import javax.xml.soap.AttachmentPart; import javax.xml.soap.MessageFactory; -import javax.xml.soap.MimeHeaders; -import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; import javax.xml.ws.Dispatch; import javax.xml.ws.Service; import javax.xml.ws.Service.Mode; public class WSClient { + private static final Logger L = Logger.getLogger(WSClient.class.getName()); private Dispatch<SOAPMessage> d; public WSClient(URL location, QName serviceName, QName portName) { @@ -42,23 +37,40 @@ public String callService(String message) { SOAPMessage result = null; - ByteArrayOutputStream out = new ByteArrayOutputStream(); try { SOAPMessage msg = MessageFactory.newInstance().createMessage( null, new ByteArrayInputStream(message.getBytes())); msg.saveChanges(); result = d.invoke(msg); - result.writeTo(out); + } catch (SOAPException e) { + L.log(Level.WARNING, e.getMessage(), e); } catch (IOException e) { - e.printStackTrace(System.err); + L.log(Level.WARNING, e.getMessage(), e); + } + String s = msgToString(result); + L.fine("SOAP Request :\n" + message); + L.fine("SOAP Response:\n" + s); + return s; + } + + private String msgToString(SOAPMessage msg) { + if (msg == null) { + return ""; + } + ByteArrayOutputStream out = new ByteArrayOutputStream(); + try { + msg.writeTo(out); } catch (SOAPException e) { - e.printStackTrace(System.err); + L.log(Level.WARNING, e.getMessage(), e); + } catch (IOException e) { + L.log(Level.WARNING, e.getMessage(), e); } finally { try { out.close(); } catch (IOException e) { //ignore + L.log(Level.WARNING, e.getMessage(), e); } } return out.toString(); - } + } }