[jboss-cvs] JBossAS SVN: r83737 - in projects/aop: trunk/aop/src/test/java/org/jboss/test/aop/classloader and 1 other directories.

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

Author: flavia.rainone at jboss.com
Date: 2009-01-31 22:43:26 -0500 (Sat, 31 Jan 2009)
New Revision: 83737

Modified:
   projects/aop/branches/Branch_2_0/aop/build-tests-jdk50.xml
   projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCL.java
   projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java
   projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/scenario/POJO.java
   projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/scenario/POJOInterceptor.java
Log:
[JBAOP-582] Tests that reproduce the scenario described.

Modified: projects/aop/branches/Branch_2_0/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/branches/Branch_2_0/aop/build-tests-jdk50.xml	2009-02-01 02:16:12 UTC (rev 83736)
+++ projects/aop/branches/Branch_2_0/aop/build-tests-jdk50.xml	2009-02-01 03:43:26 UTC (rev 83737)
@@ -203,6 +203,10 @@
       <jar destfile="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"
         basedir="${build.tests.classes}" includes="org/jboss/test/aop/jdk15/dynamic/common/scenario/**"/>
       <delete dir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario"/>
+      <jar destfile="${build.tests.classes}/org/jboss/test/aop/classloader/scenario.jar"
+        basedir="${build.tests.classes}" includes="org/jboss/test/aop/classloader/scenario/**"/> 
+      <delete dir="${build.tests.classes}/org/jboss/test/aop/classloader/scenario"/>
+
    </target>
 
    <!-- ================================================================== -->
@@ -313,6 +317,12 @@
          <param name="caller" value="javaagent-tests"/>
       </antcall>
 
+      <antcall target="_run-javaagent-test" inheritRefs="true">
+         <param name="test" value="classloader"/>
+         <param name="no.xml" value="true"/>
+         <param name="caller" value="javaagent-tests"/>
+      </antcall>
+
       <!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
       <antcall target="_base-jdk50-tests" inheritRefs="true">
          <param name="caller" value="javaagent-tests"/>
@@ -376,6 +386,11 @@
          <param name="no.xml" value="true"/>
          <param name="use.annotations" value="true"/>
       </antcall>
+      <antcall target="_run-javaagent-test" inheritRefs="true">
+         <param name="test" value="classloader"/>
+         <param name="caller" value="javaagent-genadvisor-tests"/>
+         <param name="no.xml" value="true"/>
+      </antcall>
       <!-- Only run this with loadtime weaving -->
       <antcall target="_run-javaagent-test" inheritRefs="true">
          <param name="test" value="annotationproperty"/>

Modified: projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCL.java
===================================================================
--- projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCL.java	2009-02-01 02:16:12 UTC (rev 83736)
+++ projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCL.java	2009-02-01 03:43:26 UTC (rev 83737)
@@ -69,7 +69,7 @@
       return null;
    }
    
-   @Override
+   @Override 
    public Class<?> loadClass(String name) throws ClassNotFoundException
    {
       return super.loadClass(name);

Modified: projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java	2009-02-01 02:16:12 UTC (rev 83736)
+++ projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java	2009-02-01 03:43:26 UTC (rev 83737)
@@ -45,7 +45,7 @@
    private final static String POJO_CLASS = USER_DEFINED_PACKAGE + ".POJO";
    private final static String INTERCEPTOR_CLASS = USER_DEFINED_PACKAGE +
       ".POJOInterceptor";
-   private final static String SCENARIO_TO_LOAD =
+   private final static String SCENARIO_TO_LOAD = 
          "/target/test-classes/org/jboss/test/aop/classloader/scenario.jar";
    
    public UserDefinedCLTestCase(String name)

Modified: projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/scenario/POJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/scenario/POJO.java	2009-02-01 02:16:12 UTC (rev 83736)
+++ projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/scenario/POJO.java	2009-02-01 03:43:26 UTC (rev 83737)
@@ -30,6 +30,6 @@
 {
    public void execute()
    {
-      System.out.println("Executing...");
+      System.out.println("Executing..");
    }
 }

Modified: projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/scenario/POJOInterceptor.java
===================================================================
--- projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/scenario/POJOInterceptor.java	2009-02-01 02:16:12 UTC (rev 83736)
+++ projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/scenario/POJOInterceptor.java	2009-02-01 03:43:26 UTC (rev 83737)
@@ -31,7 +31,7 @@
  */
 public class POJOInterceptor implements Interceptor
 {
-   private static boolean invoked = false; 
+   private static boolean invoked = false;
 
    public static boolean getInvoked()
    {