[jboss-svn-commits] JBoss Common SVN: r2593 - in jbossxb/trunk/src/test: resources/org/jboss/test/ejb/metadata/test and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 26 11:04:59 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-09-26 11:04:58 -0400 (Wed, 26 Sep 2007)
New Revision: 2593
Modified:
jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java
jbossxb/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/JBoss5xEverything_testEverything.xml
Log:
Add validation of the invoker binding proxy factory config
Modified: jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java 2007-09-26 14:57:12 UTC (rev 2592)
+++ jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java 2007-09-26 15:04:58 UTC (rev 2593)
@@ -75,6 +75,8 @@
//import org.jboss.metadata.SessionMetaData;
import org.jboss.test.ejb.AbstractEJBEverythingTest;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
/**
@@ -133,7 +135,8 @@
assertResourceManager("resourceManager2", false, jbossMetaData.getResourceManager("resourceManager2Name"));
assertInvokerProxyBindings(jbossMetaData.getInvokerProxyBindings());
assertInvokerProxyBinding("invokerProxyBinding1", 1, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding1Name"));
- assertInvokerProxyBinding("invokerProxyBinding2", 2, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding2Name"));
+ InvokerProxyBindingMetaData ipbmd2 = jbossMetaData.getInvokerProxyBinding("invokerProxyBinding2Name");
+ assertInvokerProxyBinding("invokerProxyBinding2", 2, ipbmd2);
fixUpContainerConfigurations(jbossMetaData);
assertContainerConfigurations(jbossMetaData);
@@ -151,7 +154,6 @@
//assertAssemblyDescriptor(application);
//assertEquals("resourceManager1JndiName", application.getResourceByName("resourceManager1Name"));
//assertEquals("resourceManager2URL", application.getResourceByName("resourceManager2Name"));
- //assertInvokerProxyBindings(application.getInvokerProxyBindings());
//assertInvokerProxyBinding("invokerProxyBinding1", application.getInvokerProxyBindingMetaDataByName("invokerProxyBinding1Name"));
//assertInvokerProxyBinding("invokerProxyBinding2", application.getInvokerProxyBindingMetaDataByName("invokerProxyBinding2Name"));
//assertContainerConfigurations(application);
@@ -1169,9 +1171,52 @@
assertEquals(prefix + "Name", binding.getInvokerProxyBindingName());
assertEquals(prefix + "InvokerMBean", binding.getInvokerMBean());
assertEquals(prefix + "ProxyFactory", binding.getProxyFactory());
- // TODO DOM invoker-proxy-config
+ // The DOM invoker-proxy-config
+ Element config = binding.getProxyFactoryConfig();
+ if (config == null)
+ return;
+ if (config.getElementsByTagName("client-interceptors").getLength() > 0)
+ assertInvokerProxyBindingPFCClientInterceptor(prefix, count, config);
}
-
+ private void assertInvokerProxyBindingPFCClientInterceptor(String prefix, int count, Element config)
+ {
+ NodeList ci = config.getElementsByTagName("client-interceptors");
+ assertEquals("client-interceptors count is 1", 1, ci.getLength());
+ Element cis = (Element) ci.item(0);
+ NodeList home = cis.getElementsByTagName("home");
+ Element homeE = (Element) home.item(0);
+ NodeList homeInterceptors = homeE.getElementsByTagName("interceptor");
+ assertEquals("home count is 4", 4, homeInterceptors.getLength());
+ for(int n = 0; n < homeInterceptors.getLength(); n ++)
+ {
+ Element interceptor = (Element) homeInterceptors.item(n);
+ String callByValue = interceptor.getAttribute("call-by-value");
+ String text = interceptor.getTextContent();
+ String expected;
+ if (callByValue.length() == 0)
+ expected = "org.jboss.proxy.ejb.HomeInterceptor"+(n+1)+"."+count;
+ else
+ expected = "org.jboss.proxy.ejb.HomeInterceptor"+(Boolean.valueOf(callByValue)?"cbvt" : "cbvf")+(n+1)+"."+count;
+ assertEquals(expected, text);
+ }
+ NodeList bean = cis.getElementsByTagName("bean");
+ Element beanE = (Element) bean.item(0);
+ NodeList beanInterceptors = beanE.getElementsByTagName("interceptor");
+ assertEquals("bean count is 4", 4, beanInterceptors.getLength());
+ for(int n = 0; n < beanInterceptors.getLength(); n ++)
+ {
+ Element interceptor = (Element) beanInterceptors.item(n);
+ String callByValue = interceptor.getAttribute("call-by-value");
+ String text = interceptor.getTextContent();
+ String expected;
+ if (callByValue.length() == 0)
+ expected = "org.jboss.proxy.ejb.BeanInterceptor"+(n+1)+"."+count;
+ else
+ expected = "org.jboss.proxy.ejb.BeanInterceptor"+(Boolean.valueOf(callByValue)?"cbvt" : "cbvf")+(n+1)+"."+count;
+ assertEquals(expected, text);
+ }
+ }
+
/* private void assertInvokerProxyBindings(Iterator<org.jboss.metadata.InvokerProxyBindingMetaData> bindings)
{
assertNotNull(bindings);
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/JBoss5xEverything_testEverything.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/JBoss5xEverything_testEverything.xml 2007-09-26 14:57:12 UTC (rev 2592)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/JBoss5xEverything_testEverything.xml 2007-09-26 15:04:58 UTC (rev 2593)
@@ -2704,25 +2704,22 @@
<proxy-factory-config>
<client-interceptors>
<home>
- <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor1.2</interceptor>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor2.2</interceptor>
+ <interceptor call-by-value="false">org.jboss.proxy.ejb.HomeInterceptorcbvf3.2</interceptor>
+ <interceptor call-by-value="true">org.jboss.proxy.ejb.HomeInterceptorcbvt4.2</interceptor>
</home>
<bean>
- <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.BeanInterceptor1.2</interceptor>
+ <interceptor>org.jboss.proxy.ejb.BeanInterceptor2.2</interceptor>
+ <interceptor call-by-value="false">org.jboss.proxy.ejb.BeanInterceptorcbvf3.2</interceptor>
+ <interceptor call-by-value="true">org.jboss.proxy.ejb.BeanInterceptorcbvt4.2</interceptor>
</bean>
<list-entity>
- <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
- <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.EntityInterceptor1.2</interceptor>
+ <interceptor>org.jboss.proxy.ejb.EntityInterceptor2.2</interceptor>
+ <interceptor call-by-value="false">org.jboss.proxy.ejb.EntityInterceptorcbvf3.2</interceptor>
+ <interceptor call-by-value="true">org.jboss.proxy.ejb.EntityInterceptorcbvt4.2</interceptor>
</list-entity>
</client-interceptors>
</proxy-factory-config>
More information about the jboss-svn-commits
mailing list