[jboss-cvs] JBossAS SVN: r63360 - in projects/aop/trunk: aop/src/test/org/jboss/test/aop/regression/jbaop398nosuchfield and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2007-06-05 14:39:59 -0400 (Tue, 05 Jun 2007)
New Revision: 63360

Modified:
   projects/aop/trunk/aop/src/resources/test/regression/jboss-aop.xml
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop398nosuchfield/SimpleTestCase.java
   projects/aop/trunk/build/build-thirdparty.xml
Log:
[JBAOP-398] Update javassist snapshot to what will be in 3.6.0.GA and reinstantiate test

Modified: projects/aop/trunk/aop/src/resources/test/regression/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/regression/jboss-aop.xml	2007-06-05 17:50:00 UTC (rev 63359)
+++ projects/aop/trunk/aop/src/resources/test/regression/jboss-aop.xml	2007-06-05 18:39:59 UTC (rev 63360)
@@ -166,9 +166,7 @@
       <interceptor-ref name="org.jboss.test.aop.regression.jbaop336callnpe.LogInterceptor"/>
    </bind>
 
-<!-- Comment out config for test until what appears to be an error in javassist has been fixed, since it otherwise breaks the test runs
    <bind pointcut="all(org.jboss.test.aop.regression.jbaop398nosuchfield.POJO)">
      <interceptor class="org.jboss.test.aop.regression.jbaop398nosuchfield.SimpleInterceptor" scope="PER_VM" />
   </bind>
--->
 </aop>
\ No newline at end of file

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop398nosuchfield/SimpleTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop398nosuchfield/SimpleTestCase.java	2007-06-05 17:50:00 UTC (rev 63359)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop398nosuchfield/SimpleTestCase.java	2007-06-05 18:39:59 UTC (rev 63360)
@@ -48,7 +48,6 @@
 
    public void test()
    {
-      if (true) throw new RuntimeException("Weaving for this test has been disabled in regression/jboss-aop.xml, since weaving this class breaks the test run. Awaiting a fix in javassist");
       POJO pojo = new POJO();
       assertTrue(SimpleInterceptor.intercepted);
       SimpleInterceptor.intercepted = false;

Modified: projects/aop/trunk/build/build-thirdparty.xml
===================================================================
--- projects/aop/trunk/build/build-thirdparty.xml	2007-06-05 17:50:00 UTC (rev 63359)
+++ projects/aop/trunk/build/build-thirdparty.xml	2007-06-05 18:39:59 UTC (rev 63360)
@@ -45,7 +45,7 @@
       -->
       <componentref name="apache-log4j" version="1.2.14-brew"/>
       <componentref name="dom4j" version="1.6.1jboss"/>
-      <componentref name="javassist" version="3.5.0.GA"/>
+      <componentref name="javassist" version="snapshot"/>
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/common-core" version="2.2.0.snapshot"/>
       <componentref name="jboss/common-core-14" version="2.2.0.snapshot"/>