[jboss-cvs] JBossAS SVN: r60673 - in projects/aop/trunk/aop: src/resources/test/args and 1 other directory.

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

Author: flavia.rainone at jboss.com
Date: 2007-02-19 15:59:40 -0500 (Mon, 19 Feb 2007)
New Revision: 60673

Modified:
   projects/aop/trunk/aop/build-tests-jdk50.xml
   projects/aop/trunk/aop/src/resources/test/args/jboss-aop.xml
Log:
[JBAOP-352] A few adjustments to ArgumentsTestCase

Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml	2007-02-19 20:56:34 UTC (rev 60672)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml	2007-02-19 20:59:40 UTC (rev 60673)
@@ -1191,6 +1191,14 @@
       </antcall>
 
    </target>
+   
+   <target name="jrockit-test" depends="compile-test-classes" if="JROCKIT_API_AVAILABLE">
+         <antcall target="_run-jrockit-test" inheritRefs="true">
+            <param name="test" value="${test}"/>
+            <param name="caller" value="jrockit-tests"/>
+            <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
+         </antcall>
+   </target>
 
    <!-- ==================================================================================== -->
    <!-- GENERATED ADVISOR JROCKIT TESTS (JDK 5.0)                                           -->
@@ -1274,6 +1282,9 @@
                <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase -->
                <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/>
                <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/>
+               <!-- This test won't work with JRockit, due to the limit on stack trace
+                   length, which breaks cflow functionality on this test case -->
+               <exclude name="org/jboss/test/aop/args/ArgumentsTestCase.class"/>
             </fileset>
          </batchtest>
       </junit>
@@ -1365,4 +1376,4 @@
       </junitreport>
    </target>
 
-</project>
+</project>
\ No newline at end of file

Modified: projects/aop/trunk/aop/src/resources/test/args/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/args/jboss-aop.xml	2007-02-19 20:56:34 UTC (rev 60672)
+++ projects/aop/trunk/aop/src/resources/test/args/jboss-aop.xml	2007-02-19 20:59:40 UTC (rev 60673)
@@ -18,7 +18,7 @@
    <cflow-stack name="ArgumentsPOJO1_method">
       <called expr="* org.jboss.test.aop.args.ArgumentsPOJO1->*(..)"/>
    </cflow-stack>
-  
+
    <bind pointcut="all(org.jboss.test.aop.args.ArgumentsPOJO1)">
 		<stack-ref name="getAndChange"/>
    </bind>
@@ -52,19 +52,19 @@
    <bind pointcut="all(org.jboss.test.aop.args.ArgumentsPOJO2)">
       <stack-ref name="set"/>
    </bind>
-   
+
    <bind pointcut="call(org.jboss.test.aop.args.CalledPOJO->new(..))" cflow="(ArgumentsPOJO2_constructor OR ArgumentsPOJO2_method)">
       <stack-ref name="set"/>
    </bind>
 
-	<bind pointcut="call(* org.jboss.test.aop.args.CalledPOJO->*(..))" cflow="(ArgumentsPOJO2_constructor OR ArgumentsPOJO2_method)">
+   <bind pointcut="call(* org.jboss.test.aop.args.CalledPOJO->*(..))" cflow="(ArgumentsPOJO2_constructor OR ArgumentsPOJO2_method)">
       <stack-ref name="set"/>
    </bind>
 
 	<bind pointcut="call(static * org.jboss.test.aop.args.CalledPOJO->*(int))" cflow="(ArgumentsPOJO2_constructor OR ArgumentsPOJO2_method)">
       <advice name="getAndChangeArgumentsAdvice" aspect="org.jboss.test.aop.args.ArgumentsAspect"/>
    </bind>
-      
+
    <!-- @Arg test -->
    <aspect class="org.jboss.test.aop.args.ArgAspect" scope="PER_VM"/>