[jboss-cvs] JBossAS SVN: r66153 - in projects/metadata/trunk/src/test/java/org/jboss/test/metadata: javaee and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2007-10-16 02:21:10 -0400 (Tue, 16 Oct 2007)
New Revision: 66153

Modified:
   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
Log:
Correct for invoker proxy changes

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-16 06:20:36 UTC (rev 66152)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java	2007-10-16 06:21:10 UTC (rev 66153)
@@ -260,7 +260,8 @@
       assertResourceManagers(jbossMetaData.getResourceManagers());
       assertResourceManager("resourceManager1", true, jbossMetaData.getResourceManager("resourceManager1Name"));
       assertResourceManager("resourceManager2", false, jbossMetaData.getResourceManager("resourceManager2Name"));
-      assertInvokerProxyBindings(jbossMetaData.getInvokerProxyBindings());
+      if(hasStandardJBoss == false)
+         assertInvokerProxyBindings(jbossMetaData.getInvokerProxyBindings());
       assertInvokerProxyBinding("invokerProxyBinding1", 1, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding1Name"));
       assertInvokerProxyBinding("invokerProxyBinding2", 2, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding2Name"));
       int dummyConfigs = fixUpContainerConfigurations(jbossMetaData);
@@ -1066,7 +1067,7 @@
       assertNull(configuration.getInstancePool());
       assertNull(configuration.getInstanceCache());
       assertNull(configuration.getPersistenceManager());
-      assertNull(configuration.getWebClassLoader());
+      assertEquals("org.jboss.web.WebClassLoader", configuration.getWebClassLoader());
       assertNull(configuration.getLockingPolicy());
       assertNull(configuration.getSecurityDomain());
       assertFalse(configuration.isCallLogging());
@@ -1266,7 +1267,7 @@
       assertNotNull(binding);
       assertId(prefix, binding);
       assertDescriptions(prefix, binding.getDescriptions());
-      assertEquals(prefix + "Name", binding.getInvokerProxyBindingName());
+      assertEquals("invokerProxyBinding"+count+"Name", binding.getInvokerProxyBindingName());
       assertEquals(prefix + "JndiName", binding.getJndiName());
       // TODO LAST ejb-ref - needs a seperate test
    }
@@ -1351,7 +1352,7 @@
    protected void assertSecurityRole(String prefix, int count, SecurityRoleMetaData securityRoleMetaData)
    {
       super.assertSecurityRole(prefix, count, securityRoleMetaData);
-      assertPrincipals(prefix, 2, securityRoleMetaData.getPrincipals());
+      assertPrincipals(prefix, count, 2, securityRoleMetaData.getPrincipals());
    }
 
 /*   @Override

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-16 06:20:36 UTC (rev 66152)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java	2007-10-16 06:21:10 UTC (rev 66153)
@@ -205,7 +205,7 @@
       assertNotNull(securityRoleMetaData);
       assertId(prefix+count, securityRoleMetaData);
       assertDescriptions(prefix+count, securityRoleMetaData.getDescriptions());
-      assertEquals("securityRoleRef"+count+"RoleLink", securityRoleMetaData.getRoleName());
+      assertEquals("securityRole"+count+"RoleName", securityRoleMetaData.getRoleName());
    }
 
    /**
@@ -214,13 +214,14 @@
     * @param size
     * @param principals
     */
-   protected void assertPrincipals(String prefix, int size, Set<String> principals)
+   protected void assertPrincipals(String prefix, int count, int size, Set<String> principals)
    {
       assertNotNull(principals);
       assertEquals(size, principals.size());
-      for(int count = 1; count <= principals.size(); ++count)
+      for(int n = 1; n <= principals.size(); ++n)
       {
-         assertTrue(principals.contains(prefix + "Principal" + count));
+         String principal = prefix + count + "Principal" + n;
+         assertTrue(principal, principals.contains(principal));
       }
    }