[jboss-cvs] JBossAS SVN: r59696 - in projects/aop/trunk/aop: src/main/org/jboss/aop and 2 other directories.

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

Author: kabir.khan at jboss.com
Date: 2007-01-17 11:16:43 -0500 (Wed, 17 Jan 2007)
New Revision: 59696

Modified:
   projects/aop/trunk/aop/build-tests-jdk50.xml
   projects/aop/trunk/aop/build.xml
   projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/container/ContainerTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/methodoverloading/Driver.java
Log:
[JBAOP-340] Chain overriding for ClassContainer, add tests to testsuite run

Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml	2007-01-17 16:11:41 UTC (rev 59695)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml	2007-01-17 16:16:43 UTC (rev 59696)
@@ -673,6 +673,7 @@
 
       <junit printsummary="yes" fork="no" haltonfailure="no" >
          <sysproperty key="jboss.aop.debug.classes" value="false"/>
+         <sysproperty key="jboss.aop.path" value="${source.res}/test/container/jboss-aop.xml"/>
          <classpath>
             <path refid="javac.classpath"/>
             <pathelement location="${build.tests.classes}"/>
@@ -693,8 +694,19 @@
       		   <include name="org/jboss/test/aop/bridgemethodnotwoven/BridgeMethodTestCase.class"/>
 		      </fileset>
 		   </batchtest>
-
       </junit>
+	   <junit printsummary="yes" fork="yes" haltonfailure="no">
+		   <sysproperty key="jboss.aop.path" value="${source.res}/test/container/jboss-aop.xml"/>
+		   <classpath>
+		      <path refid="javac.classpath"/>
+		      <pathelement location="${build.tests.classes}"/>
+		      <pathelement location="docs"/>
+		   </classpath>
+		   <sysproperty key="jboss-junit-configuration" value="jdk50"/>
+		   <formatter type="plain" extension="-jdk50.txt"/>
+		   <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-jdk50.xml"/>
+	      <test todir="${build.reports}" name="org.jboss.test.aop.container.ContainerTestCase"/>
+	   </junit>
    </target>
 
    <!-- ==================================================================================== -->

Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml	2007-01-17 16:11:41 UTC (rev 59695)
+++ projects/aop/trunk/aop/build.xml	2007-01-17 16:16:43 UTC (rev 59696)
@@ -379,6 +379,7 @@
             <include name="org/jboss/lang/**"/>
             <include name="org/jboss/aop/Advisor.class"/>
             <include name="org/jboss/aop/AspectManager.class"/>
+            <include name="org/jboss/aop/AspectManager$*.class"/>
             <include name="org/jboss/aop/ClassAdvisor.class"/>
             <include name="org/jboss/aop/ClassInstanceAdvisor.class"/>
             <include name="org/jboss/aop/InstanceAdvisorDelegate.class"/>

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java	2007-01-17 16:11:41 UTC (rev 59695)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java	2007-01-17 16:16:43 UTC (rev 59696)
@@ -227,7 +227,7 @@
       {
          for (int i = 0; i < constructors.length; i++)
          {
-            constructors[i].setAccessible(true);
+            SecurityActions.setAccessible(constructors[i]);
          }
          Arrays.sort(constructors, ConstructorComparator.INSTANCE);
       }

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/container/ContainerTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/container/ContainerTestCase.java	2007-01-17 16:11:41 UTC (rev 59695)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/container/ContainerTestCase.java	2007-01-17 16:16:43 UTC (rev 59696)
@@ -72,8 +72,7 @@
    public void invokeContainer(boolean overriding) throws Throwable
    {
          AspectManager manager = AspectManager.instance();
-         ClassContainer container = new ClassContainer("X", manager);
-         container.setChainOverridingForInheritedMethods(overriding);
+         ClassContainer container = (overriding ) ? new ContainerWithChainOverriding("X", manager) : new ClassContainer("X", manager);
          container.setClass(Child.class);
          container.initializeClassContainer();
          Child child = new Child();
@@ -100,5 +99,14 @@
       invocation.setArguments(new Object[0]);
       return invocation;
    }
+   
+   static class ContainerWithChainOverriding extends ClassContainer
+   {
+      public ContainerWithChainOverriding(String name, AspectManager manager)
+      {
+         super(name, manager);
+         super.setChainOverridingForInheritedMethods(true);
+      }
+   }
 }
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/methodoverloading/Driver.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/methodoverloading/Driver.java	2007-01-17 16:11:41 UTC (rev 59695)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/methodoverloading/Driver.java	2007-01-17 16:16:43 UTC (rev 59696)
@@ -35,18 +35,4 @@
       System.out.println("--- in driverMethod(); ---");
    }
    
-   public static void main(String[] args)
-   {
-      Driver d = new Driver();
-      d.superMethod();
-      d.driverMethod();
-      
-      if (Driver.superMethodIntercepted && Driver.driverMethodIntercepted)
-         System.out.println("Passed!");
-      if (!Driver.superMethodIntercepted)
-         System.out.println("FAILED: superMethod wasn't intercepted");
-      if (!Driver.driverMethodIntercepted)
-         System.out.println("FAILED: driverMethod wasn't intercepted");
-   }
-
 }