[jboss-svn-commits] JBossWS SVN: r1192 - trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult

[jboss-svn-commits at lists.jboss.org]

Author: jason.greene at jboss.com
Date: 2006-10-10 12:18:27 -0400 (Tue, 10 Oct 2006)
New Revision: 1192

Modified:
   trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/CustomerRecord.java
   trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java
   trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/USAddress.java
Log:
Fix org.jboss.test.ws.jaxws.jsr181.webresult.*


Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/CustomerRecord.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/CustomerRecord.java	2006-10-10 16:02:38 UTC (rev 1191)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/CustomerRecord.java	2006-10-10 16:18:27 UTC (rev 1192)
@@ -27,14 +27,14 @@
 import javax.xml.bind.annotation.XmlType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "CustomerRecordType", propOrder = { "firstName", "lastName", "address" })
+ at XmlType(name = "CustomerRecord", propOrder = { "firstName", "lastName", "address" })
 public class CustomerRecord
 {
-   @XmlElement(name="FirstName", required = true)
+   @XmlElement(required = true, nillable = true)
    private String firstName;
-   @XmlElement(name="LastName", required = true)
+   @XmlElement(required = true, nillable = true)
    private String lastName;
-   @XmlElement(name="Address", required = true)
+   @XmlElement(required = true, nillable = true)
    private USAddress address;
 
    public CustomerRecord()

Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java	2006-10-10 16:02:38 UTC (rev 1191)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java	2006-10-10 16:18:27 UTC (rev 1192)
@@ -73,13 +73,10 @@
 
       USAddress addr = new USAddress("Wall Street");
 
-      System.out.println("FIXME: JBWS-1032");
-      /*
       CustomerRecord retObj = (CustomerRecord)call.invoke(new Object[]{"Mickey", "Mouse", addr});
       assertEquals("Mickey", retObj.getFirstName());
       assertEquals("Mouse", retObj.getLastName());
       assertEquals("Wall Street", retObj.getAddress().getAddress());
-      */
    }
 
    public void testMessageAccess() throws Exception
@@ -95,7 +92,7 @@
       "   <FirstName>Mickey</FirstName>" +
       "   <LastName>Mouse</LastName>" +
       "   <Address>" +
-      "     <ns1:address>Wall Street</ns1:address>" +
+      "     <address>Wall Street</address>" +
       "   </Address>" +
       "  </ns1:locateCustomer>" +
       " </env:Body>" +
@@ -103,15 +100,12 @@
       SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
 
       URL epURL = new URL(endpointURL);
-      
-      System.out.println("FIXME: JBWS-1032");
-      /*
+
       SOAPMessage resMsg = con.call(reqMsg, epURL);
 
       NameImpl name = new NameImpl(new QName(targetNS, "locateCustomerResponse"));
       SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(name).next();
       soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl("CustomerRecord")).next();
       assertNotNull("Expected CustomerRecord", soapElement);
-      */
    }
 }

Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/USAddress.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/USAddress.java	2006-10-10 16:02:38 UTC (rev 1191)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/USAddress.java	2006-10-10 16:18:27 UTC (rev 1192)
@@ -27,10 +27,10 @@
 import javax.xml.bind.annotation.XmlType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "USAddressType", propOrder = { "address"  })
+ at XmlType(name = "USAddress", propOrder = { "address"  })
 public class USAddress
 {
-   @XmlElement(namespace = "http://webresult.jsr181.jaxws.ws.test.jboss.org/jaws", required = true)
+   @XmlElement(required = true, nillable = true)
    private String address;
 
    public USAddress()