[jboss-svn-commits] JBoss Common SVN: r2514 - in jbossxb-builder/trunk/src: test/java/org/jboss/test/ejb/metadata/test and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2007-08-27 05:48:37 -0400 (Mon, 27 Aug 2007)
New Revision: 2514

Modified:
   jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
   jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBossCMPUnitTestCase.java
Log:
set skip on the @XmlElementWrapper, fixed the test

Modified: jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
===================================================================
--- jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-08-24 22:06:58 UTC (rev 2513)
+++ jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-08-27 09:48:37 UTC (rev 2514)
@@ -1468,9 +1468,10 @@
 
                   ElementBinding wrapperElement = createElementBinding(propertyType, wrapperType, qName, false);
                   wrapperElement.setNillable(wrapperNillable);
+                  wrapperElement.setSkip(Boolean.TRUE);
                   particle = new ParticleBinding(wrapperElement, 1, 1, false);
                   targetGroup.addParticle(particle);
-                  
+
                   if(trace)
                      log.trace("Added property " + qName + " for type=" + beanInfo.getName() + " property="
                            + property.getName() + " as a wrapper element");

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBossCMPUnitTestCase.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBossCMPUnitTestCase.java	2007-08-24 22:06:58 UTC (rev 2513)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBossCMPUnitTestCase.java	2007-08-27 09:48:37 UTC (rev 2514)
@@ -299,9 +299,9 @@
       List<String> reservedWords = jbossMetaData.getReservedWords();
       assertNotNull(reservedWords);
       assertEquals(3, reservedWords.size());
-      for(int i = 1; i <= reservedWords.size(); ++i)
+      for(int i = 0; i < reservedWords.size(); ++i)
       {
-         assertEquals("word" + i,  reservedWords.get(i));
+         assertEquals("word" + (i + 1),  reservedWords.get(i));
       }
    }
 }