[jboss-cvs] JBossAS SVN: r72166 - in projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors: direct/unit and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 14 07:35:26 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-04-14 07:35:25 -0400 (Mon, 14 Apr 2008)
New Revision: 72166
Modified:
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/additive/unit/AdditiveTestCase.java
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/direct/unit/DirectTestCase.java
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/ejbthree1215/unit/ContextGetMethodTestCase.java
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/instances/unit/InterceptorInstancesTestCase.java
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/lifecycle/unit/CallbackMethodDescriptorTestCase.java
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/metadata/unit/MetadataTestCase.java
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/order/unit/InterceptorChainTestCase.java
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/proxy/unit/ProxyTestCase.java
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/signature/unit/SignatureTestCase.java
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/supermethod/unit/SuperMethodTestCase.java
Log:
[EJBTHREE-1274] Move AOPDeployer.deploy() and undeploy() into setup() and tearDown()
Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/additive/unit/AdditiveTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/additive/unit/AdditiveTestCase.java 2008-04-14 11:34:28 UTC (rev 72165)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/additive/unit/AdditiveTestCase.java 2008-04-14 11:35:25 UTC (rev 72166)
@@ -27,7 +27,6 @@
import junit.framework.TestCase;
-import org.jboss.aop.AspectManager;
import org.jboss.ejb3.interceptors.container.BeanContext;
import org.jboss.ejb3.interceptors.direct.AbstractDirectContainer;
import org.jboss.ejb3.interceptors.metadata.AdditiveBeanInterceptorMetaDataBridge;
@@ -112,6 +111,22 @@
};
}
+
+ // FIXME: use the right jboss-aop.xml
+ AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.info(deployer.deploy());
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ log.info(deployer.undeploy());
+ }
+
public void test() throws Throwable
{
log.info("======= Additive.test()");
@@ -120,43 +135,32 @@
// To make surefire happy
Thread.currentThread().setContextClassLoader(MySessionBean.class.getClassLoader());
- // Bootstrap AOP
- // FIXME: use the right jboss-aop.xml
- AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
- try
- {
- log.info(deployer.deploy());
+ // Bootstrap metadata
+ UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
+ Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+ URL url = Thread.currentThread().getContextClassLoader().getResource("additive/META-INF/ejb-jar.xml");
+ assertNotNull("no ejb-jar.xml", url);
+ EjbJar30MetaData metaData = (EjbJar30MetaData) unmarshaller.unmarshal(url.toString(), schemaResolverForClass(EjbJar30MetaData.class));
+ JBoss50MetaData jbossMetaData = new JBoss50MetaData();
+ jbossMetaData.merge(null, metaData);
+
+ JBossEnterpriseBeanMetaData beanMetaData = jbossMetaData.getEnterpriseBean("MySessionBean");
+ assertNotNull(beanMetaData);
+
+ MyContainer<MySessionBean> container = new MyContainer<MySessionBean>("MySessionBean", "Test", MySessionBean.class, beanMetaData);
+
+ BeanContext<MySessionBean> bean = container.construct();
+
+ List<Class<?>> visits = new ArrayList<Class<?>>();
+ container.invoke(bean, "doIt", visits);
+
+ List<Class<?>> expected = new ArrayList<Class<?>>();
+ expected.add(MyInterceptor.class);
+ expected.add(XMLInterceptor.class);
+ expected.add(MySessionBean.class);
+
+ assertEquals(expected, visits);
- // Bootstrap metadata
- UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
- Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
- URL url = Thread.currentThread().getContextClassLoader().getResource("additive/META-INF/ejb-jar.xml");
- assertNotNull("no ejb-jar.xml", url);
- EjbJar30MetaData metaData = (EjbJar30MetaData) unmarshaller.unmarshal(url.toString(), schemaResolverForClass(EjbJar30MetaData.class));
- JBoss50MetaData jbossMetaData = new JBoss50MetaData();
- jbossMetaData.merge(null, metaData);
-
- JBossEnterpriseBeanMetaData beanMetaData = jbossMetaData.getEnterpriseBean("MySessionBean");
- assertNotNull(beanMetaData);
-
- MyContainer<MySessionBean> container = new MyContainer<MySessionBean>("MySessionBean", "Test", MySessionBean.class, beanMetaData);
-
- BeanContext<MySessionBean> bean = container.construct();
-
- List<Class<?>> visits = new ArrayList<Class<?>>();
- container.invoke(bean, "doIt", visits);
-
- List<Class<?>> expected = new ArrayList<Class<?>>();
- expected.add(MyInterceptor.class);
- expected.add(XMLInterceptor.class);
- expected.add(MySessionBean.class);
-
- assertEquals(expected, visits);
- }
- finally
- {
- log.info(deployer.undeploy());
- }
log.info("======= Done");
}
}
Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/direct/unit/DirectTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/direct/unit/DirectTestCase.java 2008-04-14 11:34:28 UTC (rev 72165)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/direct/unit/DirectTestCase.java 2008-04-14 11:35:25 UTC (rev 72166)
@@ -25,7 +25,6 @@
import junit.framework.TestCase;
-import org.jboss.aop.AspectManager;
import org.jboss.ejb3.interceptors.container.BeanContext;
import org.jboss.ejb3.interceptors.container.ManagedObjectAdvisor;
import org.jboss.ejb3.interceptors.direct.DirectContainer;
@@ -62,6 +61,21 @@
}
}
+ // FIXME: use the right jboss-aop.xml
+ AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.info(deployer.deploy());
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ log.info(deployer.undeploy());
+ }
+
public void test() throws Throwable
{
log.info("======= Direct.test()");
@@ -70,48 +84,38 @@
// To make surefire happy
Thread.currentThread().setContextClassLoader(DirectBean.class.getClassLoader());
- AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
- try
- {
- // Bootstrap AOP
- // FIXME: use the right jboss-aop.xml
- log.info(deployer.deploy());
-
- assertEquals(0, DirectInterceptor.postConstructs);
-
- MyContainer<DirectBean> container = new MyContainer<DirectBean>("DirectBean", "Test", DirectBean.class);
- container.testAdvisor();
-
- BeanContext<DirectBean> bean = container.construct();
-
- assertEquals("DirectInterceptor postConstruct must have been called once", 1, DirectInterceptor.postConstructs);
- assertEquals("DirectBean postConstruct must have been called once", 1, DirectBean.postConstructs);
-
- System.out.println(bean.getClass() + " " + bean.getClass().getClassLoader());
- System.out.println(" " + Arrays.toString(bean.getClass().getInterfaces()));
- String result = container.invoke(bean, "sayHi", "Test");
- System.out.println(result);
-
- assertEquals("sayHi didn't invoke DirectInterceptor.aroundInvoke once", 1, DirectInterceptor.aroundInvokes);
- assertEquals("sayHi didn't invoke DirectBean.aroundInvoke once", 1, DirectBean.aroundInvokes);
-
- container.invoke(bean, "intercept");
- assertEquals("intercept didn't invoke DirectMethodInterceptor.aroundInvoke", 1, DirectMethodInterceptor.aroundInvokes);
- container.invoke(bean, "intercept");
- assertEquals("intercept didn't invoke DirectMethodInterceptor.aroundInvoke", 2, DirectMethodInterceptor.aroundInvokes);
-
- assertEquals("intercept didn't invoke DirectInterceptor.aroundInvoke", 3, DirectInterceptor.aroundInvokes);
- assertEquals("DirectInterceptor postConstruct must have been called once", 1, DirectInterceptor.postConstructs);
- // 12.7 footnote 57
- assertEquals("DirectMethodInterceptor.postConstruct must not have been called (12.7 footnote 57)", 0, DirectMethodInterceptor.postConstructs);
-
- //((Destructable) bean)._preDestroy();
- bean = null;
- }
- finally
- {
- log.info(deployer.undeploy());
- }
+ log.info(deployer.deploy());
+
+ assertEquals(0, DirectInterceptor.postConstructs);
+
+ MyContainer<DirectBean> container = new MyContainer<DirectBean>("DirectBean", "Test", DirectBean.class);
+ container.testAdvisor();
+
+ BeanContext<DirectBean> bean = container.construct();
+
+ assertEquals("DirectInterceptor postConstruct must have been called once", 1, DirectInterceptor.postConstructs);
+ assertEquals("DirectBean postConstruct must have been called once", 1, DirectBean.postConstructs);
+
+ System.out.println(bean.getClass() + " " + bean.getClass().getClassLoader());
+ System.out.println(" " + Arrays.toString(bean.getClass().getInterfaces()));
+ String result = container.invoke(bean, "sayHi", "Test");
+ System.out.println(result);
+
+ assertEquals("sayHi didn't invoke DirectInterceptor.aroundInvoke once", 1, DirectInterceptor.aroundInvokes);
+ assertEquals("sayHi didn't invoke DirectBean.aroundInvoke once", 1, DirectBean.aroundInvokes);
+
+ container.invoke(bean, "intercept");
+ assertEquals("intercept didn't invoke DirectMethodInterceptor.aroundInvoke", 1, DirectMethodInterceptor.aroundInvokes);
+ container.invoke(bean, "intercept");
+ assertEquals("intercept didn't invoke DirectMethodInterceptor.aroundInvoke", 2, DirectMethodInterceptor.aroundInvokes);
+
+ assertEquals("intercept didn't invoke DirectInterceptor.aroundInvoke", 3, DirectInterceptor.aroundInvokes);
+ assertEquals("DirectInterceptor postConstruct must have been called once", 1, DirectInterceptor.postConstructs);
+ // 12.7 footnote 57
+ assertEquals("DirectMethodInterceptor.postConstruct must not have been called (12.7 footnote 57)", 0, DirectMethodInterceptor.postConstructs);
+
+ //((Destructable) bean)._preDestroy();
+ bean = null;
log.info("======= Done");
}
}
Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/ejbthree1215/unit/ContextGetMethodTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/ejbthree1215/unit/ContextGetMethodTestCase.java 2008-04-14 11:34:28 UTC (rev 72165)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/ejbthree1215/unit/ContextGetMethodTestCase.java 2008-04-14 11:35:25 UTC (rev 72166)
@@ -42,45 +42,36 @@
{
private static final Logger log = Logger.getLogger(ContextGetMethodTestCase.class);
+ // FIXME: use the right jboss-aop.xml
+ AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.info(deployer.deploy());
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ log.info(deployer.undeploy());
+ }
+
public void test1() throws Throwable
{
log.info("======= ContextGetMethod.test1()");
- //AspectManager.verbose = true;
+ Thread.currentThread().setContextClassLoader(Hello.class.getClassLoader());
-// // TODO: During inventory surefire boots up BasicTestSuite
-// LinkedHashMap pointcuts = AspectManager.instance().getPointcuts();
-// if(!pointcuts.isEmpty())
-// {
-// //System.err.println("AspectManager still contains: " + pointcuts);
-// URL url = Thread.currentThread().getContextClassLoader().getResource("basic/jboss-aop.xml");
-// AspectXmlLoader.undeployXML(url);
-// }
-
+ ProxyContainer<HelloBean> container = new ProxyContainer<HelloBean>("ContextGetMethodTestCase", "InterceptorContainer", HelloBean.class);
- AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
- try
- {
- // Bootstrap AOP
- // FIXME: use the right jboss-aop.xml
- log.info(deployer.deploy());
-
- Thread.currentThread().setContextClassLoader(Hello.class.getClassLoader());
-
- ProxyContainer<HelloBean> container = new ProxyContainer<HelloBean>("ContextGetMethodTestCase", "InterceptorContainer", HelloBean.class);
-
- Class<?> interfaces[] = { Hello.class };
- Hello proxy = container.constructProxy(interfaces);
-
- String name = new Date().toString();
- String result = proxy.sayHiTo(name);
-
- assertEquals(1, GetMethodInterceptor.invocations);
- assertEquals("Hi " + name, result);
- }
- finally
- {
- log.info(deployer.undeploy());
- }
+ Class<?> interfaces[] = { Hello.class };
+ Hello proxy = container.constructProxy(interfaces);
+
+ String name = new Date().toString();
+ String result = proxy.sayHiTo(name);
+
+ assertEquals(1, GetMethodInterceptor.invocations);
+ assertEquals("Hi " + name, result);
log.info("======= Done");
}
}
Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/instances/unit/InterceptorInstancesTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/instances/unit/InterceptorInstancesTestCase.java 2008-04-14 11:34:28 UTC (rev 72165)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/instances/unit/InterceptorInstancesTestCase.java 2008-04-14 11:35:25 UTC (rev 72166)
@@ -42,39 +42,42 @@
{
private static final Logger log = Logger.getLogger(InterceptorInstancesTestCase.class);
+ // FIXME: use the right jboss-aop.xml
+ AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.info(deployer.deploy());
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ log.info(deployer.undeploy());
+ }
+
public void test1() throws Throwable
{
log.info("======= InterceptorInstances.test1()");
- //AspectManager.verbose = true;
+
+ Thread.currentThread().setContextClassLoader(StatefulInterceptorInterface.class.getClassLoader());
- AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
- try
- {
- // Bootstrap AOP
- // FIXME: use the right jboss-aop.xml
- log.info(deployer.deploy());
-
- Thread.currentThread().setContextClassLoader(StatefulInterceptorInterface.class.getClassLoader());
-
- ProxyContainer<SimpleBean> container = new ProxyContainer<SimpleBean>("InterceptorInstancesTestCase", "InterceptorContainer", SimpleBean.class);
-
- assertEquals(0, StatefulInterceptor.postConstructs);
-
- StatefulInterceptorInterface bean1 = container.constructProxy(new Class[] { StatefulInterceptorInterface.class });
- StatefulInterceptorInterface bean2 = container.constructProxy(new Class[] { StatefulInterceptorInterface.class });
-
- bean1.setState(1);
- bean2.setState(2);
-
- assertEquals(1, bean1.getState());
- assertEquals(2, bean2.getState());
-
- assertEquals(2, StatefulInterceptor.postConstructs);
- }
- finally
- {
- log.info(deployer.undeploy());
- }
+ ProxyContainer<SimpleBean> container = new ProxyContainer<SimpleBean>("InterceptorInstancesTestCase", "InterceptorContainer", SimpleBean.class);
+
+ assertEquals(0, StatefulInterceptor.postConstructs);
+
+ StatefulInterceptorInterface bean1 = container.constructProxy(new Class[] { StatefulInterceptorInterface.class });
+ StatefulInterceptorInterface bean2 = container.constructProxy(new Class[] { StatefulInterceptorInterface.class });
+
+ bean1.setState(1);
+ bean2.setState(2);
+
+ assertEquals(1, bean1.getState());
+ assertEquals(2, bean2.getState());
+
+ assertEquals(2, StatefulInterceptor.postConstructs);
+
log.info("======= Done");
}
}
Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/lifecycle/unit/CallbackMethodDescriptorTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/lifecycle/unit/CallbackMethodDescriptorTestCase.java 2008-04-14 11:34:28 UTC (rev 72165)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/lifecycle/unit/CallbackMethodDescriptorTestCase.java 2008-04-14 11:35:25 UTC (rev 72166)
@@ -27,7 +27,6 @@
import junit.framework.TestCase;
-import org.jboss.aop.AspectManager;
import org.jboss.ejb3.interceptors.container.BeanContext;
import org.jboss.ejb3.interceptors.direct.AbstractDirectContainer;
import org.jboss.ejb3.interceptors.metadata.BeanInterceptorMetaDataBridge;
@@ -102,6 +101,21 @@
};
}
+ // FIXME: use the right jboss-aop.xml
+ AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.info(deployer.deploy());
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ log.info(deployer.undeploy());
+ }
+
public void test() throws Throwable
{
log.info("======= CallbackMethodDescriptor.test()");
@@ -110,41 +124,31 @@
// To make surefire happy
Thread.currentThread().setContextClassLoader(MetadataBean.class.getClassLoader());
- AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
- try
- {
- // Bootstrap AOP
- // FIXME: use the right jboss-aop.xml
- log.info(deployer.deploy());
-
- // Bootstrap metadata
- UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
- Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
- URL url = Thread.currentThread().getContextClassLoader().getResource("lifecycle/META-INF/ejb-jar.xml");
- EjbJar30MetaData metaData = (EjbJar30MetaData) unmarshaller.unmarshal(url.toString(), schemaResolverForClass(EjbJar30MetaData.class));
- JBoss50MetaData jbossMetaData = new JBoss50MetaData();
- jbossMetaData.merge(null, metaData);
-
- JBossEnterpriseBeanMetaData beanMetaData = jbossMetaData.getEnterpriseBean("SessionBeanCallbackBean");
- assertNotNull(beanMetaData);
-
- assertEquals(0, SessionBeanCallbackBean.postConstructs);
-
- MyContainer<SessionBeanCallbackBean> container = new MyContainer<SessionBeanCallbackBean>("SessionBeanCallbackBean", "Test", SessionBeanCallbackBean.class, beanMetaData);
-
- BeanContext<SessionBeanCallbackBean> bean = container.construct();
-
- assertEquals("SessionBeanCallbackBean ejbCreate must have been called once", 1, SessionBeanCallbackBean.postConstructs);
-
- container.destroy(bean);
- assertEquals(1, SessionBeanCallbackBean.preDestroys);
-
- bean = null;
- }
- finally
- {
- log.info(deployer.undeploy());
- }
+
+ // Bootstrap metadata
+ UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
+ Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+ URL url = Thread.currentThread().getContextClassLoader().getResource("lifecycle/META-INF/ejb-jar.xml");
+ EjbJar30MetaData metaData = (EjbJar30MetaData) unmarshaller.unmarshal(url.toString(), schemaResolverForClass(EjbJar30MetaData.class));
+ JBoss50MetaData jbossMetaData = new JBoss50MetaData();
+ jbossMetaData.merge(null, metaData);
+
+ JBossEnterpriseBeanMetaData beanMetaData = jbossMetaData.getEnterpriseBean("SessionBeanCallbackBean");
+ assertNotNull(beanMetaData);
+
+ assertEquals(0, SessionBeanCallbackBean.postConstructs);
+
+ MyContainer<SessionBeanCallbackBean> container = new MyContainer<SessionBeanCallbackBean>("SessionBeanCallbackBean", "Test", SessionBeanCallbackBean.class, beanMetaData);
+
+ BeanContext<SessionBeanCallbackBean> bean = container.construct();
+
+ assertEquals("SessionBeanCallbackBean ejbCreate must have been called once", 1, SessionBeanCallbackBean.postConstructs);
+
+ container.destroy(bean);
+ assertEquals(1, SessionBeanCallbackBean.preDestroys);
+
+ bean = null;
+
log.info("======= Done");
}
}
Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/metadata/unit/MetadataTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/metadata/unit/MetadataTestCase.java 2008-04-14 11:34:28 UTC (rev 72165)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/metadata/unit/MetadataTestCase.java 2008-04-14 11:35:25 UTC (rev 72166)
@@ -29,6 +29,7 @@
import junit.framework.TestCase;
import org.jboss.aop.AspectManager;
+import org.jboss.aop.AspectXmlLoader;
import org.jboss.ejb3.interceptors.container.BeanContext;
import org.jboss.ejb3.interceptors.direct.AbstractDirectContainer;
import org.jboss.ejb3.interceptors.metadata.BeanInterceptorMetaDataBridge;
@@ -39,6 +40,7 @@
import org.jboss.ejb3.test.interceptors.common.AOPDeployer;
import org.jboss.ejb3.test.interceptors.common.CommonInterceptor;
import org.jboss.ejb3.test.interceptors.direct.DirectMethodInterceptor;
+import org.jboss.ejb3.test.interceptors.metadata.InterceptorOrderBean;
import org.jboss.ejb3.test.interceptors.metadata.MetadataBean;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
@@ -114,68 +116,117 @@
};
}
+ // FIXME: use the right jboss-aop.xml
+ AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.info(deployer.deploy());
+ CommonInterceptor.aroundInvokes = 0;
+ CommonInterceptor.postConstructs = 0;
+ CommonInterceptor.preDestroys = 0;
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ log.info(deployer.undeploy());
+ }
+
public void test() throws Throwable
{
log.info("======= MetaData.test()");
-// AspectManager.verbose = true;
+ AspectManager.verbose = true;
// To make surefire happy
Thread.currentThread().setContextClassLoader(MetadataBean.class.getClassLoader());
- AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
- try
- {
- // Bootstrap AOP
- // FIXME: use the right jboss-aop.xml
- log.info(deployer.deploy());
-
- // Bootstrap metadata
- UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
- Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
- URL url = Thread.currentThread().getContextClassLoader().getResource("metadata/META-INF/ejb-jar.xml");
- EjbJar30MetaData metaData = (EjbJar30MetaData) unmarshaller.unmarshal(url.toString(), schemaResolverForClass(EjbJar30MetaData.class));
- JBoss50MetaData jbossMetaData = new JBoss50MetaData();
- jbossMetaData.merge(null, metaData);
-
- JBossEnterpriseBeanMetaData beanMetaData = jbossMetaData.getEnterpriseBean("MetadataBean");
- assertNotNull(beanMetaData);
-
- assertEquals(0, CommonInterceptor.postConstructs);
-
- MyContainer<MetadataBean> container = new MyContainer<MetadataBean>("MetadataBean", "Test", MetadataBean.class, beanMetaData);
- container.testAdvisor();
-
- BeanContext<MetadataBean> bean = container.construct();
-
- assertEquals("CommonInterceptor postConstruct must have been called once", 1, CommonInterceptor.postConstructs);
-
- System.out.println(bean.getClass() + " " + bean.getClass().getClassLoader());
- System.out.println(" " + Arrays.toString(bean.getClass().getInterfaces()));
- String result = container.invoke(bean, "sayHi", "Test");
- System.out.println(result);
-
- assertEquals("sayHi didn't invoke CommonInterceptor.aroundInvoke once", 1, CommonInterceptor.aroundInvokes);
- assertEquals("sayHi didn't invoke MetadataBean.aroundInvoke once", 1, MetadataBean.aroundInvokes);
-
- container.invoke(bean, "intercept");
- assertEquals("intercept didn't invoke DirectMethodInterceptor.aroundInvoke", 1, DirectMethodInterceptor.aroundInvokes);
- container.invoke(bean, "intercept");
- assertEquals("intercept didn't invoke DirectMethodInterceptor.aroundInvoke", 2, DirectMethodInterceptor.aroundInvokes);
-
- assertEquals("intercept didn't invoke CommonInterceptor.aroundInvoke", 3, CommonInterceptor.aroundInvokes);
- assertEquals("CommonInterceptor postConstruct must have been called once", 1, CommonInterceptor.postConstructs);
- // 12.7 footnote 57
- assertEquals("DirectMethodInterceptor.postConstruct must not have been called", 0, DirectMethodInterceptor.postConstructs);
-
- container.destroy(bean);
- assertEquals(1, CommonInterceptor.preDestroys);
-
- bean = null;
- }
- finally
- {
- log.info(deployer.undeploy());
- }
+ // Bootstrap metadata
+ UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
+ Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+ URL url = Thread.currentThread().getContextClassLoader().getResource("metadata/META-INF/ejb-jar.xml");
+ EjbJar30MetaData metaData = (EjbJar30MetaData) unmarshaller.unmarshal(url.toString(), schemaResolverForClass(EjbJar30MetaData.class));
+ JBoss50MetaData jbossMetaData = new JBoss50MetaData();
+ jbossMetaData.merge(null, metaData);
+
+ JBossEnterpriseBeanMetaData beanMetaData = jbossMetaData.getEnterpriseBean("MetadataBean");
+ assertNotNull(beanMetaData);
+
+ assertEquals(0, CommonInterceptor.postConstructs);
+
+ MyContainer<MetadataBean> container = new MyContainer<MetadataBean>("MetadataBean", "Test", MetadataBean.class, beanMetaData);
+ container.testAdvisor();
+
+ BeanContext<MetadataBean> bean = container.construct();
+
+ assertEquals("CommonInterceptor postConstruct must have been called once", 1, CommonInterceptor.postConstructs);
+
+ System.out.println(bean.getClass() + " " + bean.getClass().getClassLoader());
+ System.out.println(" " + Arrays.toString(bean.getClass().getInterfaces()));
+ String result = container.invoke(bean, "sayHi", "Test");
+ System.out.println(result);
+
+ assertEquals("sayHi didn't invoke CommonInterceptor.aroundInvoke once", 1, CommonInterceptor.aroundInvokes);
+ assertEquals("sayHi didn't invoke MetadataBean.aroundInvoke once", 1, MetadataBean.aroundInvokes);
+
+ container.invoke(bean, "intercept");
+ assertEquals("intercept didn't invoke DirectMethodInterceptor.aroundInvoke", 1, DirectMethodInterceptor.aroundInvokes);
+ container.invoke(bean, "intercept");
+ assertEquals("intercept didn't invoke DirectMethodInterceptor.aroundInvoke", 2, DirectMethodInterceptor.aroundInvokes);
+
+ assertEquals("intercept didn't invoke CommonInterceptor.aroundInvoke", 3, CommonInterceptor.aroundInvokes);
+ assertEquals("CommonInterceptor postConstruct must have been called once", 1, CommonInterceptor.postConstructs);
+ // 12.7 footnote 57
+ assertEquals("DirectMethodInterceptor.postConstruct must not have been called", 0, DirectMethodInterceptor.postConstructs);
+
+ container.destroy(bean);
+ assertEquals(1, CommonInterceptor.preDestroys);
+
+ bean = null;
log.info("======= Done");
}
+
+ public void testInterceptorOrder() throws Throwable
+ {
+ log.info("======= MetaData.testInterceptorOrder()");
+ // To make surefire happy
+ Thread.currentThread().setContextClassLoader(MetadataBean.class.getClassLoader());
+
+ // Bootstrap metadata
+ UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
+ Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+ URL url = Thread.currentThread().getContextClassLoader().getResource("metadata/META-INF/ejb-jar.xml");
+ EjbJar30MetaData metaData = (EjbJar30MetaData) unmarshaller.unmarshal(url.toString(), schemaResolverForClass(EjbJar30MetaData.class));
+ JBoss50MetaData jbossMetaData = new JBoss50MetaData();
+ jbossMetaData.merge(null, metaData);
+
+ JBossEnterpriseBeanMetaData beanMetaData = jbossMetaData.getEnterpriseBean("InterceptorOrderBean");
+ assertNotNull(beanMetaData);
+
+ assertEquals(0, CommonInterceptor.postConstructs);
+
+ MyContainer<InterceptorOrderBean> container = new MyContainer<InterceptorOrderBean>("InterceptorOrderBean", "Test", InterceptorOrderBean.class, beanMetaData);
+ container.testAdvisor();
+
+ BeanContext<InterceptorOrderBean> bean = container.construct();
+
+ assertEquals("CommonInterceptor postConstruct must have been called once", 1, CommonInterceptor.postConstructs);
+
+ System.out.println(bean.getClass() + " " + bean.getClass().getClassLoader());
+ System.out.println(" " + Arrays.toString(bean.getClass().getInterfaces()));
+ String result = container.invoke(bean, "sayHi", "Test");
+ System.out.println(result);
+
+ assertEquals("sayHi didn't invoke CommonInterceptor.aroundInvoke once", 1, CommonInterceptor.aroundInvokes);
+
+ assertEquals("CommonInterceptor postConstruct must have been called once", 1, CommonInterceptor.postConstructs);
+
+ container.destroy(bean);
+ assertEquals(1, CommonInterceptor.preDestroys);
+
+ bean = null;
+ log.info("======= Done");
+
+ }
}
Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/order/unit/InterceptorChainTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/order/unit/InterceptorChainTestCase.java 2008-04-14 11:34:28 UTC (rev 72165)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/order/unit/InterceptorChainTestCase.java 2008-04-14 11:35:25 UTC (rev 72166)
@@ -37,6 +37,7 @@
import org.jboss.ejb3.interceptors.metadata.InterceptorMetaDataBridge;
import org.jboss.ejb3.metadata.MetaDataBridge;
import org.jboss.ejb3.metadata.annotation.AnnotationRepositoryToMetaData;
+import org.jboss.ejb3.test.interceptors.common.AOPDeployer;
import org.jboss.ejb3.test.interceptors.metadata.MetadataBean;
import org.jboss.ejb3.test.interceptors.order.InterceptorChainBean;
import org.jboss.logging.Logger;
@@ -113,6 +114,22 @@
};
}
+ // FIXME: use the right jboss-aop.xml
+
+ AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.info(deployer.deploy());
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ log.info(deployer.undeploy());
+ }
+
public void test() throws Throwable
{
AspectManager.verbose = true;
@@ -120,16 +137,10 @@
// To make surefire happy
Thread.currentThread().setContextClassLoader(MetadataBean.class.getClassLoader());
- // Bootstrap AOP
- // FIXME: use the right jboss-aop.xml
- URL url = Thread.currentThread().getContextClassLoader().getResource("proxy/jboss-aop.xml");
- log.info("deploying AOP from " + url);
- AspectXmlLoader.deployXML(url);
-
// Bootstrap metadata
UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
- url = Thread.currentThread().getContextClassLoader().getResource("order/META-INF/ejb-jar.xml");
+ URL url = Thread.currentThread().getContextClassLoader().getResource("order/META-INF/ejb-jar.xml");
EjbJar30MetaData metaData = (EjbJar30MetaData) unmarshaller.unmarshal(url.toString(), schemaResolverForClass(EjbJar30MetaData.class));
JBoss50MetaData jbossMetaData = new JBoss50MetaData();
jbossMetaData.merge(null, metaData);
Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/proxy/unit/ProxyTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/proxy/unit/ProxyTestCase.java 2008-04-14 11:34:28 UTC (rev 72165)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/proxy/unit/ProxyTestCase.java 2008-04-14 11:35:25 UTC (rev 72166)
@@ -40,38 +40,41 @@
{
private static final Logger log = Logger.getLogger(ProxyTestCase.class);
+ AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.info(deployer.deploy());
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ log.info(deployer.undeploy());
+ }
+
public void test1() throws Throwable
{
log.info("======= Proxy.test1()");
//AspectManager.verbose = true;
- AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
- try
- {
- // Bootstrap AOP
- log.info(deployer.deploy());
-
- Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
-
- ProxyContainer<ProxiedBean> container = new ProxyContainer<ProxiedBean>("ProxyTestCase", "InterceptorContainer", ProxiedBean.class);
-
- assertEquals(0, ProxiedInterceptor.postConstructs);
-
- Class<?> interfaces[] = { MyInterface.class };
- MyInterface proxy = container.constructProxy(interfaces);
-
- assertEquals("ProxiedInterceptor postConstruct must have been called once", 1, ProxiedInterceptor.postConstructs);
-
- String result = proxy.sayHi("Me");
- assertEquals("Hi Me", result);
-
- assertEquals("sayHi didn't invoke ProxiedInterceptor.aroundInvoke once", 1, ProxiedInterceptor.aroundInvokes);
- assertEquals("sayHi didn't invoke ProxiedBean.aroundInvoke once", 1, ProxiedBean.aroundInvokes);
- }
- finally
- {
- log.info(deployer.undeploy());
- }
+ Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
+
+ ProxyContainer<ProxiedBean> container = new ProxyContainer<ProxiedBean>("ProxyTestCase", "InterceptorContainer", ProxiedBean.class);
+
+ assertEquals(0, ProxiedInterceptor.postConstructs);
+
+ Class<?> interfaces[] = { MyInterface.class };
+ MyInterface proxy = container.constructProxy(interfaces);
+
+ assertEquals("ProxiedInterceptor postConstruct must have been called once", 1, ProxiedInterceptor.postConstructs);
+
+ String result = proxy.sayHi("Me");
+ assertEquals("Hi Me", result);
+
+ assertEquals("sayHi didn't invoke ProxiedInterceptor.aroundInvoke once", 1, ProxiedInterceptor.aroundInvokes);
+ assertEquals("sayHi didn't invoke ProxiedBean.aroundInvoke once", 1, ProxiedBean.aroundInvokes);
log.info("======= Done");
}
}
Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/signature/unit/SignatureTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/signature/unit/SignatureTestCase.java 2008-04-14 11:34:28 UTC (rev 72165)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/signature/unit/SignatureTestCase.java 2008-04-14 11:35:25 UTC (rev 72166)
@@ -52,6 +52,20 @@
return lifeCycleVisits.add(cls.getName() + "." + methodName);
}
+ AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.info(deployer.deploy());
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ log.info(deployer.undeploy());
+ }
+
public void test() throws Throwable
{
log.info("======= Signature.test()");
@@ -60,33 +74,22 @@
// To make surefire happy
Thread.currentThread().setContextClassLoader(SignatureTestBean.class.getClassLoader());
- AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
- try
- {
- // Bootstrap AOP
- // FIXME: use the right jboss-aop.xml
- log.info(deployer.deploy());
+ lifeCycleVisits.clear();
- lifeCycleVisits.clear();
-
- DirectContainer<SignatureTestBean> container = new DirectContainer<SignatureTestBean>("SignatureTestBean", "Test", SignatureTestBean.class);
-
- BeanContext<SignatureTestBean> bean = container.construct();
-
- List<String> expectedLifeCycleVisits = Arrays.asList("org.jboss.ejb3.test.interceptors.signature.PackageProtectedInterceptor.postConstruct");
- assertEquals(expectedLifeCycleVisits, lifeCycleVisits);
-
- List<Class<?>> visits = new ArrayList<Class<?>>();
- Integer numVisits = container.invoke(bean, "test", visits);
-
- assertEquals(2, numVisits.intValue());
- List<Class<?>> expectedVisits = Arrays.asList(PackageProtectedInterceptor.class, SignatureTestBean.class);
- assertEquals(expectedVisits, visits);
- }
- finally
- {
- log.info(deployer.undeploy());
- }
+ DirectContainer<SignatureTestBean> container = new DirectContainer<SignatureTestBean>("SignatureTestBean", "Test", SignatureTestBean.class);
+
+ BeanContext<SignatureTestBean> bean = container.construct();
+
+ List<String> expectedLifeCycleVisits = Arrays.asList("org.jboss.ejb3.test.interceptors.signature.PackageProtectedInterceptor.postConstruct");
+ assertEquals(expectedLifeCycleVisits, lifeCycleVisits);
+
+ List<Class<?>> visits = new ArrayList<Class<?>>();
+ Integer numVisits = container.invoke(bean, "test", visits);
+
+ assertEquals(2, numVisits.intValue());
+ List<Class<?>> expectedVisits = Arrays.asList(PackageProtectedInterceptor.class, SignatureTestBean.class);
+ assertEquals(expectedVisits, visits);
+
log.info("======= Done");
}
}
Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/supermethod/unit/SuperMethodTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/supermethod/unit/SuperMethodTestCase.java 2008-04-14 11:34:28 UTC (rev 72165)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/supermethod/unit/SuperMethodTestCase.java 2008-04-14 11:35:25 UTC (rev 72166)
@@ -42,39 +42,34 @@
{
private static final Logger log = Logger.getLogger(SuperMethodTestCase.class);
+ AOPDeployer deployer = new AOPDeployer("supermethod/jboss-aop.xml");
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.info(deployer.deploy());
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ log.info(deployer.undeploy());
+ }
+
public void test1() throws Throwable
{
log.info("======= SuperMethod.test1()");
//AspectManager.verbose = true;
-// // TODO: During inventory surefire boots up BasicTestSuite
-// LinkedHashMap pointcuts = AspectManager.instance().getPointcuts();
-// if(!pointcuts.isEmpty())
-// {
-// //System.err.println("AspectManager still contains: " + pointcuts);
-// URL url = Thread.currentThread().getContextClassLoader().getResource("basic/jboss-aop.xml");
-// AspectXmlLoader.undeployXML(url);
-// }
+ Thread.currentThread().setContextClassLoader(AroundInvokeIF.class.getClassLoader());
+
+ ProxyContainer<AroundInvokeBean> container = new ProxyContainer<AroundInvokeBean>("SuperMethodTestCase", "InterceptorContainer", AroundInvokeBean.class);
+
+ Class<?> interfaces[] = { AroundInvokeIF.class };
+ AroundInvokeIF proxy = container.constructProxy(interfaces);
+
+ proxy.afterBeginTest();
- AOPDeployer deployer = new AOPDeployer("supermethod/jboss-aop.xml");
- try
- {
- // Bootstrap AOP
- log.info(deployer.deploy());
-
- Thread.currentThread().setContextClassLoader(AroundInvokeIF.class.getClassLoader());
-
- ProxyContainer<AroundInvokeBean> container = new ProxyContainer<AroundInvokeBean>("SuperMethodTestCase", "InterceptorContainer", AroundInvokeBean.class);
-
- Class<?> interfaces[] = { AroundInvokeIF.class };
- AroundInvokeIF proxy = container.constructProxy(interfaces);
-
- proxy.afterBeginTest();
- }
- finally
- {
- log.info(deployer.undeploy());
- }
log.info("======= Done");
}
}
More information about the jboss-cvs-commits
mailing list