[jbossws-commits] JBossWS SVN: r9597 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws: jbws2529 and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Mar 13 09:53:39 EDT 2009
Author: alessio.soldano at jboss.com
Date: 2009-03-13 09:53:39 -0400 (Fri, 13 Mar 2009)
New Revision: 9597
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/Address.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529Endpoint.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java
Log:
[JBWS-2529] Adding testcase
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/Address.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/Address.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/Address.java 2009-03-13 13:53:39 UTC (rev 9597)
@@ -0,0 +1,124 @@
+/*
+ * 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.jbws2529;
+
+public class Address
+{
+
+ private String email = "";
+ private String phone = "";
+ private String street = "";
+ private String city = "San Francisco";
+ private String state = "CA";
+ private String zipcode = "94104";
+ private String country = "U.S.";
+
+ public Address(String email, String phone, String street, String city, String state, String zipcode, String country)
+ {
+ this.email = email;
+ this.phone = phone;
+ this.street = street;
+ this.city = city;
+ this.state = state;
+ this.zipcode = zipcode;
+ this.country = country;
+ }
+
+ public Address()
+ {
+ }
+
+ public String getEmail()
+ {
+ return email;
+ }
+
+ public void setEmail(String email)
+ {
+ this.email = email;
+ }
+
+ public String getPhone()
+ {
+ return phone;
+ }
+
+ public void setPhone(String phone)
+ {
+ this.phone = phone;
+ }
+
+ public String getStreet()
+ {
+ return street;
+ }
+
+ public void setStreet(String street)
+ {
+ this.street = street;
+ }
+
+ public String getCity()
+ {
+ return city;
+ }
+
+ public void setCity(String city)
+ {
+ this.city = city;
+ }
+
+ public String getState()
+ {
+ return state;
+ }
+
+ public void setState(String state)
+ {
+ this.state = state;
+ }
+
+ public String getZipcode()
+ {
+ return zipcode;
+ }
+
+ public void setZipcode(String zipcode)
+ {
+ this.zipcode = zipcode;
+ }
+
+ public String getCountry()
+ {
+ return country;
+ }
+
+ public void setCountry(String country)
+ {
+ this.country = country;
+ }
+
+ public String toString()
+ {
+ return "email:" + email + " phone:" + phone + " street:" + street + " city:" + city + " state:" + state + " zipcode:" + zipcode + " country:" + country;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/Address.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529Endpoint.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529Endpoint.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529Endpoint.java 2009-03-13 13:53:39 UTC (rev 9597)
@@ -0,0 +1,46 @@
+/*
+ * 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.jbws2529;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+ at WebService
+ at SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public class JBWS2529Endpoint
+{
+ @WebMethod(operationName = "hello", action = "urn:Hello")
+ public String hello(@WebParam(name = "string1") String name)
+ {
+ return "hello : " + name;
+ }
+
+ @WebMethod(operationName = "helloWrapped", action = "urn:HelloWrapped")
+ @SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+ public String helloWrapped(@WebParam(name = "string8") String name, Address address)
+ {
+ return "helloWrapped : " + name;
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529Endpoint.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java 2009-03-13 13:53:39 UTC (rev 9597)
@@ -0,0 +1,115 @@
+/*
+ * 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.jbws2529;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Element;
+
+/**
+ * [JBWS-2529] Missing type in generated WSDL part definition
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-2529
+ *
+ * @author alessio.soldano at jboss.com
+ * @since 13-Mar-2009
+ */
+public class JBWS2529TestCase extends JBossWSTest
+{
+ private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
+ private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
+ private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat";
+ private static final String XML_SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
+
+ private String ENDPOINT_CLASS;
+
+ private String JBOSS_HOME;
+ private String CLASSES_DIR;
+ private String TEST_DIR;
+
+ private String origJavaHome;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ JBOSS_HOME = System.getProperty("jboss.home");
+ CLASSES_DIR = System.getProperty("test.classes.directory");
+ ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.jbws2529.JBWS2529Endpoint";
+ TEST_DIR = createResourceFile("..").getAbsolutePath();
+ origJavaHome = System.getProperty("java.home");
+
+
+ // the script requires the system JAVA_HOME, which points to the JDK not the JRE
+ if(origJavaHome.indexOf(FS + "jre")!=-1)
+ {
+ String JDK_HOME = origJavaHome.substring(0, origJavaHome.indexOf(FS + "jre"));
+ System.setProperty("java.home", JDK_HOME);
+ }
+ }
+
+ protected void tearDown() throws Exception
+ {
+ // reset surefire's JAVA_HOME
+ System.setProperty("java.home", origJavaHome);
+ }
+
+ public void test() throws Exception
+ {
+ File destDir = new File(TEST_DIR, "wsprovide" + FS + "java");
+ String absOutput = destDir.getAbsolutePath();
+ String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS;
+ executeCommand(command, "wsprovide");
+
+ File wsdl = new File(destDir, isIntegrationCXF() ? "JBWS2529EndpointService.wsdl" : "JBWS2529EndpointService_schema1.xsd");
+ Element root = DOMUtils.parse(new FileInputStream(wsdl));
+ QName schemaQName = new QName(XML_SCHEMA_NS,"schema");
+ Element schema = null;
+ if (root.getLocalName().equals(schemaQName.getLocalPart()) && root.getNamespaceURI().equals(schemaQName.getNamespaceURI()))
+ {
+ schema = root;
+ }
+ else
+ {
+ schema = (Element)DOMUtils.getChildElements(root, new QName(XML_SCHEMA_NS,"schema"), true).next();
+ }
+ List<Element> elements = DOMUtils.getChildElementsAsList(schema, new QName(XML_SCHEMA_NS,"element"));
+ boolean foundRequest = false;
+ boolean foundResponse = false;
+ for (Element el : elements)
+ {
+ if ("helloWrapped".equals(el.getAttribute("name")))
+ foundRequest = true;
+ if ("helloWrappedResponse".equals(el.getAttribute("name")))
+ foundResponse = true;
+ }
+ assertTrue("helloWrapped element not found!", foundRequest);
+ assertTrue("helloWrappedResponse element not found!", foundResponse);
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jbossws-commits
mailing list