[jboss-cvs] JBossAS SVN: r70760 - projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/supermethod/unit.

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

Author: wolfc
Date: 2008-03-12 06:27:34 -0400 (Wed, 12 Mar 2008)
New Revision: 70760

Modified:
   projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/supermethod/unit/SuperMethodTestCase.java
Log:
EJBTHREE-1214: workaround for full test run

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-03-12 09:07:48 UTC (rev 70759)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/supermethod/unit/SuperMethodTestCase.java	2008-03-12 10:27:34 UTC (rev 70760)
@@ -22,9 +22,11 @@
 package org.jboss.ejb3.test.interceptors.supermethod.unit;
 
 import java.net.URL;
+import java.util.LinkedHashMap;
 
 import junit.framework.TestCase;
 
+import org.jboss.aop.AspectManager;
 import org.jboss.aop.AspectXmlLoader;
 import org.jboss.ejb3.interceptors.proxy.ProxyContainer;
 import org.jboss.ejb3.test.interceptors.supermethod.AroundInvokeBean;
@@ -48,6 +50,15 @@
    {
       //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);
+      }
+      
       // Bootstrap AOP
       URL url = Thread.currentThread().getContextClassLoader().getResource("supermethod/jboss-aop.xml");
       log.info("deploying AOP from " + url);