[jboss-cvs] JBossAS SVN: r69799 - in projects/aop/trunk/aop/src: test/org/jboss/test/aop/duplicatemethod and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2008-02-12 14:19:55 -0500 (Tue, 12 Feb 2008)
New Revision: 69799

Modified:
   projects/aop/trunk/aop/src/resources/test/duplicatemethod/jboss-aop.xml
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/duplicatemethod/DuplicateMethodTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/duplicatemethod/TestDupeInterceptor.java
Log:
Touch up test following changes to javassist

Modified: projects/aop/trunk/aop/src/resources/test/duplicatemethod/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/duplicatemethod/jboss-aop.xml	2008-02-12 17:07:19 UTC (rev 69798)
+++ projects/aop/trunk/aop/src/resources/test/duplicatemethod/jboss-aop.xml	2008-02-12 19:19:55 UTC (rev 69799)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <aop>
-  <bind pointcut="execution(* TestDupe*->foo())">
-    <interceptor class="TestDupeInterceptor"/>
+  <bind pointcut="execution(* $instanceof{org.jboss.test.aop.duplicatemethod.TestDupe}->foo())">
+    <interceptor class="org.jboss.test.aop.duplicatemethod.TestDupeInterceptor"/>
   </bind>
 </aop>
\ No newline at end of file

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/duplicatemethod/DuplicateMethodTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/duplicatemethod/DuplicateMethodTestCase.java	2008-02-12 17:07:19 UTC (rev 69798)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/duplicatemethod/DuplicateMethodTestCase.java	2008-02-12 19:19:55 UTC (rev 69799)
@@ -31,6 +31,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.jboss.aop.Advised;
 import org.jboss.test.aop.AOPTestWithSetup;
 
 /**
@@ -54,39 +55,11 @@
       return suite;
    }
    
-   public void testDupe()
+   public void testDupe() throws Exception
    {
+      TestDupe testDupe = new TestDupe();
+      assertTrue(testDupe instanceof Advised);
       
-      if(System.getSecurityManager() != null)
-      {
-         try 
-         {
-            AccessController.doPrivileged(new PrivilegedExceptionAction()
-            {
-               public Object run()
-               {
-                  generateProxy();
-                  return null;
-               }
-            });
-         }
-         catch (PrivilegedActionException e)
-         {
-            Exception ex = e.getException();
-            if (ex instanceof RuntimeException)
-            {
-               throw (RuntimeException)ex;
-            }
-            throw new RuntimeException(ex);
-         }
-
-      }
-      else
-         System.out.println("SystemManager == NULL");
-   }
-   
-   public void generateProxy()
-   {
       System.out.println("Generating proxy");
       ProxyFactory f = new ProxyFactory();
       f.setSuperclass(TestDupe.class);
@@ -98,20 +71,9 @@
       });
       Class c = f.createClass();
 
-      try
-      {
-         TestDupe td = (TestDupe) c.newInstance();
-         td.foo();
-      }
-      catch (InstantiationException e)
-      {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      }
-      catch (IllegalAccessException e)
-      {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      }
+      TestDupe td = (TestDupe) c.newInstance();
+      TestDupeInterceptor.invoked = false;
+      td.foo();
+      assertTrue(TestDupeInterceptor.invoked);
    }
 }

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/duplicatemethod/TestDupeInterceptor.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/duplicatemethod/TestDupeInterceptor.java	2008-02-12 17:07:19 UTC (rev 69798)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/duplicatemethod/TestDupeInterceptor.java	2008-02-12 19:19:55 UTC (rev 69799)
@@ -32,7 +32,8 @@
  */
 public class TestDupeInterceptor implements Interceptor
 {
-
+   public static boolean invoked;
+   
    public String getName()
    {
       // TODO Auto-generated method stub
@@ -41,6 +42,7 @@
 
    public Object invoke(Invocation invocation) throws Throwable
    {
+      invoked = true; 
       return invocation.invokeNext();
    }