Author: jlukas(a)redhat.com Date: 2010-07-23 05:50:24 -0400 (Fri, 23 Jul 2010) New Revision: 23695 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap12_out.xml Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/SelectWSDLDialog.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/WsTesterView.java Log: adding soap12 related tests Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap12_out.xml =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap12_out.xml (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap12_out.xml 2010-07-23 09:50:24 UTC (rev 23695) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<soap12:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap12="http://www.w3.org/2003/05/soap-envelope"> + <soap12:Body> + <GetBibleWordsByChapterAndVerse xmlns="http://www.webserviceX.NET"> + <BookTitle>Mark</BookTitle> + <chapter>1</chapter> + <Verse>1</Verse> + </GetBibleWordsByChapterAndVerse> + </soap12:Body> +</soap12:Envelope> Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java 2010-07-23 08:39:55 UTC (rev 23694) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java 2010-07-23 09:50:24 UTC (rev 23695) @@ -77,36 +77,10 @@ Assert.assertEquals(0, wstv.getRequestArgs(Request_Arg_Type.HEADER).keySet().size()); wstv.setRequestType(Request_Type.JAX_WS); - SelectWSDLDialog dlg = wstv.getFromWSDL(); - try { - dlg.openURL(); - SWTBotShell sh = bot.activeShell(); - sh.bot().text().typeText(SERVICE_URL + "?WSDL"); - sh.bot().button("OK").click(); - bot.sleep(1000); - Assert.assertEquals(SERVICE_URL + "?WSDL", dlg.getURI()); - List<String> items = dlg.getServices(); - L.log(Level.FINE, "Services: {0}", items); - Assert.assertEquals(1, items.size()); - Assert.assertTrue(items.contains("BibleWebservice")); - items = dlg.getPorts(); - L.log(Level.FINE, "Ports: {0}", items); - Assert.assertEquals(2, items.size()); - Assert.assertTrue(items.contains("BibleWebserviceSoap")); - Assert.assertTrue(items.contains("BibleWebserviceSoap12")); - items = dlg.getOperations(); - L.log(Level.FINE, "Operations: {0}", items); - Assert.assertEquals(4, items.size()); - Assert.assertTrue(items.contains("GetBookTitles")); - Assert.assertTrue(items.contains("GetBibleWordsByChapterAndVerse")); - dlg.selectOperation("GetBibleWordsbyKeyWord"); - dlg.ok(); - Assert.assertEquals("http://www.webservicex.net/BibleWebservice.asmx...;, wstv.getServiceURL()); - } finally { - if (dlg.isOpen()) { - dlg.close(); - } - } + selectPort(wstv, "BibleWebserviceSoap"); + Assert.assertTrue(wstv.getRequestBody().contains("http://schemas.xml...; + selectPort(wstv, "BibleWebserviceSoap12"); + Assert.assertTrue("Got: " + wstv.getRequestBody(), wstv.getRequestBody().contains("http://www.w3.org/2003/05/soap-envel...); viewBot.close(); } @@ -181,6 +155,40 @@ } /** + * Test SOAP 1.2 service invocation + */ + @Test + public void testSOAP12Service() { + WsTesterView wstv = new WsTesterView(); + wstv.show(); + wstv.setRequestType(Request_Type.JAX_WS); + Assert.assertEquals(Request_Type.JAX_WS, wstv.getRequestType()); + SelectWSDLDialog dlg = wstv.getFromWSDL(); + try { + dlg.openURL(); + SWTBotShell sh = bot.activeShell(); + sh.bot().text().typeText(SERVICE_URL + "?WSDL"); + sh.bot().button("OK").click(); + bot.sleep(1000); + Assert.assertEquals(SERVICE_URL + "?WSDL", dlg.getURI()); + dlg.selectPort("BibleWebserviceSoap12"); + dlg.ok(); + } finally { + if (dlg.isOpen()) { + dlg.close(); + } + } + Assert.assertEquals(SERVICE_URL, wstv.getServiceURL()); + InputStream is = WsTesterTest.class.getResourceAsStream("/resources/jbossws/message_soap12_out.xml"); + wstv.setRequestBody(readResource(is)); + wstv.invoke(); + String rsp = wstv.getResponseBody(); + L.log(Level.FINE, "SOAP response: {0}", rsp); + Assert.assertTrue(rsp.trim().length() > 0); + checkResponse(rsp, "&lt;BookTitle&gt;Mark&lt;/BookTitle&gt;"); + } + + /** * Test REST service invocation (GET request) */ @Test @@ -219,7 +227,7 @@ wstv.setServiceURL(SERVICE_URL + "/GetBibleWordsByChapterAndVerse"); String requestBody = "BookTitle=John&chapter=3&Verse=1\r"; wstv.setRequestBody(requestBody); - wstv.expandSection(Request_Arg_Type.HEADER.toString()); + wstv.expandSection(JBossWSUIMessages.JAXRSWSTestView2_ResponseHeaders_Section); wstv.addRequestArg(Request_Arg_Type.HEADER, "Content-Type", "application/x-www-form-urlencoded"); wstv.addRequestArg(Request_Arg_Type.HEADER, "Content-Length", String.valueOf(requestBody.length())); try { @@ -245,7 +253,6 @@ wstv.invoke(); Assert.assertEquals(0, wstv.getRequestArgs(Request_Arg_Type.PARAMETER).size()); String rsp = wstv.getResponseBody(); - wstv.expandSection(JBossWSUIMessages.JAXRSWSTestView2_ResponseHeaders_Section); String[] rspHeaders = wstv.getResponseHeaders(); L.log(Level.FINE, "REST response: {0}", rsp); L.log(Level.FINE, "Response headers: {0}", Arrays.asList(rspHeaders)); @@ -338,4 +345,37 @@ } } } + + private void selectPort(WsTesterView wstv, String portName) { + SelectWSDLDialog dlg = wstv.getFromWSDL(); + try { + dlg.openURL(); + SWTBotShell sh = bot.activeShell(); + sh.bot().text().typeText(SERVICE_URL + "?WSDL"); + sh.bot().button("OK").click(); + bot.sleep(1000); + Assert.assertEquals(SERVICE_URL + "?WSDL", dlg.getURI()); + List<String> items = dlg.getServices(); + L.log(Level.FINE, "Services: {0}", items); + Assert.assertEquals(1, items.size()); + Assert.assertTrue(items.contains("BibleWebservice")); + items = dlg.getPorts(); + L.log(Level.FINE, "Ports: {0}", items); + Assert.assertEquals(2, items.size()); + Assert.assertTrue(items.contains("BibleWebserviceSoap")); + Assert.assertTrue(items.contains("BibleWebserviceSoap12")); + dlg.selectPort(portName); + items = dlg.getOperations(); + L.log(Level.FINE, "Operations: {0}", items); + Assert.assertEquals(4, items.size()); + Assert.assertTrue(items.contains("GetBookTitles")); + Assert.assertTrue(items.contains("GetBibleWordsByChapterAndVerse")); + dlg.selectOperation("GetBibleWordsbyKeyWord"); + dlg.ok(); + Assert.assertEquals("http://www.webservicex.net/BibleWebservice.asmx...;, wstv.getServiceURL()); + } finally { + if (dlg.isOpen()) { + dlg.close(); + } + } } } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/SelectWSDLDialog.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/SelectWSDLDialog.java 2010-07-23 08:39:55 UTC (rev 23694) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/SelectWSDLDialog.java 2010-07-23 09:50:24 UTC (rev 23695) @@ -47,7 +47,7 @@ //Service: return getItems(JBossWSUIMessages.WSDLBrowseDialog_Service_Field); } - + public void selectService(String service) { //Service: bot().comboBoxWithLabel(JBossWSUIMessages.WSDLBrowseDialog_Service_Field).setSelection(service); @@ -58,6 +58,11 @@ return getItems(JBossWSUIMessages.WSDLBrowseDialog_Port_Field); } + public void selectPort(String port) { + //Service: + bot().comboBoxWithLabel(JBossWSUIMessages.WSDLBrowseDialog_Port_Field).setSelection(port); + } + public List<String> getOperations() { return Arrays.asList(getOperationsList().getItems()); } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/WsTesterView.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/WsTesterView.java 2010-07-23 08:39:55 UTC (rev 23694) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/widgets/WsTesterView.java 2010-07-23 09:50:24 UTC (rev 23695) @@ -144,7 +144,7 @@ return ((ExpandableComposite) widget.getParent()).isExpanded(); } }); - assert !expanded : "Section '" + widget.getText() + "' is already expanded"; + assert !expanded : "Section '" + getText() + "' is already expanded"; click(true); } }