[jboss-cvs] JBossAS SVN: r63675 - in projects/aop/trunk/aop/src: resources/test/stress/batf and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2007-06-27 11:11:50 -0400 (Wed, 27 Jun 2007)
New Revision: 63675

Modified:
   projects/aop/trunk/aop/src/resources/test/stress/batf/jboss-aop.xml
   projects/aop/trunk/aop/src/resources/test/stress/config.properties
   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/NotWoven.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:
Some more stress tests for lightweight vs around

Modified: projects/aop/trunk/aop/src/resources/test/stress/batf/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/stress/batf/jboss-aop.xml	2007-06-27 14:56:25 UTC (rev 63674)
+++ projects/aop/trunk/aop/src/resources/test/stress/batf/jboss-aop.xml	2007-06-27 15:11:50 UTC (rev 63675)
@@ -20,6 +20,14 @@
 	   <throwing aspect="org.jboss.test.aop.stress.batf.SimpleAspect" name="throwing"/>
 	   <finally aspect="org.jboss.test.aop.stress.batf.SimpleAspect" name="finaly"/>
    </bind>
+
+   <bind pointcut="execution(* org.jboss.test.aop.stress.batf.POJO->methodWithSimulatedBefore())">
+	   <around aspect="org.jboss.test.aop.stress.batf.SimpleAspect" name="methodWithSimulatedBefore"/>
+   </bind>
    
+   <bind pointcut="execution(* org.jboss.test.aop.stress.batf.POJO->methodWithOnlyBefore())">
+	   <before aspect="org.jboss.test.aop.stress.batf.SimpleAspect" name="before"/>
+   </bind>
+   
 </aop>
 

Modified: projects/aop/trunk/aop/src/resources/test/stress/config.properties
===================================================================
--- projects/aop/trunk/aop/src/resources/test/stress/config.properties	2007-06-27 14:56:25 UTC (rev 63674)
+++ projects/aop/trunk/aop/src/resources/test/stress/config.properties	2007-06-27 15:11:50 UTC (rev 63675)
@@ -1,4 +1,4 @@
-warmup=1000000
+warmup=5000000
 loops=10000000
 threads=1
 random_sleep_interval=false

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-27 14:56:25 UTC (rev 63674)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/BeforeAfterThrowingFinallyVersusAroundTestCase.java	2007-06-27 15:11:50 UTC (rev 63675)
@@ -165,6 +165,49 @@
       }
    }
 
+   public void testAroundSimulatedBefore() throws Exception
+   {
+      SimpleAspect.reset();
+      POJO pojo = new POJO();
+      pojo.methodWithSimulatedBefore();
+      assertTrue(SimpleAspect.before);
+      assertFalse(SimpleAspect.after);
+      assertFalse(SimpleAspect.throwing);
+      assertFalse(SimpleAspect.finaly);
+
+      getRunner().executeScenario(new AroundSimulatedBeforeScenario());
+   }
+   
+   private class AroundSimulatedBeforeScenario extends AbstractScenario
+   {
+      POJO pojo = new POJO();
+      public void execute(int thread, int loop) throws Exception
+      {
+         pojo.methodWithSimulatedBefore();
+      }
+   }
+   
+   public void testBeforeOnly() throws Exception
+   {
+      SimpleAspect.reset();
+      POJO pojo = new POJO();
+      pojo.methodWithOnlyBefore();
+      assertTrue(SimpleAspect.before);
+      assertFalse(SimpleAspect.after);
+      assertFalse(SimpleAspect.throwing);
+      assertFalse(SimpleAspect.finaly);
+
+      getRunner().executeScenario(new BeforeOnlyScenario());
+   }
+   
+   private class BeforeOnlyScenario extends AbstractScenario
+   {
+      POJO pojo = new POJO();
+      public void execute(int thread, int loop) throws Exception
+      {
+         pojo.methodWithOnlyBefore();
+      }
+   }
    public void testNotWovenNoCtorScenario() throws Exception
    {
       getRunner().executeScenario(new NotWovenNoCtorScenario());

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/NotWoven.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/NotWoven.java	2007-06-27 14:56:25 UTC (rev 63674)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/NotWoven.java	2007-06-27 15:11:50 UTC (rev 63675)
@@ -28,7 +28,7 @@
  */
 public class NotWoven
 {
-   boolean b;
+   private int counter;
    public NotWoven()
    {
       
@@ -36,11 +36,11 @@
    
    public void method1()
    {
-      b = true;
+      counter++;
    }
    
    public void method2()
    {
-      b = true;
+      counter++;
    }   
 }

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-27 14:56:25 UTC (rev 63674)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/POJO.java	2007-06-27 15:11:50 UTC (rev 63675)
@@ -21,6 +21,8 @@
 */ 
 package org.jboss.test.aop.stress.batf;
 
+import org.jboss.aop.joinpoint.Invocation;
+
 /**
  * 
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
@@ -48,4 +50,14 @@
       counter++;
       throw new RuntimeException();
    }
+   
+   public void methodWithSimulatedBefore()
+   {
+      counter++;
+   }
+   
+   public void methodWithOnlyBefore()
+   {
+      counter++;
+   }
 }

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-27 14:56:25 UTC (rev 63674)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/batf/SimpleAspect.java	2007-06-27 15:11:50 UTC (rev 63675)
@@ -67,6 +67,12 @@
       }
    }
    
+   public Object methodWithSimulatedBefore(Invocation inv) throws Throwable
+   {
+      before = true;
+      return inv.invokeNext();
+   }
+   
    public void before()
    {
       before = true;