[jboss-cvs] JBossAS SVN: r58294 - in projects/microcontainer/trunk/aop-mc-int/src: resources/tests/org/jboss/test/microcontainer/test tests/org/jboss/test/microcontainer/support tests/org/jboss/test/microcontainer/test

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

Author: kabir.khan at jboss.com
Date: 2006-11-13 08:34:57 -0500 (Mon, 13 Nov 2006)
New Revision: 58294

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.xml
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/BeanCallingMethodInCtor.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.java
Log:
[JBAOP-306] Make test test what it shold be (ctors calling methods causes NPE when using proxies)

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.xml	2006-11-13 09:17:27 UTC (rev 58293)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.xml	2006-11-13 13:34:57 UTC (rev 58294)
@@ -6,12 +6,11 @@
       <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.support.BeanCallingMethodInCtorTestCase"/>
-
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"
                name="InterceptedAdvice"
                class="org.jboss.test.microcontainer.support.CalledInterceptor"
-               pointcut="execution(* org.jboss.test.microcontainer.support.BeanCallingMethodInCtorTestCase->*(..))">
+               pointcut="execution(* org.jboss.test.microcontainer.support.BeanCallingMethodInCtor->*(..))">
    </aop:aspect>
 
+   <bean name="Bean" class="org.jboss.test.microcontainer.support.BeanCallingMethodInCtor"/>
 </deployment>

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/BeanCallingMethodInCtor.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/BeanCallingMethodInCtor.java	2006-11-13 09:17:27 UTC (rev 58293)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/BeanCallingMethodInCtor.java	2006-11-13 13:34:57 UTC (rev 58294)
@@ -36,11 +36,11 @@
    
    public void publicMethod()
    {
-      
+      System.out.println("public");
    }
    
    private void privateMethod()
    {
-      
+      System.out.println("private");
    }
 }

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.java	2006-11-13 09:17:27 UTC (rev 58293)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.java	2006-11-13 13:34:57 UTC (rev 58294)
@@ -36,7 +36,7 @@
 {
    public static Test suite()
    {
-      return suite(InterceptedTestCase.class);
+      return suite(BeanCallingMethodInCtorTestCase.class);
    }
    
    public BeanCallingMethodInCtorTestCase(String name)