209051: promoted test 154>162

diff --git a/tests/bugs162/pr209051/Bug.java b/tests/bugs162/pr209051/Bug.java
new file mode 100644 (file)
index 0000000..ac1bf7b
--- /dev/null
+++ b/tests/bugs162/pr209051/Bug.java
@@ -0,0 +1,21 @@
+import org.aspectj.lang.annotation.*;
+
+public @Aspect class Bug {
+       @Pointcut("args(i) && if() && within(Foo)")
+       public static boolean pc(int i) {
+               return i < 0;
+       }
+       
+       @Before("pc(*)")
+       public void advice() { System.out.println("advice running");}
+
+  public static void main(String []argv) {
+    new Foo().trigger(-1);
+    new Foo().trigger(+1);
+  }
+}
+
+class Foo {
+  public void trigger(int i) {}
+}
+

diff --git a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
index 7d94d79661b9fb3ff89fdab88d857abb44e389ac..7908cbb8cb1a8fae2aa9587d2e5fa388ea7b490c 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
@@ -79,7 +79,6 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        public void testArgNamesDoesNotWork_pr148381_2() { runTest("argNames does not work - error1");}
        public void testArgNamesDoesNotWork_pr148381_3() { runTest("argNames does not work - error2");}
        public void testArgNamesDoesNotWork_pr148381_4() { runTest("argNames does not work - error3");}
-       //public void testAsteriskInAtPointcut_pr209051() { runTest("asterisk in at aj pointcut");}
        public void testDecpProblemWhenTargetAlreadyImplements_pr169432_1() { runTest("declare parents problem when target already implements interface - 1");}
        public void testDecpProblemWhenTargetAlreadyImplements_pr169432_2() { runTest("declare parents problem when target already implements interface - 2");}
        public void testDecpProblemWhenTargetAlreadyImplements_pr169432_3() { runTest("declare parents problem when target already implements interface - 3");}

diff --git a/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml b/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml
index 5a264299ba1498db223717de44bde1dedf74ef38..6e897fdbdd3add5a1f6a3471e6efe59926c7bcb1 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml
+++ b/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml
@@ -165,15 +165,6 @@
        <stdout/>
      </run>
    </ajc-test>
-   
-   <ajc-test dir="bugs154/pr209051" title="asterisk in at aj pointcut">
-     <compile options="-1.5" files="Bug.java"/>
-     <run class="Bug">
-       <stdout>
-         <line text="x"/>
-       </stdout>
-     </run>
-   </ajc-test>
 
    <!-- very basic with all code style, should be fine -->
    <ajc-test dir="bugs154/pr209019/case1" title="various issues with ltw and around advice - 1">

diff --git a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java
index 26678d8057fca73adc4df1888bbd4dc4e31be83c..d1c914be3f294e785abccbcb2cab7171a1979d23 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java
@@ -19,6 +19,7 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 public class Ajc162Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        
        // AspectJ1.6.2 
+//     public void testStarInAnnoStyle_pr209951() { runTest("asterisk in at aj pointcut"); }
        public void testMissingMarkers_pr197720() { runTest("missing markers on inherited annotated method"); }
        public void testLostGenericsSigOnItd_pr211146() { runTest("lost generic sig on itd"); }
        public void testLostGenericsSigOnItd_pr211146_2() { runTest("lost generic sig on itd - 2"); }

diff --git a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml
index fc6efd5aba6579cdff41d01503b3e9537b8c872d..a25c904d7c6549cd9417966d9817e101cba83373 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml
+++ b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml
@@ -3,6 +3,16 @@
 <!-- AspectJ v1.6.2 Tests -->
 <suite>
 
+
+   <ajc-test dir="bugs162/pr209051" title="asterisk in at aj pointcut">
+     <compile options="-1.5" files="Bug.java"/>
+     <run class="Bug">
+       <stdout>
+         <line text="x"/>
+       </stdout>
+     </run>
+   </ajc-test>
+
        <ajc-test dir="bugs162/pr197720" title="missing markers on inherited annotated method">
          <compile files="C1.java C2.java C3.java MyAnn.java MyAnnAspect.java" options="-1.5 -showWeaveInfo">
            <message kind="weave" text="Join point 'method-call(void test.aspects.C1.aMethod())' in Type 'test.aspects.C1' (C1.java:12) advised by around advice from 'test.aspects.MyAnnAspect' (MyAnnAspect.java:16)"/>