[jboss-cvs] JBossAS SVN: r66378 - in projects/metadata/trunk/src/test/java/org/jboss/test/metadata: ejb and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 24 06:56:19 EDT 2007
Author: wolfc
Date: 2007-10-24 06:56:19 -0400 (Wed, 24 Oct 2007)
New Revision: 66378
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
Log:
JBAS-4506: define two running modes for assertions
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java 2007-10-24 08:55:40 UTC (rev 66377)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java 2007-10-24 10:56:19 UTC (rev 66378)
@@ -36,7 +36,7 @@
* Test all entries of an application client 1.4 descriptor.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
public class ApplicationClient14EverythingUnitTestCase extends AbstractJavaEEEverythingTest
{
@@ -47,7 +47,7 @@
}
@Override
- protected void assertJndiName(String prefix, boolean full, String jndiName)
+ protected void assertJndiName(String prefix, boolean full, String jndiName, Mode mode)
{
// an application client 1.4 doens't have a mapped name
assertNull(jndiName);
@@ -75,7 +75,7 @@
@Override
protected void assertPersistenceUnitRefs(String prefix, int size,
- PersistenceUnitReferencesMetaData persistenceUnitReferencesMetaData)
+ PersistenceUnitReferencesMetaData persistenceUnitReferencesMetaData, Mode mode)
{
// An application client 1.4 doesn't have any persistence unit refs
assertNull(persistenceUnitReferencesMetaData);
@@ -99,7 +99,7 @@
//assertEverythingWithAppMetaData(appClientMetaData);
assertEquals("1.4", appClientMetaData.getVersion());
assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
- assertRemoteEnvironment("appClient", appClientMetaData, true);
+ assertRemoteEnvironment("appClient", appClientMetaData, true, Mode.SPEC);
assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", appClientMetaData.getCallbackHandler());
assertMessageDestinations14("appClientMessageDestination", 2, appClientMetaData.getMessageDestinations(), true);
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java 2007-10-24 08:55:40 UTC (rev 66377)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java 2007-10-24 10:56:19 UTC (rev 66378)
@@ -35,7 +35,7 @@
* Test all entries of an application client 5 descriptor.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
public class ApplicationClient5EverythingUnitTestCase extends AbstractJavaEEEverythingTest
{
@@ -45,12 +45,12 @@
super(name);
}
- protected void assertEverything(ApplicationClientMetaData appClientMetaData)
+ protected void assertEverything(ApplicationClientMetaData appClientMetaData, Mode mode)
{
//assertEverythingWithAppMetaData(appClientMetaData);
assertEquals("5", appClientMetaData.getVersion());
assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
- assertRemoteEnvironment("appClient", appClientMetaData, true);
+ assertRemoteEnvironment("appClient", appClientMetaData, true, mode);
assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", appClientMetaData.getCallbackHandler());
assertMessageDestinations5("appClientMessageDestination", 2, appClientMetaData.getMessageDestinations(), true);
}
@@ -79,7 +79,7 @@
public void testEverything() throws Exception
{
ApplicationClientMetaData appClientMetaData = unmarshal();
- assertEverything(appClientMetaData);
+ assertEverything(appClientMetaData, Mode.SPEC);
}
protected ApplicationClientMetaData unmarshal() throws Exception
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java 2007-10-24 08:55:40 UTC (rev 66377)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java 2007-10-24 10:56:19 UTC (rev 66378)
@@ -79,7 +79,7 @@
public void testAppClient5Everything() throws Exception
{
ApplicationClientMetaData appClientMetaData = unmarshal("ApplicationClient5Everything_testEverything.xml", ApplicationClientMetaData.class, null);
- new ApplicationClient5EverythingUnitTestCase("appClient").assertEverything(appClientMetaData);
+ new ApplicationClient5EverythingUnitTestCase("appClient").assertEverything(appClientMetaData, Mode.SPEC);
JBossClientMetaData rawJBossMetaData = unmarshal("JBossClient5Everything_testEverything.xml", JBossClientMetaData.class, null);
new JBossClient5EverythingUnitTestCase("jbossClient").assertEverything(rawJBossMetaData);
@@ -89,7 +89,7 @@
// TODO: should this work?
assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
- assertRemoteEnvironment("appClient", jbossClientMetaData, true);
+ assertRemoteEnvironment("appClient", jbossClientMetaData, true, Mode.JBOSS);
assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", jbossClientMetaData.getCallbackHandler());
assertMessageDestinations5("appClientMessageDestination", 2, jbossClientMetaData.getMessageDestinations(), true);
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-10-24 08:55:40 UTC (rev 66377)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-10-24 10:56:19 UTC (rev 66378)
@@ -98,7 +98,7 @@
super(name);
}
- protected void assertEnterpriseBeans(EjbJarMetaData ejbJarMetaData)
+ protected void assertEnterpriseBeans(EjbJarMetaData ejbJarMetaData, Mode mode)
{
IEnterpriseBeansMetaData enterpriseBeansMetaData = ejbJarMetaData.getEnterpriseBeans();
assertNotNull(enterpriseBeansMetaData);
@@ -106,8 +106,8 @@
assertEquals(15, enterpriseBeansMetaData.size());
assertNullSession("session0", enterpriseBeansMetaData);
- assertFullSession("session1", enterpriseBeansMetaData);
- assertFullSession("session2", enterpriseBeansMetaData);
+ assertFullSession("session1", enterpriseBeansMetaData, mode);
+ assertFullSession("session2", enterpriseBeansMetaData, mode);
SessionBeanMetaData session = assertSession("session3EjbName", enterpriseBeansMetaData);
assertEquals(SessionType.Stateful, session.getSessionType());
session = assertSession("session4EjbName", enterpriseBeansMetaData);
@@ -118,8 +118,8 @@
assertTrue(securityIdentityMetaData.isUseCallerId());
assertNullEntity("entity0", enterpriseBeansMetaData);
- assertFullEntity("entity1", enterpriseBeansMetaData);
- assertFullEntity("entity2", enterpriseBeansMetaData);
+ assertFullEntity("entity1", enterpriseBeansMetaData, mode);
+ assertFullEntity("entity2", enterpriseBeansMetaData, mode);
EntityBeanMetaData entity = assertEntity("entity3EjbName", enterpriseBeansMetaData);
assertEquals(PersistenceType.Bean, entity.getPersistenceType());
entity = assertEntity("entity4EjbName", enterpriseBeansMetaData);
@@ -129,11 +129,11 @@
assertTrue(entity.isCMP1x());
assertNullMDB("mdb0", enterpriseBeansMetaData);
- assertFullMDB("mdb1", enterpriseBeansMetaData);
- assertFullMDB("mdb2", enterpriseBeansMetaData);
+ assertFullMDB("mdb1", enterpriseBeansMetaData, mode);
+ assertFullMDB("mdb2", enterpriseBeansMetaData, mode);
}
- protected void assertEnterpriseBeans(ApplicationMetaData applicationMetaData)
+ protected void assertEnterpriseBeans(ApplicationMetaData applicationMetaData, Mode mode)
{
Iterator<BeanMetaData> i = applicationMetaData.getEnterpriseBeans();
assertNotNull(i);
@@ -147,8 +147,8 @@
assertEquals(15, count);
assertNullSession("session0", applicationMetaData);
- assertFullSession("session1", applicationMetaData);
- assertFullSession("session2", applicationMetaData);
+ assertFullSession("session1", applicationMetaData, mode);
+ assertFullSession("session2", applicationMetaData, mode);
SessionMetaData session = assertSession("session3", applicationMetaData);
assertTrue(session.isStateful());
assertFalse(session.isStateless());
@@ -161,8 +161,8 @@
assertTrue(securityIdentityMetaData.getUseCallerIdentity());
assertNullEntity("entity0", applicationMetaData);
- assertFullEntity("entity1", applicationMetaData);
- assertFullEntity("entity2", applicationMetaData);
+ assertFullEntity("entity1", applicationMetaData, mode);
+ assertFullEntity("entity2", applicationMetaData, mode);
EntityMetaData entity = assertEntity("entity3EjbName", applicationMetaData);
assertTrue(entity.isBMP());
entity = assertEntity("entity4EjbName", applicationMetaData);
@@ -172,11 +172,11 @@
assertTrue(entity.isCMP1x());
assertNullMDB("mdb0", applicationMetaData);
- assertFullMDB("mdb1", applicationMetaData);
- assertFullMDB("mdb2", applicationMetaData);
+ assertFullMDB("mdb1", applicationMetaData, mode);
+ assertFullMDB("mdb2", applicationMetaData, mode);
}
- protected SessionBeanMetaData assertFullSession(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
+ protected SessionBeanMetaData assertFullSession(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData, Mode mode)
{
throw new NotImplementedException();
}
@@ -230,7 +230,7 @@
return session;
}
- private SessionMetaData assertFullSession(String ejbName, ApplicationMetaData applicationMetaData)
+ private SessionMetaData assertFullSession(String ejbName, ApplicationMetaData applicationMetaData, Mode mode)
{
SessionMetaData session = assertSession(ejbName, applicationMetaData);
assertClass(ejbName, "Home", session.getHome());
@@ -241,7 +241,7 @@
assertClass(ejbName, "EjbClass", session.getEjbClass());
assertTrue(session.isStateless());
assertTrue(session.isContainerManagedTx());
- assertEnvironment(ejbName, session, true);
+ assertEnvironment(ejbName, session, true, mode);
assertMethodAttributes(ejbName, session);
assertContainerTransactions(session.getTransactionMethods());
assertMethodPermissions(ejbName, 7, session);
@@ -291,7 +291,7 @@
return session;
}
- protected EntityBeanMetaData assertFullEntity(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
+ protected EntityBeanMetaData assertFullEntity(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData, Mode mode)
{
throw new NotImplementedException();
}
@@ -339,7 +339,7 @@
return entity;
}
- private EntityMetaData assertFullEntity(String ejbName, ApplicationMetaData applicationMetaData)
+ private EntityMetaData assertFullEntity(String ejbName, ApplicationMetaData applicationMetaData, Mode mode)
{
EntityMetaData entity = assertEntity(ejbName + "EjbName", applicationMetaData);
assertEquals(ejbName + "Home", entity.getHome());
@@ -355,7 +355,7 @@
assertEquals(ejbName + "AbstractSchemaName", entity.getAbstractSchemaName());
assertCmpFields(ejbName, 2, entity.getCMPFields());
assertEquals(ejbName + "PrimKeyField",entity.getPrimKeyField());
- assertEnvironment(ejbName, entity, true);
+ assertEnvironment(ejbName, entity, true, mode);
assertMethodAttributes(ejbName, entity);
assertMethodPermissions(ejbName, 7, entity);
assertExcludedMethods(ejbName, entity.getExcludedMethods());
@@ -455,7 +455,7 @@
assertEquals(prefix + "Param" + count, params[count-1]);
}
- protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
+ protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData, Mode mode)
{
throw new NotImplementedException();
}
@@ -491,7 +491,7 @@
return mdb;
}
- protected MessageDrivenMetaData assertFullMDB(String ejbName, ApplicationMetaData applicationMetaData)
+ protected MessageDrivenMetaData assertFullMDB(String ejbName, ApplicationMetaData applicationMetaData, Mode mode)
{
MessageDrivenMetaData mdb = assertMDB(ejbName + "EjbName", applicationMetaData);
@@ -501,7 +501,7 @@
assertEquals(ejbName + "MessageDestinationType", mdb.getDestinationType());
assertEquals(ejbName + "MessageDestinationLink", mdb.getDestinationLink());
assertActivationConfigProperties(ejbName, 2, mdb.getActivationConfigProperties());
- assertEnvironment(ejbName, mdb, true);
+ assertEnvironment(ejbName, mdb, true, mode);
assertMethodAttributes(ejbName, mdb);
assertMethodPermissions(ejbName, 7, mdb);
assertExcludedMethods(ejbName, mdb.getExcludedMethods());
@@ -1022,15 +1022,15 @@
assertMethods(ejbName + "EjbName", ejbName + "ExcludeListMethod", 5, excluded);
}
- protected void assertEnvironment(String prefix, BeanMetaData bean, boolean full)
+ protected void assertEnvironment(String prefix, BeanMetaData bean, boolean full, Mode mode)
{
if (full)
assertEnvEntries(prefix, 2, bean.getEnvironmentEntries(), full);
- assertEjbRefs(prefix, 2, bean.getEjbReferences(), full);
- assertEjbLocalRefs(prefix, 2, bean.getEjbLocalReferences(), full);
+ assertEjbRefs(prefix, 2, bean.getEjbReferences(), full, mode);
+ assertEjbLocalRefs(prefix, 2, bean.getEjbLocalReferences(), full, mode);
// TODO webservice service references
- assertResourceRefs(prefix, 2, bean.getResourceReferences(), full);
- assertResourceEnvRefs(prefix, 2, bean.getResourceEnvReferences(), full);
+ assertResourceRefs(prefix, 2, bean.getResourceReferences(), full, mode);
+ assertResourceEnvRefs(prefix, 2, bean.getResourceEnvReferences(), full, mode);
assertMessageDestinationRefs(prefix, 3, bean.getMessageDestinationReferences(), full);
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java 2007-10-24 08:55:40 UTC (rev 66377)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java 2007-10-24 10:56:19 UTC (rev 66378)
@@ -32,7 +32,6 @@
import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJar2xMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
import org.jboss.metadata.ejb.spec.EntityBeanMetaData;
import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
import org.jboss.metadata.ejb.spec.PersistenceType;
@@ -85,22 +84,22 @@
//enableTrace("org.jboss.xb");
//enableTrace("org.jboss.xb.builder");
EjbJar2xMetaData ejbJarMetaData = unmarshal();
- assertEverythingWithAppMetaData(ejbJarMetaData);
+ assertEverythingWithAppMetaData(ejbJarMetaData, Mode.SPEC);
}
- public void assertEverything(EjbJar2xMetaData ejbJarMetaData)
+ public void assertEverything(EjbJar2xMetaData ejbJarMetaData, Mode mode)
{
assertVersion(ejbJarMetaData);
assertId("ejb-jar", ejbJarMetaData);
assertEquals("ejb-jar-id", ejbJarMetaData.getId());
assertEjbClientJar(ejbJarMetaData);
assertDescriptionGroup("ejb-jar", ejbJarMetaData.getDescriptionGroup());
- assertEnterpriseBeans(ejbJarMetaData);
+ assertEnterpriseBeans(ejbJarMetaData, mode);
assertRelationships(ejbJarMetaData);
assertAssemblyDescriptor(ejbJarMetaData);
}
- public void assertEverythingWithAppMetaData(EjbJar2xMetaData ejbJarMetaData)
+ public void assertEverythingWithAppMetaData(EjbJar2xMetaData ejbJarMetaData, Mode mode)
{
JBossMetaData jbossMetaData = new JBossMetaData();
//jbossMetaData.setOverridenMetaData(ejbJarMetaData);
@@ -112,8 +111,8 @@
assertEquals("ejb-jar-id", ejbJarMetaData.getId());
assertEjbClientJar(ejbJarMetaData);
assertDescriptionGroup("ejb-jar", ejbJarMetaData.getDescriptionGroup());
- assertEnterpriseBeans(ejbJarMetaData);
- assertEnterpriseBeans(applicationMetaData);
+ assertEnterpriseBeans(ejbJarMetaData, mode);
+ assertEnterpriseBeans(applicationMetaData, mode);
assertRelationships(ejbJarMetaData);
assertRelationships(applicationMetaData);
assertAssemblyDescriptor(ejbJarMetaData);
@@ -137,14 +136,14 @@
assertFalse(applicationMetadata.isEJB3x());
}
- protected SessionBeanMetaData assertFullSession(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ protected SessionBeanMetaData assertFullSession(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData, Mode mode)
{
SessionBeanMetaData session = assertSession(ejbName + "EjbName", enterpriseBeansMetaData);
- assertFullSessionBean(ejbName, session);
+ assertFullSessionBean(ejbName, session, mode);
return session;
}
- public void assertFullSessionBean(String ejbName, SessionBeanMetaData session)
+ public void assertFullSessionBean(String ejbName, SessionBeanMetaData session, Mode mode)
{
assertId(ejbName, session);
assertClass(ejbName, "Home", session.getHome());
@@ -155,14 +154,14 @@
assertClass(ejbName, "EjbClass", session.getEjbClass());
assertEquals(SessionType.Stateless, session.getSessionType());
assertEquals(TransactionType.Container, session.getTransactionType());
- assertEnvironment(ejbName, session.getJndiEnvironmentRefsGroup(), true);
+ assertEnvironment(ejbName, session.getJndiEnvironmentRefsGroup(), true, mode);
assertContainerTransactions(ejbName, 6, 6, session.getContainerTransactions());
assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, session.getMethodPermissions());
assertExcludeList(ejbName, 5, 5, session.getExcludeList());
assertSecurityRoleRefs(ejbName, 2, session.getSecurityRoleRefs());
assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true);
}
- public void assertFullSessionBean(String ejbName, JBossSessionBeanMetaData session)
+ public void assertFullSessionBean(String ejbName, JBossSessionBeanMetaData session, Mode mode)
{
assertId(ejbName, session);
assertClass(ejbName, "Home", session.getHome());
@@ -173,7 +172,7 @@
assertClass(ejbName, "EjbClass", session.getEjbClass());
assertEquals(SessionType.Stateless, session.getSessionType());
assertEquals(TransactionType.Container, session.getTransactionType());
- assertEnvironment(ejbName, session.getJndiEnvironmentRefsGroup(), true);
+ assertEnvironment(ejbName, session.getJndiEnvironmentRefsGroup(), true, mode);
assertContainerTransactions(ejbName, 6, 6, session.getContainerTransactions());
assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, session.getMethodPermissions());
assertExcludeList(ejbName, 5, 5, session.getExcludeList());
@@ -181,14 +180,14 @@
assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true);
}
- protected EntityBeanMetaData assertFullEntity(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ protected EntityBeanMetaData assertFullEntity(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData, Mode mode)
{
EntityBeanMetaData entity = assertEntity(ejbName + "EjbName", enterpriseBeansMetaData);
- assertFullEntity(ejbName, entity);
+ assertFullEntity(ejbName, entity, mode);
return entity;
}
- public void assertFullEntity(String ejbName, EntityBeanMetaData entity)
+ public void assertFullEntity(String ejbName, EntityBeanMetaData entity, Mode mode)
{
assertId(ejbName, entity);
assertClass(ejbName, "Home", entity.getHome());
@@ -204,7 +203,7 @@
assertEquals(ejbName + "AbstractSchemaName", entity.getAbstractSchemaName());
assertCmpFields(ejbName, 2, entity.getCmpFields());
assertEquals(ejbName + "PrimKeyField", entity.getPrimKeyField());
- assertEnvironment(ejbName, entity.getJndiEnvironmentRefsGroup(), true);
+ assertEnvironment(ejbName, entity.getJndiEnvironmentRefsGroup(), true, mode);
assertContainerTransactions(ejbName, 6, 6, entity.getContainerTransactions());
assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, entity.getMethodPermissions());
assertExcludeList(ejbName, 5, 5, entity.getExcludeList());
@@ -253,7 +252,7 @@
assertMethodParams(ejbName + "QueryMethod", size, queryMethodMetaData.getMethodParams());
}
- protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData, Mode mode)
{
MessageDrivenBeanMetaData mdb = assertMDB(ejbName + "EjbName", enterpriseBeansMetaData);
assertId(ejbName, mdb);
@@ -262,7 +261,7 @@
assertEquals(ejbName + "MessageDestinationType", mdb.getMessageDestinationType());
assertEquals(ejbName + "MessageDestinationLink", mdb.getMessageDestinationLink());
assertActivationConfig(ejbName, mdb.getActivationConfig());
- assertEnvironment(ejbName, mdb.getJndiEnvironmentRefsGroup(), true);
+ assertEnvironment(ejbName, mdb.getJndiEnvironmentRefsGroup(), true, mode);
assertContainerTransactions(ejbName, 6, 6, mdb.getContainerTransactions());
assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, mdb.getMethodPermissions());
assertExcludeList(ejbName, 5, 5, mdb.getExcludeList());
@@ -276,27 +275,32 @@
assertEquals("some/path/client.jar", ejbJarMetaData.getEjbClientJar());
}
- protected void assertPersistenceContextRefs(String prefix, int size, PersistenceContextReferencesMetaData persistenceContextReferencesMetaData)
+ @Override
+ protected void assertPersistenceContextRefs(String prefix, int size, PersistenceContextReferencesMetaData persistenceContextReferencesMetaData, Mode mode)
{
assertNull(persistenceContextReferencesMetaData);
}
- protected void assertPersistenceUnitRefs(String prefix, int size, PersistenceUnitReferencesMetaData persistenceUnitReferencesMetaData)
+ @Override
+ protected void assertPersistenceUnitRefs(String prefix, int size, PersistenceUnitReferencesMetaData persistenceUnitReferencesMetaData, Mode mode)
{
assertNull(persistenceUnitReferencesMetaData);
}
+ @Override
protected void assertLifecycleCallbacks(String ejbName, String type, int size, LifecycleCallbacksMetaData lifecycleCallbacksMetaData)
{
assertNull(lifecycleCallbacksMetaData);
}
- protected void assertResourceGroup(String prefix, ResourceInjectionMetaData resourceInjectionMetaData, boolean full, boolean first)
+ @Override
+ protected void assertResourceGroup(String prefix, ResourceInjectionMetaData resourceInjectionMetaData, boolean full, boolean first, Mode mode)
{
return;
}
- protected void assertJndiName(String prefix, boolean full, String jndiName)
+ @Override
+ protected void assertJndiName(String prefix, boolean full, String jndiName, Mode mode)
{
if (full)
assertNull(jndiName);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2007-10-24 08:55:40 UTC (rev 66377)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2007-10-24 10:56:19 UTC (rev 66378)
@@ -38,7 +38,6 @@
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
import org.jboss.metadata.ejb.spec.EntityBeanMetaData;
import org.jboss.metadata.ejb.spec.InitMethodMetaData;
import org.jboss.metadata.ejb.spec.InitMethodsMetaData;
@@ -61,7 +60,6 @@
import org.jboss.metadata.ejb.spec.SessionType;
import org.jboss.metadata.ejb.spec.TransactionType;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
-import org.jboss.test.metadata.ejb.AbstractEJBEverythingTest;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
@@ -98,37 +96,37 @@
//enableTrace("org.jboss.xb");
//enableTrace("org.jboss.xb.builder");
EjbJar3xMetaData ejbJarMetaData = unmarshal();
- assertEverythingWithAppMetaData(ejbJarMetaData);
+ assertEverythingWithAppMetaData(ejbJarMetaData, Mode.SPEC);
}
- public void assertEverything(EjbJar3xMetaData ejbJarMetaData)
+ public void assertEverything(EjbJar3xMetaData ejbJarMetaData, Mode mode)
{
assertVersion(ejbJarMetaData);
assertMetaDataComplete(ejbJarMetaData);
assertId("ejb-jar", ejbJarMetaData);
assertEjbClientJar(ejbJarMetaData);
assertDescriptionGroup("ejb-jar", ejbJarMetaData.getDescriptionGroup());
- assertEnterpriseBeans(ejbJarMetaData);
- assertInterceptors(ejbJarMetaData);
+ assertEnterpriseBeans(ejbJarMetaData, mode);
+ assertInterceptors(ejbJarMetaData, mode);
assertRelationships(ejbJarMetaData);
assertAssemblyDescriptor(ejbJarMetaData);
}
- public void assertEverythingWithAppMetaData(EjbJar3xMetaData ejbJarMetaData)
+ public void assertEverythingWithAppMetaData(EjbJar3xMetaData ejbJarMetaData, Mode mode)
{
assertVersion(ejbJarMetaData);
assertMetaDataComplete(ejbJarMetaData);
assertId("ejb-jar", ejbJarMetaData);
assertEjbClientJar(ejbJarMetaData);
assertDescriptionGroup("ejb-jar", ejbJarMetaData.getDescriptionGroup());
- assertEnterpriseBeans(ejbJarMetaData);
- assertInterceptors(ejbJarMetaData);
+ assertEnterpriseBeans(ejbJarMetaData, mode);
+ assertInterceptors(ejbJarMetaData, mode);
assertRelationships(ejbJarMetaData);
assertAssemblyDescriptor(ejbJarMetaData);
ApplicationMetaData applicationMetaData = new ApplicationMetaData(ejbJarMetaData);
assertVersion(applicationMetaData);
- assertEnterpriseBeans(applicationMetaData);
+ assertEnterpriseBeans(applicationMetaData, mode);
assertRelationships(applicationMetaData);
assertAssemblyDescriptor(applicationMetaData);
}
@@ -156,14 +154,14 @@
}
@Override
- protected SessionBeanMetaData assertFullSession(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
+ protected SessionBeanMetaData assertFullSession(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData, Mode mode)
{
SessionBeanMetaData session = assertSession(ejbName + "EjbName", enterpriseBeansMetaData);
- assertFullSessionBean(ejbName, session);
+ assertFullSessionBean(ejbName, session, mode);
return session;
}
- public void assertFullSessionBean(String ejbName, SessionBeanMetaData session)
+ public void assertFullSessionBean(String ejbName, SessionBeanMetaData session, Mode mode)
{
assertId(ejbName, session);
assertMappedName(ejbName, session.getMappedName());
@@ -183,14 +181,14 @@
assertAroundInvokes(ejbName, 2, session.getAroundInvokes());
assertLifecycleCallbacks(ejbName, "PostActivate", 2, session.getPostActivates());
assertLifecycleCallbacks(ejbName, "PrePassivate", 2, session.getPrePassivates());
- assertEnvironment(ejbName, session.getJndiEnvironmentRefsGroup(), true);
+ assertEnvironment(ejbName, session.getJndiEnvironmentRefsGroup(), true, mode);
assertContainerTransactions(ejbName, 6, 6, session.getContainerTransactions());
assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, session.getMethodPermissions());
assertExcludeList(ejbName, 5, 5, session.getExcludeList());
assertSecurityRoleRefs(ejbName, 2, session.getSecurityRoleRefs());
assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true);
}
- public void assertFullSessionBean(String ejbName, JBossSessionBeanMetaData session)
+ public void assertFullSessionBean(String ejbName, JBossSessionBeanMetaData session, Mode mode)
{
assertId(ejbName, session);
assertMappedName(ejbName, session.getMappedName());
@@ -210,7 +208,7 @@
assertAroundInvokes(ejbName, 2, session.getAroundInvokes());
assertLifecycleCallbacks(ejbName, "PostActivate", 2, session.getPostActivates());
assertLifecycleCallbacks(ejbName, "PrePassivate", 2, session.getPrePassivates());
- assertEnvironment(ejbName, session.getJndiEnvironmentRefsGroup(), true);
+ assertEnvironment(ejbName, session.getJndiEnvironmentRefsGroup(), true, mode);
assertContainerTransactions(ejbName, 6, 6, session.getContainerTransactions());
assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, session.getMethodPermissions());
assertExcludeList(ejbName, 5, 5, session.getExcludeList());
@@ -250,7 +248,7 @@
}
@Override
- protected EntityBeanMetaData assertFullEntity(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
+ protected EntityBeanMetaData assertFullEntity(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData, Mode mode)
{
EntityBeanMetaData entity = assertEntity(ejbName + "EjbName", enterpriseBeansMetaData);
assertId(ejbName, entity);
@@ -268,7 +266,7 @@
assertEquals(ejbName + "AbstractSchemaName", entity.getAbstractSchemaName());
assertCmpFields(ejbName, 2, entity.getCmpFields());
assertEquals(ejbName + "PrimKeyField", entity.getPrimKeyField());
- assertEnvironment(ejbName, entity.getJndiEnvironmentRefsGroup(), true);
+ assertEnvironment(ejbName, entity.getJndiEnvironmentRefsGroup(), true, mode);
assertContainerTransactions(ejbName, 6, 6, entity.getContainerTransactions());
assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, entity.getMethodPermissions());
assertExcludeList(ejbName, 5, 5, entity.getExcludeList());
@@ -320,7 +318,7 @@
}
@Override
- protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
+ protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData, Mode mode)
{
MessageDrivenBeanMetaData mdb = assertMDB(ejbName + "EjbName", enterpriseBeansMetaData);
assertId(ejbName, mdb);
@@ -332,7 +330,7 @@
assertEquals(ejbName + "MessageDestinationLink", mdb.getMessageDestinationLink());
assertActivationConfig(ejbName, mdb.getActivationConfig());
assertAroundInvokes(ejbName, 2, mdb.getAroundInvokes());
- assertEnvironment(ejbName, mdb.getJndiEnvironmentRefsGroup(), true);
+ assertEnvironment(ejbName, mdb.getJndiEnvironmentRefsGroup(), true, mode);
assertContainerTransactions(ejbName, 6, 6, mdb.getContainerTransactions());
assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, mdb.getMethodPermissions());
assertExcludeList(ejbName, 5, 5, mdb.getExcludeList());
@@ -341,7 +339,7 @@
return mdb;
}
- private void assertInterceptors(EjbJar3xMetaData ejbJarMetaData)
+ private void assertInterceptors(EjbJar3xMetaData ejbJarMetaData, Mode mode)
{
InterceptorsMetaData interceptorsMetaData = ejbJarMetaData.getInterceptors();
assertNotNull(interceptorsMetaData);
@@ -350,16 +348,16 @@
assertEquals(2, interceptorsMetaData.size());
int count = 1;
for (InterceptorMetaData interceptor : interceptorsMetaData)
- assertInterceptor("interceptor" + (count++), interceptor);
+ assertInterceptor("interceptor" + (count++), interceptor, mode);
}
- private void assertInterceptor(String prefix, InterceptorMetaData interceptorMetaData)
+ private void assertInterceptor(String prefix, InterceptorMetaData interceptorMetaData, Mode mode)
{
assertId(prefix, interceptorMetaData);
assertDescriptions(prefix, interceptorMetaData.getDescriptions());
assertEquals(prefix + "Class", interceptorMetaData.getInterceptorClass());
assertAroundInvokes(prefix, 2, interceptorMetaData.getAroundInvokes());
- assertEnvironment(prefix, interceptorMetaData.getJndiEnvironmentRefsGroup(), true);
+ assertEnvironment(prefix, interceptorMetaData.getJndiEnvironmentRefsGroup(), true, mode);
assertLifecycleCallbacks(prefix, "PostActivate", 2, interceptorMetaData.getPostActivates());
assertLifecycleCallbacks(prefix, "PrePassivate", 2, interceptorMetaData.getPrePassivates());
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2007-10-24 08:55:40 UTC (rev 66377)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2007-10-24 10:56:19 UTC (rev 66378)
@@ -29,7 +29,6 @@
import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
-import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -69,11 +68,11 @@
{
EjbJar3xMetaData ejbJarMetaData = unmarshal("EjbJar3xEverything_testEverything.xml", EjbJar30MetaData.class, null);
EjbJar3xEverythingUnitTestCase ejbJar = new EjbJar3xEverythingUnitTestCase("ejb-jar");
- ejbJar.assertEverything(ejbJarMetaData);
+ ejbJar.assertEverything(ejbJarMetaData, Mode.SPEC);
JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
- jboss.assertEverything(jbossMetaData);
+ jboss.assertEverything(jbossMetaData, Mode.JBOSS);
//jbossMetaData.setOverridenMetaData(ejbJarMetaData);
// Create the merged view
@@ -82,7 +81,7 @@
IEnterpriseBeanMetaData<?> ejb = jbossMetaData.getEnterpriseBean("session1EjbName");
assertNotNull(ejb);
JBossSessionBeanMetaData jejb = (JBossSessionBeanMetaData) ejb;
- ejbJar.assertFullSessionBean("session1", jejb);
+ ejbJar.assertFullSessionBean("session1", jejb, Mode.JBOSS);
}
/**
@@ -92,11 +91,11 @@
{
EjbJar21MetaData ejbJarMetaData = unmarshal("EjbJar21Everything_testEverything.xml", EjbJar21MetaData.class, null);
EjbJar21EverythingUnitTestCase ejbJar = new EjbJar21EverythingUnitTestCase("ejb-jar");
- ejbJar.assertEverything(ejbJarMetaData);
+ ejbJar.assertEverything(ejbJarMetaData, Mode.SPEC);
JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
- jboss.assertEverything(jbossMetaData);
+ jboss.assertEverything(jbossMetaData, Mode.JBOSS);
//jbossMetaData.setOverridenMetaData(ejbJarMetaData);
// Create the merged view
@@ -105,6 +104,6 @@
IEnterpriseBeanMetaData<?> ejb = jbossMetaData.getEnterpriseBean("session1EjbName");
assertNotNull(ejb);
JBossSessionBeanMetaData jejb = (JBossSessionBeanMetaData) ejb;
- ejbJar.assertFullSessionBean("session1", jejb);
+ ejbJar.assertFullSessionBean("session1", jejb, Mode.JBOSS);
}
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2007-10-24 08:55:40 UTC (rev 66377)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2007-10-24 10:56:19 UTC (rev 66378)
@@ -242,7 +242,6 @@
getLog().info(bean.getDescriptionGroup().getDescription());
- System.out.println(bean.getEmbedded().getBusinessLocals());
assertEquals(1, bean.getBusinessLocals().size());
assertTrue(bean.getBusinessLocals().contains("org.jboss.ejb3.test.service.ServiceSixLocal"));
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-10-24 08:55:40 UTC (rev 66377)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-10-24 10:56:19 UTC (rev 66378)
@@ -27,13 +27,12 @@
import junit.framework.Test;
-import org.jboss.metadata.common.ejb.IAssemblyDescriptorMetaData;
import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
import org.jboss.metadata.common.jboss.LoaderRepositoryConfigMetaData;
import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
-import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
import org.jboss.metadata.ejb.jboss.CommitOption;
import org.jboss.metadata.ejb.jboss.ContainerConfigurationMetaData;
@@ -48,33 +47,15 @@
import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaDataWrapper;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.jboss.ResourceManagerMetaData;
import org.jboss.metadata.ejb.jboss.ResourceManagersMetaData;
import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaDataWrapper;
-import org.jboss.metadata.ejb.spec.AssemblyDescriptorMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
-import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
-import org.jboss.metadata.ejb.spec.EntityBeanMetaData;
-import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
-import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
-import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
-import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
-import org.jboss.metadata.javaee.spec.Environment;
-import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
-import org.jboss.metadata.javaee.spec.PortComponent;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
import org.jboss.metadata.javaee.spec.ResourceInjectionMetaData;
-import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
-import org.jboss.test.metadata.ejb.AbstractEJBEverythingTest;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -147,7 +128,7 @@
//enableTrace("org.jboss.xb.builder");
JBoss50MetaData jbossMetaData = unmarshal();
hasStandardJBoss = false;
- assertEverything(jbossMetaData);
+ assertEverything(jbossMetaData, Mode.JBOSS);
}
public void testStandard() throws Exception
{
@@ -157,7 +138,7 @@
JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
JBossMetaDataWrapper wrapper = new JBossMetaDataWrapper(jbossMetaData, stdMetaData);
hasStandardJBoss = true;
- assertEverything(wrapper);
+ assertEverything(wrapper, Mode.JBOSS);
}
@@ -246,7 +227,7 @@
assertEquals(expectedInvokerNames, invokerNames);
}
- public void assertEverything(JBossMetaData jbossMetaData)
+ public void assertEverything(JBossMetaData jbossMetaData, Mode mode)
{
assertVersion(jbossMetaData);
assertId("jboss", jbossMetaData);
@@ -258,7 +239,7 @@
assertEquals("jboss-unauthenticated-principal", jbossMetaData.getUnauthenticatedPrincipal());
assertTrue(jbossMetaData.isExceptionOnRollback());
assertWebservices(jbossMetaData.getWebservices());
- assertJBossEnterpriseBeans(jbossMetaData);
+ assertJBossEnterpriseBeans(jbossMetaData, mode);
assertAssemblyDescriptor(jbossMetaData);
assertResourceManagers(jbossMetaData.getResourceManagers());
assertResourceManager("resourceManager1", true, jbossMetaData.getResourceManager("resourceManager1Name"));
@@ -341,23 +322,23 @@
return string.trim();
}
- private void assertJBossEnterpriseBeans(JBossMetaData jbossMetaData)
+ private void assertJBossEnterpriseBeans(JBossMetaData jbossMetaData, Mode mode)
{
IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> enterpriseBeansMetaData = jbossMetaData.getEnterpriseBeans();
assertNotNull(enterpriseBeansMetaData);
assertEquals(9, enterpriseBeansMetaData.size());
assertNullSessionBean("session0", jbossMetaData);
- assertFullSessionBean("session1", jbossMetaData, true);
- assertFullSessionBean("session2", jbossMetaData, false);
+ assertFullSessionBean("session1", jbossMetaData, true, mode);
+ assertFullSessionBean("session2", jbossMetaData, false, mode);
assertNullEntityBean("entity0", jbossMetaData);
- assertFullEntityBean("entity1", jbossMetaData, true);
- assertFullEntityBean("entity2", jbossMetaData, false);
+ assertFullEntityBean("entity1", jbossMetaData, true, mode);
+ assertFullEntityBean("entity2", jbossMetaData, false, mode);
assertNullMessageDrivenBean("mdb0", jbossMetaData);
- assertFullMessageDrivenBean("mdb1", jbossMetaData, true);
- assertFullMessageDrivenBean("mdb2", jbossMetaData, false);
+ assertFullMessageDrivenBean("mdb1", jbossMetaData, true, mode);
+ assertFullMessageDrivenBean("mdb2", jbossMetaData, false, mode);
}
private <T extends JBossEnterpriseBeanMetaData> T assertJBossEnterpriseBean(String prefix, JBossMetaData jBossMetaData, Class<T> expected)
@@ -396,7 +377,7 @@
return ejb;
}
*/
- private void assertFullSessionBean(String prefix, JBossMetaData jbossMetaData, boolean first)
+ private void assertFullSessionBean(String prefix, JBossMetaData jbossMetaData, boolean first, Mode mode)
{
JBossSessionBeanMetaData session = assertJBossSessionBean(prefix, jbossMetaData);
assertId(prefix, session);
@@ -427,7 +408,7 @@
assertInvokerBindings(prefix, session.getInvokerBindings());
- assertEnvironment(prefix, session.getJndiEnvironmentRefsGroup(), false);
+ assertEnvironment(prefix, session.getJndiEnvironmentRefsGroup(), false, mode);
assertSecurityIdentity(prefix, "SecurityIdentity", session.getSecurityIdentity(), false);
@@ -460,7 +441,7 @@
else
assertFalse(session.isConcurrent());
- assertJndiRefs(prefix, 2, session.getJndiRefs());
+ assertJndiRefs(prefix, 2, session.getJndiRefs(), mode);
}
private void assertNullSessionBean(String prefix, JBossMetaData jbossMetaData)
@@ -522,7 +503,7 @@
return ejb;
}
*/
- private void assertFullEntityBean(String prefix, JBossMetaData jbossMetaData, boolean first)
+ private void assertFullEntityBean(String prefix, JBossMetaData jbossMetaData, boolean first, Mode mode)
{
JBossEntityBeanMetaData entity = assertJBossEntityBean(prefix, jbossMetaData);
assertId(prefix, entity);
@@ -555,7 +536,7 @@
assertInvokerBindings(prefix, entity.getInvokerBindings());
- assertEnvironment(prefix, entity.getJndiEnvironmentRefsGroup(), false);
+ assertEnvironment(prefix, entity.getJndiEnvironmentRefsGroup(), false, mode);
assertSecurityIdentity(prefix, "SecurityIdentity", entity.getSecurityIdentity(), false);
@@ -579,7 +560,7 @@
// TODO DOM pool-config
- assertJndiRefs(prefix, 2, entity.getJndiRefs());
+ assertJndiRefs(prefix, 2, entity.getJndiRefs(), mode);
}
private void assertNullEntityBean(String prefix, JBossMetaData jbossMetaData)
@@ -715,7 +696,7 @@
return ejb;
}
*/
- private void assertFullMessageDrivenBean(String prefix, JBossMetaData jbossMetaData, boolean first)
+ private void assertFullMessageDrivenBean(String prefix, JBossMetaData jbossMetaData, boolean first, Mode mode)
{
JBossMessageDrivenBeanMetaData mdb = assertJBossMessageDrivenBean(prefix, jbossMetaData);
assertId(prefix, mdb);
@@ -744,7 +725,7 @@
assertInvokerBindings(prefix, mdb.getInvokerBindings());
- assertEnvironment(prefix, mdb.getJndiEnvironmentRefsGroup(), false);
+ assertEnvironment(prefix, mdb.getJndiEnvironmentRefsGroup(), false, mode);
assertMethodAttributes(prefix, mdb.getMethodAttributes());
@@ -764,7 +745,7 @@
// TODO DOM pool-config
- assertJndiRefs(prefix, 2, mdb.getJndiRefs());
+ assertJndiRefs(prefix, 2, mdb.getJndiRefs(), mode);
assertActivationConfig(prefix + "Default", mdb.getDefaultActivationConfig());
}
@@ -1154,7 +1135,7 @@
}
@Override
- protected void assertResourceGroup(String prefix, ResourceInjectionMetaData resourceInjectionMetaData, boolean full, boolean first)
+ protected void assertResourceGroup(String prefix, ResourceInjectionMetaData resourceInjectionMetaData, boolean full, boolean first, Mode mode)
{
super.assertResourceGroupNoJndiName(prefix, resourceInjectionMetaData, true, first);
assertEquals(prefix + "JndiName", resourceInjectionMetaData.getMappedName());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-10-24 08:55:40 UTC (rev 66377)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-10-24 10:56:19 UTC (rev 66378)
@@ -94,6 +94,17 @@
@SuppressWarnings("deprecation")
public abstract class AbstractJavaEEEverythingTest extends AbstractJavaEEMetaDataTest
{
+ /**
+ * Define two testing modes for assertions:
+ * - JBOSS: we're testing a JBoss view
+ * - SPEC: we're testing a spec view
+ */
+ public enum Mode
+ {
+ JBOSS,
+ SPEC
+ }
+
public AbstractJavaEEEverythingTest(String name)
{
super(name);
@@ -298,14 +309,14 @@
}
}
- protected void assertEnvironment(String prefix, Environment environment, boolean full)
+ protected void assertEnvironment(String prefix, Environment environment, boolean full, Mode mode)
{
- assertRemoteEnvironment(prefix, environment, full);
- assertEjbLocalRefs(prefix, 2, environment.getEjbLocalReferences(), full);
+ assertRemoteEnvironment(prefix, environment, full, mode);
+ assertEjbLocalRefs(prefix, 2, environment.getEjbLocalReferences(), full, mode);
// TODO service-refGroup
if (full)
{
- assertPersistenceContextRefs(prefix, 2, environment.getPersistenceContextRefs());
+ assertPersistenceContextRefs(prefix, 2, environment.getPersistenceContextRefs(), mode);
}
}
@@ -327,7 +338,7 @@
}
}
- private void assertEnvEntries(String prefix, int size, EnvironmentEntriesMetaData environmentEntriesMetaData, boolean full)
+ private void assertEnvEntries(String prefix, int size, EnvironmentEntriesMetaData environmentEntriesMetaData, boolean full, Mode mode)
{
assertNotNull(environmentEntriesMetaData);
assertEquals(size, environmentEntriesMetaData.size());
@@ -339,7 +350,7 @@
assertEquals(prefix + "EnvEntry" + count + "Name", environmentEntryMetaData.getEnvEntryName());
assertEquals("java.lang.String", environmentEntryMetaData.getType());
assertEquals(prefix + "EnvEntry" + count + "Value", environmentEntryMetaData.getValue());
- assertResourceGroup(prefix + "EnvEntry" + count, environmentEntryMetaData, full, count == 1);
+ assertResourceGroup(prefix + "EnvEntry" + count, environmentEntryMetaData, full, count == 1, mode);
++count;
}
}
@@ -360,25 +371,25 @@
assertEquals(size + 1, count);
}
- protected void assertRemoteEnvironment(String prefix, RemoteEnvironment environment, boolean full)
+ protected void assertRemoteEnvironment(String prefix, RemoteEnvironment environment, boolean full, Mode mode)
{
assertNotNull(environment);
if (full)
- assertEnvEntries(prefix, 2, environment.getEnvironmentEntries(), full);
- assertEjbRefs(prefix, 2, environment.getEjbReferences(), full);
+ assertEnvEntries(prefix, 2, environment.getEnvironmentEntries(), full, mode);
+ assertEjbRefs(prefix, 2, environment.getEjbReferences(), full, mode);
assertServiceRefs(prefix, 2, environment.getServiceReferences(), full);
- assertResourceRefs(prefix, 2, environment.getResourceReferences(), full);
- assertResourceEnvRefs(prefix, 2, environment.getResourceEnvironmentReferences(), full);
- assertMessageDestinationRefs(prefix, 3, environment.getMessageDestinationReferences(), full);
+ assertResourceRefs(prefix, 2, environment.getResourceReferences(), full, mode);
+ assertResourceEnvRefs(prefix, 2, environment.getResourceEnvironmentReferences(), full, mode);
+ assertMessageDestinationRefs(prefix, 3, environment.getMessageDestinationReferences(), full, mode);
if (full)
{
- assertPersistenceUnitRefs(prefix, 2, environment.getPersistenceUnitRefs());
+ assertPersistenceUnitRefs(prefix, 2, environment.getPersistenceUnitRefs(), mode);
assertLifecycleCallbacks(prefix, "PostConstruct", 2, environment.getPostConstructs());
assertLifecycleCallbacks(prefix, "PreDestroy", 2, environment.getPreDestroys());
}
}
- private void assertEjbRefs(String prefix, int size, EJBReferencesMetaData ejbReferencesMetaData, boolean full)
+ private void assertEjbRefs(String prefix, int size, EJBReferencesMetaData ejbReferencesMetaData, boolean full, Mode mode)
{
assertNotNull("no ejb-refs are set", ejbReferencesMetaData);
assertEquals(size, ejbReferencesMetaData.size());
@@ -398,12 +409,12 @@
assertEquals(prefix + "EjbRef" + count + "Remote", ejbReferenceMetaData.getRemote());
assertEquals(prefix + "EjbRef" + count + "EjbLink", ejbReferenceMetaData.getLink());
}
- assertResourceGroup(prefix + "EjbRef" + count, ejbReferenceMetaData, full, count == 1);
+ assertResourceGroup(prefix + "EjbRef" + count, ejbReferenceMetaData, full, count == 1, mode);
++count;
}
}
- protected void assertEjbRefs(String prefix, int size, Iterator<EjbRefMetaData> ejbRefs, boolean full)
+ protected void assertEjbRefs(String prefix, int size, Iterator<EjbRefMetaData> ejbRefs, boolean full, Mode mode)
{
assertNotNull(ejbRefs);
int count = 1;
@@ -422,13 +433,13 @@
assertEquals(pref + "Remote", ejbRef.getRemote());
assertEquals(pref + "EjbLink", ejbRef.getLink());
}
- assertJndiName(pref, full, ejbRef.getJndiName());
+ assertJndiName(pref, full, ejbRef.getJndiName(), mode);
++count;
}
assertEquals(size + 1, count);
}
- private void assertEjbLocalRefs(String prefix, int size, EJBLocalReferencesMetaData ejbReferencesMetaData, boolean full)
+ private void assertEjbLocalRefs(String prefix, int size, EJBLocalReferencesMetaData ejbReferencesMetaData, boolean full, Mode mode)
{
assertNotNull("no ejb local refs are set", ejbReferencesMetaData);
assertEquals(size, ejbReferencesMetaData.size());
@@ -448,12 +459,12 @@
assertEquals(prefix + "EjbLocalRef" + count + "Local", ejbReferenceMetaData.getLocal());
assertEquals(prefix + "EjbLocalRef" + count + "EjbLink", ejbReferenceMetaData.getLink());
}
- assertResourceGroup(prefix + "EjbLocalRef" + count, ejbReferenceMetaData, full, count == 1);
+ assertResourceGroup(prefix + "EjbLocalRef" + count, ejbReferenceMetaData, full, count == 1, mode);
++count;
}
}
- protected void assertEjbLocalRefs(String prefix, int size, Iterator<EjbLocalRefMetaData> ejbLocalRefs, boolean full)
+ protected void assertEjbLocalRefs(String prefix, int size, Iterator<EjbLocalRefMetaData> ejbLocalRefs, boolean full, Mode mode)
{
assertNotNull(ejbLocalRefs);
int count = 1;
@@ -472,7 +483,7 @@
assertEquals(pref + "Local", ejbLocalRef.getLocal());
assertEquals(pref + "EjbLink", ejbLocalRef.getLink());
}
- assertJndiName(pref, full, ejbLocalRef.getJndiName());
+ assertJndiName(pref, full, ejbLocalRef.getJndiName(), mode);
++count;
}
assertEquals(size + 1, count);
@@ -496,7 +507,7 @@
count ++;
}
}
- private void assertResourceRefs(String prefix, int size, ResourceReferencesMetaData resourceReferencesMetaData, boolean full)
+ private void assertResourceRefs(String prefix, int size, ResourceReferencesMetaData resourceReferencesMetaData, boolean full, Mode mode)
{
assertNotNull("no resource refs are set", resourceReferencesMetaData);
assertEquals(size, resourceReferencesMetaData.size());
@@ -520,12 +531,12 @@
assertEquals(ResourceSharingScopeType.Unshareable, resourceReferenceMetaData.getResSharingScope());
}
}
- assertResourceGroup(prefix + "ResourceRef" + count, resourceReferenceMetaData, full, count == 1);
+ assertResourceGroup(prefix + "ResourceRef" + count, resourceReferenceMetaData, full, count == 1, mode);
++count;
}
}
- protected void assertResourceRefs(String prefix, int size, Iterator<ResourceRefMetaData> resRefs, boolean full)
+ protected void assertResourceRefs(String prefix, int size, Iterator<ResourceRefMetaData> resRefs, boolean full, Mode mode)
{
assertNotNull(resRefs);
int count = 1;
@@ -548,13 +559,13 @@
assertFalse(pref + "Scope", resRef.isShareable());
}
}
- assertJndiName(pref, full, resRef.getJndiName());
+ assertJndiName(pref, full, resRef.getJndiName(), mode);
++count;
}
assertEquals(size + 1, count);
}
- private void assertResourceEnvRefs(String prefix, int size, ResourceEnvironmentReferencesMetaData resourceEnvReferencesMetaData, boolean full)
+ private void assertResourceEnvRefs(String prefix, int size, ResourceEnvironmentReferencesMetaData resourceEnvReferencesMetaData, boolean full, Mode mode)
{
assertNotNull("no resource env refs are set", resourceEnvReferencesMetaData);
assertEquals(size, resourceEnvReferencesMetaData.size());
@@ -566,12 +577,12 @@
assertEquals(prefix + "ResourceEnvRef" + count + "Name", resourceEnvReferenceMetaData.getResourceEnvRefName());
if (full)
assertEquals(prefix + "ResourceEnvRef" + count + "Type", resourceEnvReferenceMetaData.getType());
- assertResourceGroup(prefix + "ResourceEnvRef" + count, resourceEnvReferenceMetaData, full, count == 1);
+ assertResourceGroup(prefix + "ResourceEnvRef" + count, resourceEnvReferenceMetaData, full, count == 1, mode);
++count;
}
}
- protected void assertResourceEnvRefs(String prefix, int size, Iterator<ResourceEnvRefMetaData> resEnvRefs, boolean full)
+ protected void assertResourceEnvRefs(String prefix, int size, Iterator<ResourceEnvRefMetaData> resEnvRefs, boolean full, Mode mode)
{
assertNotNull(resEnvRefs);
int count = 1;
@@ -584,13 +595,13 @@
{
assertEquals(pref + "Type", resRef.getType());
}
- assertJndiName(pref, full, resRef.getJndiName());
+ assertJndiName(pref, full, resRef.getJndiName(), mode);
++count;
}
assertEquals(size + 1, count);
}
- private void assertMessageDestinationRefs(String prefix, int size, MessageDestinationReferencesMetaData messageDestinationReferencesMetaData, boolean full)
+ private void assertMessageDestinationRefs(String prefix, int size, MessageDestinationReferencesMetaData messageDestinationReferencesMetaData, boolean full, Mode mode)
{
assertNotNull("no message destination refs are set", messageDestinationReferencesMetaData);
assertEquals(size, messageDestinationReferencesMetaData.size());
@@ -611,7 +622,7 @@
assertEquals(MessageDestinationUsageType.ConsumesProduces, messageDestinationReferenceMetaData.getMessageDestinationUsage());
assertEquals(prefix + "MessageDestinationRef" + count + "Link", messageDestinationReferenceMetaData.getLink());
}
- assertResourceGroup(prefix + "MessageDestinationRef" + count, messageDestinationReferenceMetaData, full, count == 1);
+ assertResourceGroup(prefix + "MessageDestinationRef" + count, messageDestinationReferenceMetaData, full, count == 1, mode);
++count;
}
}
@@ -641,7 +652,7 @@
assertEquals(size + 1, count);
}
- protected void assertPersistenceContextRefs(String prefix, int size, PersistenceContextReferencesMetaData persistenceContextReferencesMetaData)
+ protected void assertPersistenceContextRefs(String prefix, int size, PersistenceContextReferencesMetaData persistenceContextReferencesMetaData, Mode mode)
{
assertNotNull(persistenceContextReferencesMetaData);
assertEquals(size, persistenceContextReferencesMetaData.size());
@@ -657,12 +668,12 @@
else
assertEquals(PersistenceContextType.Extended, persistenceContextReferenceMetaData.getPersistenceContextType());
assertProperties(prefix + "PersistenceContextRef" + count, 2, persistenceContextReferenceMetaData.getProperties());
- assertResourceGroup(prefix + "PersistenceContextRef" + count, persistenceContextReferenceMetaData, true, count == 1);
+ assertResourceGroup(prefix + "PersistenceContextRef" + count, persistenceContextReferenceMetaData, true, count == 1, mode);
++count;
}
}
- protected void assertPersistenceUnitRefs(String prefix, int size, PersistenceUnitReferencesMetaData persistenceUnitReferencesMetaData)
+ protected void assertPersistenceUnitRefs(String prefix, int size, PersistenceUnitReferencesMetaData persistenceUnitReferencesMetaData, Mode mode)
{
assertNotNull("no persistence unit refs are set", persistenceUnitReferencesMetaData);
assertEquals(size, persistenceUnitReferencesMetaData.size());
@@ -673,7 +684,7 @@
assertDescriptions(prefix + "PersistenceUnitRef" + count, persistenceUnitReferenceMetaData.getDescriptions());
assertEquals(prefix + "PersistenceUnitRef" + count + "Name", persistenceUnitReferenceMetaData.getPersistenceUnitRefName());
assertEquals(prefix + "PersistenceUnitRef" + count + "Unit", persistenceUnitReferenceMetaData.getPersistenceUnitName());
- assertResourceGroup(prefix + "PersistenceUnitRef" + count, persistenceUnitReferenceMetaData, true, count == 1);
+ assertResourceGroup(prefix + "PersistenceUnitRef" + count, persistenceUnitReferenceMetaData, true, count == 1, mode);
++count;
}
}
@@ -698,15 +709,15 @@
assertResourceInjectionTargets(prefix, 2, resourceInjectionMetaData.getInjectionTargets());
}
- protected void assertResourceGroup(String prefix, ResourceInjectionMetaData resourceInjectionMetaData, boolean full, boolean first)
+ protected void assertResourceGroup(String prefix, ResourceInjectionMetaData resourceInjectionMetaData, boolean full, boolean first, Mode mode)
{
- assertResourceGroupJndiName(prefix, resourceInjectionMetaData, full, first);
+ assertResourceGroupJndiName(prefix, resourceInjectionMetaData, full, first, mode);
}
- private void assertResourceGroupJndiName(String prefix, ResourceInjectionMetaData resourceInjectionMetaData, boolean full, boolean first)
+ private void assertResourceGroupJndiName(String prefix, ResourceInjectionMetaData resourceInjectionMetaData, boolean full, boolean first, Mode mode)
{
assertResourceGroupNoJndiName(prefix, resourceInjectionMetaData, full, first);
- assertJndiName(prefix, full, resourceInjectionMetaData.getMappedName());
+ assertJndiName(prefix, full, resourceInjectionMetaData.getMappedName(), mode);
}
protected void assertResourceInjectionTargets(String prefix, int size, Set<ResourceInjectionTargetMetaData> targets)
@@ -730,9 +741,20 @@
assertEquals(prefix + "Name", target.getInjectionTargetName());
}
- protected void assertJndiName(String prefix, boolean full, String jndiName)
+ protected void assertJndiName(String prefix, boolean full, String jndiName, Mode mode)
{
assertNotNull(jndiName);
+// switch(mode)
+// {
+// case JBOSS:
+// assertEquals(prefix, prefix + "JBoss", jndiName);
+// break;
+// case SPEC:
+// assertEquals(prefix, prefix + "MappedName", jndiName);
+// break;
+// default:
+// throw new IllegalArgumentException("unknown mode " + mode);
+// }
// Getting too convoluted when there is a jboss override...
String expectedMappedName = prefix + "MappedName";
String expectedJndiName = prefix + "JndiName";
@@ -773,7 +795,7 @@
}
}
- protected void assertJndiRefs(String prefix, int size, JndiRefsMetaData jndiRefsMetaData)
+ protected void assertJndiRefs(String prefix, int size, JndiRefsMetaData jndiRefsMetaData, Mode mode)
{
assertNotNull(jndiRefsMetaData);
assertEquals(size, jndiRefsMetaData.size());
@@ -783,7 +805,7 @@
assertId(prefix + "JndiRef" + count, jndiRef);
assertDescriptions(prefix + "JndiRef" + count, jndiRef.getDescriptions());
assertEquals(prefix + "JndiRef" + count + "Name", jndiRef.getJndiRefName());
- assertResourceGroupJndiName(prefix + "JndiRef" + count, jndiRef, true, count == 1);
+ assertResourceGroupJndiName(prefix + "JndiRef" + count, jndiRef, true, count == 1, mode);
++count;
}
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java 2007-10-24 08:55:40 UTC (rev 66377)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java 2007-10-24 10:56:19 UTC (rev 66378)
@@ -66,7 +66,7 @@
public void testEverything() throws Exception
{
WebMetaData webApp = unmarshal();
- assertEverything(webApp);
+ assertEverything(webApp, Mode.SPEC);
}
protected WebMetaData unmarshal() throws Exception
@@ -74,11 +74,11 @@
return unmarshal(WebMetaData.class);
}
- protected void assertEverything(WebMetaData webApp)
+ protected void assertEverything(WebMetaData webApp, Mode mode)
throws Exception
{
assertDescriptionGroup("web-app", webApp.getDescriptionGroup());
- assertRemoteEnvironment("webApp", webApp, true);
+ assertRemoteEnvironment("webApp", webApp, true, mode);
assertMessageDestinations5("webAppMessageDestination", 2, webApp.getMessageDestinations(), true);
assertServlets(webApp);
assertServletMappings(webApp);
More information about the jboss-cvs-commits
mailing list