[jboss-cvs] JBossAS SVN: r63531 - projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf.

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

Author: kabir.khan at jboss.com
Date: 2007-06-14 11:58:30 -0400 (Thu, 14 Jun 2007)
New Revision: 63531

Modified:
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/BeforeAfterThrowingFinallyVersusAroundTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/POJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/SimpleAspect.java
Log:
Improve test, the checks were wrong

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/BeforeAfterThrowingFinallyVersusAroundTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/BeforeAfterThrowingFinallyVersusAroundTestCase.java	2007-06-14 14:16:45 UTC (rev 63530)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/BeforeAfterThrowingFinallyVersusAroundTestCase.java	2007-06-14 15:58:30 UTC (rev 63531)
@@ -45,6 +45,7 @@
 
    public void testAroundWithNoExceptionScenario() throws Exception
    {
+      SimpleAspect.reset();
       POJO pojo = new POJO();
       pojo.methodWithAroundNoExceptions();
       assertTrue(SimpleAspect.before);
@@ -66,6 +67,7 @@
 
    public void testBeforeAfterThrowingFinallyWithNoExceptionScenario() throws Exception
    {
+      SimpleAspect.reset();
       POJO pojo = new POJO();
       pojo.methodWithBeforeAfter();
       assertTrue(SimpleAspect.before);
@@ -86,15 +88,12 @@
 
    public void testAroundWithExceptionScenario() throws Exception
    {
+      SimpleAspect.reset();
       boolean exception = false;
       try
       {
          POJO pojo = new POJO();
          pojo.methodWithAroundExceptions();
-         assertTrue(SimpleAspect.before);
-         assertFalse(SimpleAspect.after);
-         assertTrue(SimpleAspect.throwing);
-         assertTrue(SimpleAspect.finaly);
       }
       catch (Exception e)
       {
@@ -102,6 +101,11 @@
       }
       
       assertTrue(exception);
+      assertTrue(SimpleAspect.before);
+      assertFalse(SimpleAspect.after);
+      assertTrue(SimpleAspect.throwing);
+      assertTrue(SimpleAspect.finaly);
+
       getRunner().executeScenario(new AroundWithExceptionsScenario());
    }
    
@@ -124,15 +128,12 @@
 
    public void testBeforeAfterThrowingFinallyWithExceptionScenario() throws Exception
    {
+      SimpleAspect.reset();
       boolean exception = false;
       try
       {
          POJO pojo = new POJO();
          pojo.methodWithBeforeThrowingFinally();
-         assertTrue(SimpleAspect.before);
-         assertFalse(SimpleAspect.after);
-         assertTrue(SimpleAspect.throwing);
-         assertTrue(SimpleAspect.finaly);
       }
       catch (Exception e)
       {
@@ -140,6 +141,11 @@
       }
       
       assertTrue(exception);
+      assertTrue(SimpleAspect.before);
+      assertFalse(SimpleAspect.after);
+      assertTrue(SimpleAspect.throwing);
+      assertTrue(SimpleAspect.finaly);
+
       getRunner().executeScenario(new BeforeAfterThrowingFinallyWithExceptionScenario());
    }
    

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/POJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/POJO.java	2007-06-14 14:16:45 UTC (rev 63530)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/POJO.java	2007-06-14 15:58:30 UTC (rev 63531)
@@ -28,8 +28,20 @@
  */
 public class POJO
 {
-   public void methodWithAroundNoExceptions() {}
-   public void methodWithBeforeAfter() {}
-   public void methodWithAroundExceptions(){throw new RuntimeException();}
-   public void methodWithBeforeThrowingFinally(){throw new RuntimeException();}
+   public void methodWithAroundNoExceptions() 
+   {
+      
+   }
+   public void methodWithBeforeAfter() 
+   {
+      
+   }
+   public void methodWithAroundExceptions()
+   {
+      throw new RuntimeException();
+   }
+   public void methodWithBeforeThrowingFinally()
+   {
+      throw new RuntimeException();
+   }
 }

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/SimpleAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/SimpleAspect.java	2007-06-14 14:16:45 UTC (rev 63530)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/SimpleAspect.java	2007-06-14 15:58:30 UTC (rev 63531)
@@ -86,7 +86,7 @@
       finaly = true;
    }
    
-   public void reset()
+   public static void reset()
    {
       before = false;
       after = false;