Author: kabir.khan at jboss.com
Date: 2008-10-06 06:39:45 -0400 (Mon, 06 Oct 2008)
New Revision: 79137
Modified:
trunk/aspects/src/test50/org/jboss/test/aop/test/AOPTestSetup.java
trunk/aspects/src/test50/org/jboss/test/asynch/AsynchTestCase.java
Log:
[JBAS-5974] This test relies on base-aspects.xml being deployed
Modified: trunk/aspects/src/test50/org/jboss/test/aop/test/AOPTestSetup.java
===================================================================
--- trunk/aspects/src/test50/org/jboss/test/aop/test/AOPTestSetup.java 2008-10-06 10:38:38 UTC (rev 79136)
+++ trunk/aspects/src/test50/org/jboss/test/aop/test/AOPTestSetup.java 2008-10-06 10:39:45 UTC (rev 79137)
@@ -38,6 +38,8 @@
public static String ASPECT_MANAGER_NAME = "jboss.aop:service=AspectManager";
private String jar;
+
+ private boolean useBaseAspects;
// Create an initializer for the test suite
public AOPTestSetup(TestSuite suite, String jar) throws Exception
@@ -45,11 +47,23 @@
super(suite);
this.jar = jar;
}
+
+ public void setUseBaseAspects(boolean use)
+ {
+ this.useBaseAspects = use;
+ }
protected void setUp() throws Exception
{
super.setUp();
ObjectName aspectManager = new ObjectName(ASPECT_MANAGER_NAME);
+
+ if (useBaseAspects)
+ {
+ Attribute useBaseXml = new Attribute("UseBaseXml", Boolean.TRUE);
+ getServer().setAttribute(aspectManager, useBaseXml);
+ }
+
Attribute enableTransformer = new Attribute("EnableTransformer", Boolean.TRUE);
getServer().setAttribute(aspectManager, enableTransformer);
try
@@ -85,6 +99,13 @@
ObjectName aspectManager = new ObjectName(ASPECT_MANAGER_NAME);
Attribute enableTransformer = new Attribute("EnableTransformer", Boolean.FALSE);
getServer().setAttribute(aspectManager, enableTransformer);
+
+ if (useBaseAspects)
+ {
+ Attribute useBaseXml = new Attribute("UseBaseXml", Boolean.FALSE);
+ getServer().setAttribute(aspectManager, useBaseXml);
+ }
+
if( undeployException != null )
throw undeployException;
super.tearDown();
Modified: trunk/aspects/src/test50/org/jboss/test/asynch/AsynchTestCase.java
===================================================================
--- trunk/aspects/src/test50/org/jboss/test/asynch/AsynchTestCase.java 2008-10-06 10:38:38 UTC (rev 79136)
+++ trunk/aspects/src/test50/org/jboss/test/asynch/AsynchTestCase.java 2008-10-06 10:39:45 UTC (rev 79137)
@@ -96,6 +96,7 @@
suite.addTest(new TestSuite(AsynchTestCase.class));
AOPTestSetup setup = new AOPTestSetup(suite, "asynch-test.sar");
+ setup.setUseBaseAspects(true);
return setup;
}