[jboss-cvs] JBossAS SVN: r66134 - in projects/metadata/trunk/src/test/java/org/jboss/test/metadata: javaee and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 15 13:47:49 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-15 13:47:49 -0400 (Mon, 15 Oct 2007)
New Revision: 66134
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
Log:
Update for minimum ejb element requirements and uniqueness constraints
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-15 17:26:46 UTC (rev 66133)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-10-15 17:47:49 UTC (rev 66134)
@@ -113,7 +113,7 @@
session = assertSession("session5EjbName", enterpriseBeansMetaData);
SecurityIdentityMetaData securityIdentityMetaData = session.getSecurityIdentity();
assertNotNull(securityIdentityMetaData);
- assertFalse(securityIdentityMetaData.isUseCallerId());
+ assertTrue(securityIdentityMetaData.isUseCallerId());
assertNullEntity("entity0", enterpriseBeansMetaData);
assertFullEntity("entity1", enterpriseBeansMetaData);
@@ -156,7 +156,7 @@
session = assertSession("session5", applicationMetaData);
org.jboss.metadata.SecurityIdentityMetaData securityIdentityMetaData = session.getSecurityIdentityMetaData();
assertNotNull(securityIdentityMetaData);
- assertFalse(securityIdentityMetaData.getUseCallerIdentity());
+ assertTrue(securityIdentityMetaData.getUseCallerIdentity());
assertNullEntity("entity0", applicationMetaData);
assertFullEntity("entity1", applicationMetaData);
@@ -178,10 +178,23 @@
{
throw new NotImplementedException();
}
-
+ /**
+ * Assert a minimal session bean. This requires an empty
+ * security-identity/use-caller-identity element
+ *
+ * @param ejbName
+ * @param enterpriseBeansMetaData
+ * @return
+ */
private SessionBeanMetaData assertNullSession(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
{
SessionBeanMetaData session = assertSession(ejbName + "EjbName", enterpriseBeansMetaData);
+ assertEquals(ejbName+"EjbClass", session.getEjbClass());
+ assertEquals(SessionType.Stateless, session.getSessionType());
+ assertEquals(TransactionType.Container, session.getTransactionType());
+ assertNotNull(session.getSecurityIdentity().getUseCallerIdentity());
+ assertTrue(session.getSecurityIdentity().isUseCallerId());
+
assertNull(session.getId());
assertNull(session.getMappedName());
assertNull(session.getHome());
@@ -191,12 +204,9 @@
assertNull(session.getBusinessLocals());
assertNull(session.getBusinessRemotes());
assertNull(session.getServiceEndpoint());
- assertNull(session.getEjbClass());
- assertNull(session.getSessionType());
assertNull(session.getTimeoutMethod());
assertNull(session.getInitMethods());
assertNull(session.getRemoveMethods());
- assertNull(session.getTransactionType());
assertNull(session.getAroundInvokes());
assertNull(session.getPostActivates());
assertNull(session.getPrePassivates());
@@ -205,7 +215,6 @@
assertNull(session.getMethodPermissions());
assertNull(session.getExcludeList());
assertNull(session.getSecurityRoleRefs());
- assertNull(session.getSecurityIdentity());
return session;
}
@@ -241,24 +250,32 @@
return session;
}
+ /**
+ * Assert a minimal session.
+ *
+ * @param ejbName
+ * @param applicationMetaData
+ * @return
+ */
private SessionMetaData assertNullSession(String ejbName, ApplicationMetaData applicationMetaData)
{
SessionMetaData session = assertSession(ejbName, applicationMetaData);
+ assertTrue(session.isStateless());
+ assertTrue(session.isContainerManagedTx());
+ assertEquals(ejbName+"EjbClass", session.getEjbClass());
+ assertNotNull(session.getSecurityIdentityMetaData());
+
assertNull(session.getHome());
assertNull(session.getRemote());
assertNull(session.getLocalHome());
assertNull(session.getLocal());
assertNull(session.getServiceEndpoint());
- assertNull(session.getEjbClass());
- assertTrue(session.isStateless());
- assertTrue(session.isContainerManagedTx());
assertNullEnvironment(session);
assertDefaultMethodAttributes(ejbName, session);
assertEmptyIterator(session.getTransactionMethods());
assertEmptyIterator(session.getPermissionMethods());
assertEmptyIterator(session.getExcludedMethods());
assertEmptyIterator(session.getSecurityRoleReferences());
- assertNull(session.getSecurityIdentityMetaData());
return session;
}
@@ -280,21 +297,22 @@
private EntityBeanMetaData assertNullEntity(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
{
EntityBeanMetaData entity = assertEntity(ejbName + "EjbName", enterpriseBeansMetaData);
- assertNullEntity(entity);
+ assertNullEntity(ejbName, entity);
return entity;
}
- public void assertNullEntity(EntityBeanMetaData entity)
+ public void assertNullEntity(String ejbName, EntityBeanMetaData entity)
{
+ assertEquals(ejbName+"EjbClass", entity.getEjbClass());
+ assertEquals(PersistenceType.Container, entity.getPersistenceType());
+ assertEquals(ejbName+"EjbKeyClass", entity.getPrimKeyClass());
+
assertNull(entity.getId());
assertNull(entity.getMappedName());
assertNull(entity.getHome());
assertNull(entity.getRemote());
assertNull(entity.getLocalHome());
assertNull(entity.getLocal());
- assertNull(entity.getEjbClass());
- assertNull(entity.getPersistenceType());
- assertNull(entity.getPrimKeyClass());
assertFalse(entity.isReentrant());
assertNull(entity.getCmpVersion());
assertFalse(entity.isCMP1x());
@@ -349,13 +367,14 @@
private EntityMetaData assertNullEntity(String ejbName, ApplicationMetaData applicationMetaData)
{
EntityMetaData entity = assertEntity(ejbName + "EjbName", applicationMetaData);
+ assertEquals(ejbName+"EjbClass", entity.getEjbClass());
+ assertEquals(ejbName+"EjbKeyClass", entity.getPrimaryKeyClass());
+
assertNull(entity.getHome());
assertNull(entity.getRemote());
assertNull(entity.getLocalHome());
assertNull(entity.getLocal());
- assertNull(entity.getEjbClass());
assertTrue(entity.isCMP());
- assertNull(entity.getPrimaryKeyClass());
assertFalse(entity.isReentrant());
assertTrue(entity.isCMP2x());
assertFalse(entity.isCMP1x());
@@ -442,13 +461,13 @@
private MessageDrivenBeanMetaData assertNullMDB(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
{
MessageDrivenBeanMetaData mdb = assertMDB(ejbName + "EjbName", enterpriseBeansMetaData);
+ assertEquals(ejbName+"EjbClass", mdb.getEjbClass());
+ assertEquals(TransactionType.Container, mdb.getTransactionType());
assertNull(mdb.getId());
assertNull(mdb.getMappedName());
- assertNull(mdb.getEjbClass());
assertNull(mdb.getMessagingType());
assertNull(mdb.getTimeoutMethod());
- assertNull(mdb.getTransactionType());
assertNull(mdb.getMessageDestinationType());
assertNull(mdb.getMessageDestinationLink());
assertNull(mdb.getActivationConfig());
@@ -493,8 +512,8 @@
private MessageDrivenMetaData assertNullMDB(String ejbName, ApplicationMetaData applicationMetaData)
{
MessageDrivenMetaData mdb = assertMDB(ejbName + "EjbName", applicationMetaData);
+ assertEquals(ejbName+"EjbClass", mdb.getEjbClass());
- assertNull(mdb.getEjbClass());
assertNull(mdb.getMessagingType());
assertTrue(mdb.isContainerManagedTx());
assertNull(mdb.getDestinationType());
@@ -623,16 +642,18 @@
assertNotNull(relationRoleSourceMetaData);
assertId(prefix, relationRoleSourceMetaData);
assertDescriptions(prefix, relationRoleSourceMetaData.getDescriptions());
- assertEquals(prefix + "Name" + "EjbName", relationRoleSourceMetaData.getEjbName());
+ // Hard-coded to the last entity ejb-name
+ assertEquals("entity5EjbName", relationRoleSourceMetaData.getEjbName());
}
-
+
private void assertCmrField(String prefix, CMRFieldMetaData cmrFieldMetaData)
{
assertNotNull(cmrFieldMetaData);
assertId(prefix, cmrFieldMetaData);
assertDescriptions(prefix, cmrFieldMetaData.getDescriptions());
assertEquals(prefix + "Name", cmrFieldMetaData.getCmrFieldName());
- assertEquals(prefix + "Type", cmrFieldMetaData.getCmrFieldType());
+ // All use java.util.Set
+ assertEquals("java.util.Set", cmrFieldMetaData.getCmrFieldType());
}
protected void assertRelationships(ApplicationMetaData applicationMetaData)
@@ -674,9 +695,11 @@
assertTrue(relationRoleMetaData.isMultiplicityOne());
}
assertTrue(relationRoleMetaData.isCascadeDelete());
- assertEquals(prefix + "RoleSourceNameEjbName", relationRoleMetaData.getEntityName());
+ // All use the last entity ejb-name
+ assertEquals("entity5EjbName", relationRoleMetaData.getEntityName());
assertEquals(prefix + "CmrFieldName", relationRoleMetaData.getCMRFieldName());
- assertEquals(prefix + "CmrFieldType", relationRoleMetaData.getCMRFieldType());
+ // All use java.util.Set
+ assertEquals("java.util.Set", relationRoleMetaData.getCMRFieldType());
}
protected AssemblyDescriptorMetaData assertAssemblyDescriptor(EjbJarMetaData ejbJarMetaData)
@@ -1029,8 +1052,6 @@
assertDescriptions(prefix, securityIdentity.getDescriptions());
if (full)
{
- assertEmpty(prefix, "UseCallerIdentity", securityIdentity.getUseCallerIdentity());
- assertTrue(securityIdentity.isUseCallerId());
assertRunAs(ejbName, type, securityIdentity.getRunAs());
}
}
@@ -1042,7 +1063,6 @@
assertEquals("en-" + prefix + "-desc", securityIdentity.getDescription());
if (full)
{
- assertTrue(securityIdentity.getUseCallerIdentity());
assertEquals(prefix + "RunAsRoleName", securityIdentity.getRunAsRoleName());
}
}
@@ -1065,7 +1085,7 @@
assertId(ejbName + "SecurityRoleRef" + count, securityRoleRefMetaData);
assertDescriptions(ejbName + "SecurityRoleRef" + count, securityRoleRefMetaData.getDescriptions());
assertEquals(ejbName + "SecurityRoleRef" + count + "RoleName", securityRoleRefMetaData.getRoleName());
- assertEquals(ejbName + "SecurityRoleRef" + count + "RoleLink", securityRoleRefMetaData.getRoleLink());
+ assertEquals("securityRoleRef" + count + "RoleLink", securityRoleRefMetaData.getRoleLink());
++count;
}
}
@@ -1079,7 +1099,7 @@
org.jboss.metadata.SecurityRoleRefMetaData securityRoleRefMetaData = securityRoleRefs.next();
assertEquals("en-" + ejbName + "SecurityRoleRef" + count + "-desc", securityRoleRefMetaData.getDescription());
assertEquals(ejbName + "SecurityRoleRef" + count + "RoleName", securityRoleRefMetaData.getName());
- assertEquals(ejbName + "SecurityRoleRef" + count + "RoleLink", securityRoleRefMetaData.getLink());
+ assertEquals("securityRoleRef" + count + "RoleLink", securityRoleRefMetaData.getLink());
++count;
}
assertEquals(ejbName, size, count-1);
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-15 17:26:46 UTC (rev 66133)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-10-15 17:47:49 UTC (rev 66134)
@@ -195,17 +195,17 @@
int count = 1;
for (SecurityRoleMetaData securityRoleMetaData : securityRolesMetaData)
{
- assertSecurityRole("securityRole" + count, securityRoleMetaData);
+ assertSecurityRole("securityRole", count, securityRoleMetaData);
++count;
}
}
- protected void assertSecurityRole(String prefix, SecurityRoleMetaData securityRoleMetaData)
+ protected void assertSecurityRole(String prefix, int count, SecurityRoleMetaData securityRoleMetaData)
{
assertNotNull(securityRoleMetaData);
- assertId(prefix, securityRoleMetaData);
- assertDescriptions(prefix, securityRoleMetaData.getDescriptions());
- assertEquals(prefix + "RoleName", securityRoleMetaData.getRoleName());
+ assertId(prefix+count, securityRoleMetaData);
+ assertDescriptions(prefix+count, securityRoleMetaData.getDescriptions());
+ assertEquals("securityRoleRef"+count+"RoleLink", securityRoleMetaData.getRoleName());
}
/**
@@ -231,7 +231,7 @@
int count = 1;
for (org.jboss.security.SecurityRoleMetaData securityRoleMetaData : securityRoles.values())
{
- assertSecurityRole("securityRole" + count, securityRoleMetaData);
+ assertSecurityRole("securityRoleRef" + count, securityRoleMetaData);
++count;
}
}
@@ -239,7 +239,7 @@
protected void assertSecurityRole(String prefix, org.jboss.security.SecurityRoleMetaData securityRole)
{
assertNotNull(securityRole);
- assertEquals(prefix + "RoleName", securityRole.getRoleName());
+ assertEquals(prefix + "RoleLink", securityRole.getRoleName());
}
protected void assertMessageDestinations(int size, MessageDestinationsMetaData messageDestinationsMetaData)
More information about the jboss-cvs-commits
mailing list