[jboss-cvs] JBossAS SVN: r66331 - projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3.

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

Author: wolfc
Date: 2007-10-22 08:03:21 -0400 (Mon, 22 Oct 2007)
New Revision: 66331

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
Log:
JBAS-4506: fixes for annotation creator test

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java	2007-10-22 12:03:08 UTC (rev 66330)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java	2007-10-22 12:03:21 UTC (rev 66331)
@@ -23,15 +23,12 @@
 
 import java.io.File;
 import java.io.FilenameFilter;
-import java.io.IOException;
 import java.lang.reflect.AnnotatedElement;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 
 import junit.framework.TestCase;
@@ -41,9 +38,7 @@
 import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
 import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
-import org.jboss.metadata.ejb.spec.ContainerTransactionsMetaData;
 import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.spec.InitMethodMetaData;
 import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
 import org.jboss.metadata.ejb.spec.SessionType;
@@ -108,7 +103,7 @@
       assertEquals(TransAttributeType.Never, tx1.getTransAttribute());
       // TODO: methods
       ContainerTransactionMetaData tx2 = it.next();
-      assertEquals(TransAttributeType.Supports, tx2.getTransAttribute());
+      assertEquals(TransAttributeType.Mandatory, tx2.getTransAttribute());
       // TODO: methods
    }
    
@@ -176,12 +171,10 @@
       
       assertEquals(3, metaData.getEnterpriseBeans().size());
       
-      Iterator<? extends IEnterpriseBeanMetaData> it = metaData.getEnterpriseBeans().iterator();
+      assertMyStatefulBean(metaData.getEnterpriseBean("AnotherName"));
+      assertMyStateless21Bean(metaData.getEnterpriseBean("MyStateless21Bean"));
+      assertMyStatelessBean(metaData.getEnterpriseBean("MyStatelessBean"));
       
-      assertMyStatefulBean(it.next());
-      assertMyStateless21Bean(it.next());
-      assertMyStatelessBean(it.next());
-      
       assertNotNull("no application exceptions defined", metaData.getAssemblyDescriptor().getApplicationExceptions());
       assertEquals(1, metaData.getAssemblyDescriptor().getApplicationExceptions().size());
       System.out.println(metaData.getAssemblyDescriptor().getContainerTransactionsByEjbName("MyStatelessBean"));