[jboss-cvs] JBossAS SVN: r66515 - in projects/metadata/trunk/src/test: resources/org/jboss/test/metadata/ejb and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Oct 27 04:23:57 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-27 04:23:57 -0400 (Sat, 27 Oct 2007)
New Revision: 66515
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml
Log:
Update the security-role tests to use the correct principal-name element
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java 2007-10-27 08:23:18 UTC (rev 66514)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java 2007-10-27 08:23:57 UTC (rev 66515)
@@ -22,6 +22,10 @@
package org.jboss.test.metadata.ear;
+import java.security.Principal;
+import java.util.HashSet;
+import java.util.Set;
+
import junit.framework.Test;
import org.jboss.annotation.javaee.Description;
@@ -40,6 +44,8 @@
import org.jboss.metadata.javaee.spec.DescriptionImpl;
import org.jboss.metadata.javaee.spec.DisplayNameImpl;
import org.jboss.metadata.javaee.spec.IconImpl;
+import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -164,4 +170,69 @@
assertEquals("1.3 EE Client", group.getDescription());
assertEquals("The cts.jar with an application client jar", group.getDisplayName());
}
+
+ public void testSecurityRoles()
+ throws Exception
+ {
+ EarMetaData specMetaData = unmarshal();
+ JBossAppMetaData jbossMetaData = unmarshal("Ear4x_testJBossSecurityRoles.xml", JBossAppMetaData.class, null);
+ JBossAppMetaData metaData = new JBossAppMetaData();
+ metaData.merge(jbossMetaData, specMetaData);
+
+ SecurityRolesMetaData secRoles = metaData.getSecurityRoles();
+ assertNotNull(secRoles);
+ assertEquals(4, secRoles.size());
+ // VP
+ SecurityRoleMetaData VP = secRoles.get("VP");
+ assertNotNull(VP);
+ assertEquals("VP", VP.getRoleName());
+ assertNull(VP.getPrincipals());
+ // Employee
+ SecurityRoleMetaData Employee = secRoles.get("Employee");
+ assertNotNull(Employee);
+ assertEquals("Employee", Employee.getRoleName());
+ assertEquals(2, Employee.getPrincipals().size());
+ String[] principals = {};
+ principals = Employee.getPrincipals().toArray(principals);
+ assertEquals("javajoe", principals[0]);
+ assertEquals("j2ee", principals[1]);
+ // Manager
+ SecurityRoleMetaData Manager = secRoles.get("Manager");
+ assertNotNull(Manager);
+ assertEquals("Manager", Manager.getRoleName());
+ assertEquals(1, Manager.getPrincipals().size());
+ principals = new String[0];
+ principals = Manager.getPrincipals().toArray(principals);
+ assertEquals("javajoe", principals[0]);
+ // Administrator
+ SecurityRoleMetaData Administrator = secRoles.get("Administrator");
+ assertNotNull(Administrator);
+ assertEquals("Administrator", Administrator.getRoleName());
+ assertEquals(1, Administrator.getPrincipals().size());
+ principals = new String[0];
+ principals = Administrator.getPrincipals().toArray(principals);
+ assertEquals("j2ee", principals[0]);
+
+ Set<String> j2eeRoles = secRoles.getSecurityRoleNamesByPrincipal("j2ee");
+ HashSet<String> expectedj2eeRoles = new HashSet<String>();
+ expectedj2eeRoles.add("Employee");
+ expectedj2eeRoles.add("Administrator");
+ assertEquals(expectedj2eeRoles, j2eeRoles);
+ Set<String> javajoeRoles = secRoles.getSecurityRoleNamesByPrincipal("javajoe");
+ HashSet<String> expectedjavajoeRoles = new HashSet<String>();
+ expectedjavajoeRoles.add("Employee");
+ expectedjavajoeRoles.add("Manager");
+ assertEquals(expectedjavajoeRoles, javajoeRoles);
+
+ SecurityRolesMetaData j2eeRolesMD = secRoles.getSecurityRolesByPrincipal("j2ee");
+ assertEquals(2, j2eeRolesMD.size());
+ Employee = j2eeRolesMD.get("Employee");
+ assertNotNull(Employee);
+ assertEquals("Employee", Employee.getRoleName());
+ assertEquals(2, Employee.getPrincipals().size());
+ principals = new String[0];
+ principals = Employee.getPrincipals().toArray(principals);
+ assertEquals("javajoe", principals[0]);
+ assertEquals("j2ee", principals[1]);
+ }
}
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2007-10-27 08:23:18 UTC (rev 66514)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2007-10-27 08:23:57 UTC (rev 66515)
@@ -2641,16 +2641,16 @@
<description xml:lang="fr">fr-securityRole1-desc</description>
<description xml:lang="de">de-securityRole1-desc</description>
<role-name>securityRoleRef1RoleLink</role-name>
- <principal>securityRole1Principal1</principal>
- <principal>securityRole1Principal2</principal>
+ <principal-name>securityRole1Principal1</principal-name>
+ <principal-name>securityRole1Principal2</principal-name>
</security-role>
<security-role id="securityRole2-id">
<description>en-securityRole2-desc</description>
<description xml:lang="fr">fr-securityRole2-desc</description>
<description xml:lang="de">de-securityRole2-desc</description>
<role-name>securityRoleRef2RoleLink</role-name>
- <principal>securityRole2Principal1</principal>
- <principal>securityRole2Principal2</principal>
+ <principal-name>securityRole2Principal1</principal-name>
+ <principal-name>securityRole2Principal2</principal-name>
</security-role>
<message-destination id="messageDestination1-id">
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml 2007-10-27 08:23:18 UTC (rev 66514)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml 2007-10-27 08:23:57 UTC (rev 66515)
@@ -2594,16 +2594,16 @@
<description xml:lang="fr">fr-securityRole1-desc</description>
<description xml:lang="de">de-securityRole1-desc</description>
<role-name>securityRole1RoleName</role-name>
- <principal>securityRole1Principal1</principal>
- <principal>securityRole1Principal2</principal>
+ <principal-name>securityRole1Principal1</principal-name>
+ <principal-name>securityRole1Principal2</principal-name>
</security-role>
<security-role id="securityRole2-id">
<description>en-securityRole2-desc</description>
<description xml:lang="fr">fr-securityRole2-desc</description>
<description xml:lang="de">de-securityRole2-desc</description>
<role-name>securityRole2RoleName</role-name>
- <principal>securityRole2Principal1</principal>
- <principal>securityRole2Principal2</principal>
+ <principal-name>securityRole2Principal1</principal-name>
+ <principal-name>securityRole2Principal2</principal-name>
</security-role>
<message-destination id="messageDestination1-id">
More information about the jboss-cvs-commits
mailing list