[jboss-svn-commits] JBoss Common SVN: r2468 - in jbossxb-builder/trunk/src/test/java/org/jboss: javaee/metadata/spec and 2 other directories.

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

Author: alex.loubyansky at jboss.com
Date: 2007-07-26 05:53:25 -0400 (Thu, 26 Jul 2007)
New Revision: 2468

Modified:
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar3xMetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/ResourceInjectionTargetMetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/NonNullLinkedHashSetWithId.java
   jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/AbstractJavaEEEverythingTest.java
Log:
make EjbJar3xEverythingUnitTestCase pass

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar3xMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar3xMetaData.java	2007-07-26 09:06:33 UTC (rev 2467)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar3xMetaData.java	2007-07-26 09:53:25 UTC (rev 2468)
@@ -21,6 +21,8 @@
 */
 package org.jboss.ejb.metadata.spec;
 
+import javax.xml.bind.annotation.XmlAttribute;
+
 /**
  * EjbJar3xMetaData.
  * 
@@ -71,6 +73,7 @@
     * @param version the version.
     * @throws IllegalArgumentException for a null version
     */
+   @XmlAttribute
    public void setVersion(String version)
    {
       if (version == null)
@@ -93,6 +96,7 @@
     * 
     * @param metadataComplete the metadataComplete.
     */
+   @XmlAttribute
    public void setMetadataComplete(boolean metadataComplete)
    {
       this.metadataComplete = metadataComplete;

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/ResourceInjectionTargetMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/ResourceInjectionTargetMetaData.java	2007-07-26 09:06:33 UTC (rev 2467)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/ResourceInjectionTargetMetaData.java	2007-07-26 09:53:25 UTC (rev 2468)
@@ -98,4 +98,41 @@
          throw new IllegalArgumentException("Null injectionTargetName");
       this.injectionTargetName = injectionTargetName;
    }
+
+   @Override
+   public int hashCode()
+   {
+      final int PRIME = 31;
+      int result = 1;
+      result = PRIME * result + ((injectionTargetClass == null) ? 0 : injectionTargetClass.hashCode());
+      result = PRIME * result + ((injectionTargetName == null) ? 0 : injectionTargetName.hashCode());
+      return result;
+   }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+         return true;
+      if (obj == null)
+         return false;
+      if (getClass() != obj.getClass())
+         return false;
+      final ResourceInjectionTargetMetaData other = (ResourceInjectionTargetMetaData) obj;
+      if (injectionTargetClass == null)
+      {
+         if (other.injectionTargetClass != null)
+            return false;
+      }
+      else if (!injectionTargetClass.equals(other.injectionTargetClass))
+         return false;
+      if (injectionTargetName == null)
+      {
+         if (other.injectionTargetName != null)
+            return false;
+      }
+      else if (!injectionTargetName.equals(other.injectionTargetName))
+         return false;
+      return true;
+   }
 }

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/NonNullLinkedHashSetWithId.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/NonNullLinkedHashSetWithId.java	2007-07-26 09:06:33 UTC (rev 2467)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/NonNullLinkedHashSetWithId.java	2007-07-26 09:53:25 UTC (rev 2468)
@@ -21,7 +21,9 @@
 */
 package org.jboss.javaee.metadata.support;
 
+import javax.xml.bind.annotation.XmlAttribute;
 
+
 /**
  * NonNullLinkedHashSet<p>
  * 
@@ -52,6 +54,7 @@
       return id;
    }
 
+   @XmlAttribute
    public void setId(String id)
    {
       if (id == null)

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/AbstractJavaEEEverythingTest.java	2007-07-26 09:06:33 UTC (rev 2467)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/AbstractJavaEEEverythingTest.java	2007-07-26 09:53:25 UTC (rev 2468)
@@ -810,11 +810,13 @@
    {
       assertNotNull(targets);
       assertEquals(targets.toString(), size, targets.size());
-      int count = 1;
-      for (ResourceInjectionTargetMetaData target : targets)
+      int count = 0;
+      while (++count <= targets.size())
       {
-         assertResourceInjectionTarget(prefix + "Injection" + count, target);
-         ++count;
+         ResourceInjectionTargetMetaData expected = new ResourceInjectionTargetMetaData();
+         expected.setInjectionTargetClass(prefix + "Injection" + count + "Class");
+         expected.setInjectionTargetName(prefix + "Injection" + count + "Name");
+         assertTrue(targets.contains(expected));
       }
    }