[jboss-cvs] JBossAS SVN: r67322 - in projects/metadata/trunk/src/test: resources/org/jboss/test/metadata/ejb and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2007-11-21 02:32:23 -0500 (Wed, 21 Nov 2007)
New Revision: 67322

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml
Log:
Test multiple interceptor-bindings for the same ejb-name

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-11-21 06:39:06 UTC (rev 67321)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java	2007-11-21 07:32:23 UTC (rev 67322)
@@ -367,7 +367,7 @@
    private AssemblyDescriptorMetaData assertAssemblyDescriptor(EjbJar3xMetaData ejbJarMetaData)
    {
       AssemblyDescriptorMetaData assemblyDescriptorMetaData = super.assertAssemblyDescriptor(ejbJarMetaData);
-      assertInterceptorBindings(2, assemblyDescriptorMetaData.getInterceptorBindings());
+      assertInterceptorBindings(3, assemblyDescriptorMetaData.getInterceptorBindings());
       assertApplicationExceptions(2, assemblyDescriptorMetaData.getApplicationExceptions());
       return assemblyDescriptorMetaData;
    }
@@ -399,7 +399,8 @@
       {
          assertId("interceptorBinding" + count, interceptorBindingMetaData);
          assertDescriptions("interceptorBinding" + count, interceptorBindingMetaData.getDescriptions());
-         assertEquals("interceptorBinding" + count + "EjbName", interceptorBindingMetaData.getEjbName());
+         assertTrue(interceptorBindingMetaData.getEjbName().startsWith("interceptorBinding"));
+         assertTrue(interceptorBindingMetaData.getEjbName().endsWith("EjbName"));
          if (count == 1)
          {
             assertInterceptorClasses("interceptorBinding" + count, 2, interceptorBindingMetaData.getInterceptorClasses());
@@ -407,14 +408,23 @@
             assertTrue(interceptorBindingMetaData.isExcludeClassInterceptors());
             assertFalse(interceptorBindingMetaData.isTotalOrdering());
          }
-         else
+         else if(count == 2)
          {
             assertInterceptorOrder("interceptorBinding" + count, 2, interceptorBindingMetaData.getInterceptorOrder());
             assertFalse(interceptorBindingMetaData.isExcludeDefaultInterceptors());
             assertFalse(interceptorBindingMetaData.isExcludeClassInterceptors());
             assertTrue(interceptorBindingMetaData.isTotalOrdering());
          }
-         assertNamedMethod("interceptorBinding" + count + "Method", 2, interceptorBindingMetaData.getMethod());
+         else
+         {
+            // A second interceptor binding for ejb2 without a method specification
+            assertInterceptorClasses("interceptorBinding" + count, 2, interceptorBindingMetaData.getInterceptorClasses());
+            assertFalse(interceptorBindingMetaData.isExcludeDefaultInterceptors());
+            assertTrue(interceptorBindingMetaData.isExcludeClassInterceptors());
+            assertFalse(interceptorBindingMetaData.isTotalOrdering());            
+         }
+         if(count <= 2)
+            assertNamedMethod("interceptorBinding" + count + "Method", 2, interceptorBindingMetaData.getMethod());
          ++count;
       }
    }

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml	2007-11-21 06:39:06 UTC (rev 67321)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml	2007-11-21 07:32:23 UTC (rev 67322)
@@ -5340,6 +5340,16 @@
             </method-params>
          </method>
       </interceptor-binding>
+      <interceptor-binding id="interceptorBinding3-id">
+         <description>en-interceptorBinding3-desc</description>
+         <description xml:lang="fr">fr-interceptorBinding3-desc</description>
+         <description xml:lang="de">de-interceptorBinding3-desc</description>
+         <ejb-name>interceptorBinding2EjbName</ejb-name>
+         <interceptor-class>interceptorBinding3Class1</interceptor-class>
+         <interceptor-class>interceptorBinding3Class2</interceptor-class>
+         <exclude-default-interceptors>false</exclude-default-interceptors>
+         <exclude-class-interceptors>true</exclude-class-interceptors>
+      </interceptor-binding>
 
       <message-destination id="messageDestination1-id">
          <description>en-messageDestination1-desc</description>