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

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

Author: alex.loubyansky at jboss.com
Date: 2007-08-03 10:20:51 -0400 (Fri, 03 Aug 2007)
New Revision: 2475

Modified:
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossEnvironmentRefsGroupMetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java
   jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/AbstractJavaEEEverythingTest.java
Log:
fixed jboss-specific tests

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossEnvironmentRefsGroupMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossEnvironmentRefsGroupMetaData.java	2007-08-01 16:41:05 UTC (rev 2474)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossEnvironmentRefsGroupMetaData.java	2007-08-03 14:20:51 UTC (rev 2475)
@@ -42,9 +42,9 @@
  */
 @JBossXmlModelGroup(name="jbossJndiEnvironmentRefsGroup",
       propOrder={"environmentEntries", "ejbReferences", "ejbLocalReferences",
-      "serviceReferences", "resourceReferences", "resourceEnvironmentReferences",
+      "serviceReferences", "securityIdentity", "resourceReferences", "resourceEnvironmentReferences",
       "messageDestinationReferences", "persistenceContextRefs", "persistenceUnitRefs",
-      "postConstructs", "preDestroys", "securityIdentity"})
+      "postConstructs", "preDestroys"})
 public class JBossEnvironmentRefsGroupMetaData extends EnvironmentRefsGroupMetaData
 {
    /** The serialVersionUID */

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java	2007-08-01 16:41:05 UTC (rev 2474)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java	2007-08-03 14:20:51 UTC (rev 2475)
@@ -1117,11 +1117,9 @@
    {
       assertNotNull(names);
       assertEquals(2, names.size());
-      int count = 1;
-      for (String name : names)
+      for(int count = 1; count <= names.size(); ++count)
       {
-         assertEquals(prefix + "InvokerProxyBindingName" + count, name);
-         ++count;
+         assertTrue(names.contains(prefix + "InvokerProxyBindingName" + count));
       }
    }
    
@@ -1141,11 +1139,9 @@
    {
       assertNotNull(depends);
       assertEquals(size, depends.size());
-      int count = 1;
-      for (String depend : depends)
+      for(int count = 1; count <= depends.size(); ++count)
       {
-         assertEquals(prefix + "Depends" + count, depend);
-         ++count;
+         assertTrue(depends.contains(prefix + "Depends" + count));
       }
    }
    

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-08-01 16:41:05 UTC (rev 2474)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/AbstractJavaEEEverythingTest.java	2007-08-03 14:20:51 UTC (rev 2475)
@@ -211,11 +211,9 @@
    {
       assertNotNull(principals);
       assertEquals(size, principals.size());
-      int count = 1;
-      for (String principal : principals)
+      for(int count = 1; count <= principals.size(); ++count)
       {
-         assertEquals(prefix + "Principal" + count, principal);
-         ++count;
+         assertTrue(principals.contains(prefix + "Principal" + count));
       }
    }