[jboss-cvs] webservice/test/java/org/jboss/test/ws/anonymous ...

[Jason T. G. <jg...@jb...>]

  User: jgreene 
  Date: 05/09/29 19:51:42

  Modified:    test/java/org/jboss/test/ws/anonymous  
                        AnonymousTypesTestCase.java ElementTypeRoot.java
  Log:
  Implement Anonymous Types (Fixes JBWS-365)
  Also add support for element references
  Fix testcase
  
  Revision  Changes    Path
  1.3       +1 -6      webservice/test/java/org/jboss/test/ws/anonymous/AnonymousTypesTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AnonymousTypesTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/webservice/test/java/org/jboss/test/ws/anonymous/AnonymousTypesTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- AnonymousTypesTestCase.java	30 Aug 2005 17:00:43 -0000	1.2
  +++ AnonymousTypesTestCase.java	29 Sep 2005 23:51:42 -0000	1.3
  @@ -6,7 +6,7 @@
    */
   package org.jboss.test.ws.anonymous;
   
  -// $Id: AnonymousTypesTestCase.java,v 1.2 2005/08/30 17:00:43 tdiesler Exp $
  +// $Id: AnonymousTypesTestCase.java,v 1.3 2005/09/29 23:51:42 jgreene Exp $
   
   import javax.naming.InitialContext;
   import javax.xml.rpc.Service;
  @@ -52,11 +52,6 @@
   
      public void testElementTypeRoot() throws Exception
      {
  -      if (true)
  -      {
  -         System.out.println("FIXME: JBWS-374");
  -         return;
  -      }
         ElementTypeInside ins1 = new ElementTypeInside("ins1");
         ElementTypeInside ins2 = new ElementTypeInside("ins2");
         ElementTypeInside[] insArr = new ElementTypeInside[] { ins1, ins2 };
  
  
  
  1.3       +19 -5     webservice/test/java/org/jboss/test/ws/anonymous/ElementTypeRoot.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ElementTypeRoot.java
  ===================================================================
  RCS file: /cvsroot/jboss/webservice/test/java/org/jboss/test/ws/anonymous/ElementTypeRoot.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ElementTypeRoot.java	30 Aug 2005 13:48:04 -0000	1.2
  +++ ElementTypeRoot.java	29 Sep 2005 23:51:42 -0000	1.3
  @@ -8,7 +8,7 @@
   
   import java.util.Arrays;
   
  -// $Id: ElementTypeRoot.java,v 1.2 2005/08/30 13:48:04 tdiesler Exp $
  +// $Id: ElementTypeRoot.java,v 1.3 2005/09/29 23:51:42 jgreene Exp $
   
   public class ElementTypeRoot
   {
  @@ -62,7 +62,21 @@
      public String toString()
      {
         String insideStr = inside != null ? Arrays.asList(inside).toString() : null; 
  -      String otherStr = someOtherElement != null ? Arrays.asList(someOtherElement).toString() : null; 
  +      String otherStr = "";
  +      if (someOtherElement != null)
  +      {
  +         for (int i = 0; i < someOtherElement.length; i++)
  +         {
  +            if (i > 0)
  +               otherStr += ", ";
  +            otherStr += i;
  +         }
  +      }
  +      else
  +      {
  +         otherStr = "null";
  +      }
  +
         return "ElementTypeRoot[inside=" + insideStr + ",other=" + otherStr + "]";
      }
   }