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

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

Author: scott.stark at jboss.org
Date: 2008-03-18 16:59:16 -0400 (Tue, 18 Mar 2008)
New Revision: 70964

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java
Log:
Need to validate the merged metadata

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java	2008-03-18 20:57:04 UTC (rev 70963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java	2008-03-18 20:59:16 UTC (rev 70964)
@@ -28,7 +28,6 @@
 
 import javax.transaction.UserTransaction;
 
-import org.jboss.metadata.annotation.creator.ejb.EjbJar30Creator;
 import org.jboss.metadata.annotation.creator.web.Web25MetaDataCreator;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
@@ -159,19 +158,19 @@
       AnnotationMergedView.merge(merged, specMetaData, metaData);
 
       assertTrue(metaData.is25());
-      assertEquals("2.5", metaData.getVersion());
+      assertEquals("2.5", merged.getVersion());
 
-      assertEnv(metaData.getJndiEnvironmentRefsGroup());
+      assertEnv(merged.getJndiEnvironmentRefsGroup());
 
       // MyServlet @RunAs
-      assertNotNull(metaData.getServlets());
-      ServletMetaData servlet = metaData.getServlets().get("MyServlet");
+      assertNotNull(merged.getServlets());
+      ServletMetaData servlet = merged.getServlets().get("MyServlet");
       assertNotNull(servlet);
       RunAsMetaData runAs = servlet.getRunAs();
       assertNotNull(runAs);
       assertEquals("InternalUser", runAs.getRoleName());
       // @DeclareRoles
-      SecurityRolesMetaData securityRoles = metaData.getSecurityRoles();
+      SecurityRolesMetaData securityRoles = merged.getSecurityRoles();
       assertNotNull(securityRoles);
       assertEquals(2, securityRoles.size());
       SecurityRoleMetaData role1 = securityRoles.get("Role1");