timers and improved signature pattern matching

diff --git a/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java b/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java
index d72b058b07abe489ee6435c9d23918ba6c5b66fb..5703a9824194a1fb581302c145f8856fe1d3d438 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java
@@ -18,6 +18,15 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc167Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+       public void testTimers_1() {
+               runTest("timers - 1");
+       }
+
+       // Test harness parse of -Xset:a=b,c=d will see c=d as a second option
+       // public void testTimers_2() {
+       // runTest("timers - 2");
+       // }
+
        public void testAnnoMatching_pr293203() {
                runTest("anno matching");
        }

diff --git a/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml b/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml
index 2c8bcd05a940e45fc42221fe88e0e9b27d4de309..a645b57945d105863c815f4694478dd2b40f3c9d 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml
+++ b/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml
@@ -2,6 +2,44 @@
 
 <suite>
 
+  <ajc-test dir="features167/timers/one" title="timers - 1">
+    <compile files="Code.java Code2.java" outjar="code.jar" options="-1.5 -Xlint:ignore"/>
+    <compile files="Asp.java" options="-1.5 -Xlint:ignore" outjar="asp.jar"/>
+    <run class="Code2" ltw="aop.xml" classpath="code.jar;asp.jar">
+      <stderr>
+        <line text="info AspectJ"/>
+        <line text="info register"/>
+        <line text="info using"/>
+        <line text="info register"/>
+        <line text="info processing"/>
+        <line text="info Pointcut fast"/>
+        <line text="info Time"/>
+        <line text="info ---"/>
+        <line text="info Pointcut match"/>
+        <line text="info Time"/>
+        <line text="info ---"/>
+      </stderr>
+    </run>
+  </ajc-test>
+  
+  <ajc-test dir="features167/timers/one" title="timers - 2">
+    <compile files="Code.java Code2.java Asp.java" options="-1.5 -timers -Xset:timersPerJoinpoint=8,timersPerFastMatchCall=3">
+<!--        <line text="info AspectJ"/>
+        <line text="info register"/>
+        <line text="info using"/>
+        <line text="info register"/>
+        <line text="info processing"/>
+        <line text="info Pointcut fast"/>
+        <line text="info Time"/>
+        <line text="info -"/>
+        <line text="info Pointcut match"/>
+        <line text="info Time"/>
+        <line text="info -"/>
+        -->
+        </compile>
+  </ajc-test>
+
+
   <ajc-test dir="bugs167/pr293510" title="execution fastmatch - 1">
      <compile files="CaseOne.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'method-execution(void pkg.C.m())' in Type 'pkg.C' (CaseOne.java:10) advised by before advice from 'pkg.X' (CaseOne.java:14)"/>