[jboss-cvs] JBossAS SVN: r66689 - projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb.

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

Author: scott.stark at jboss.org
Date: 2007-11-02 13:22:46 -0400 (Fri, 02 Nov 2007)
New Revision: 66689

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java
Log:
Add merged and wrapped view tests of the ejb jar version value

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java	2007-11-02 17:21:06 UTC (rev 66688)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java	2007-11-02 17:22:46 UTC (rev 66689)
@@ -38,6 +38,9 @@
 import org.jboss.metadata.BeanMetaData;
 import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
 import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.jboss.ContainerConfigurationsMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaDataWrapper;
 import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
 import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
 import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
@@ -99,6 +102,24 @@
       assertFalse(result.isEJB21());
       assertTrue(result.isEJB3x());
 
+      // Test merged view
+      JBossMetaData merged = new JBossMetaData();
+      merged.merge(null, result);
+      assertFalse(merged.isEJB1x());
+      assertFalse(merged.isEJB2x());
+      assertFalse(merged.isEJB21());
+      assertTrue(merged.isEJB3x());
+
+      // Test wrapped view
+      JBossMetaData defaults = new JBossMetaData();
+      defaults.setContainerConfigurations(new ContainerConfigurationsMetaData());
+      JBossMetaData wrapped = new JBossMetaDataWrapper(merged, defaults);
+      assertFalse(wrapped.isEJB1x());
+      assertFalse(wrapped.isEJB2x());
+      assertFalse(wrapped.isEJB21());
+      assertTrue(wrapped.isEJB3x());
+
+      // Test legacy view
       ApplicationMetaData old = new ApplicationMetaData(result);
       assertFalse(old.isEJB1x());
       assertFalse(old.isEJB2x());