promoted test 147841 to 153tests

diff --git a/tests/bugs152/pr147841/A.java b/tests/bugs152/pr147841/A.java
deleted file mode 100644 (file)
index 7159184..0000000
--- a/tests/bugs152/pr147841/A.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package pkg;
-
-public aspect A {
-
-        before() : execution(* pack.C.method1()) && this(pack.C) {
-                System.err.println("before exec method1 and this is C");
-        }
-
-        before() : call(* pack.C.method2()) && target(pack.C) {
-                System.err.println("before call to method2 and target is C");
-        }
-}

diff --git a/tests/bugs152/pr147841/C.java b/tests/bugs152/pr147841/C.java
deleted file mode 100644 (file)
index 3b6b490..0000000
--- a/tests/bugs152/pr147841/C.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package pack;
-
-public class C {
-
-        public C() {
-        }
-
-        public void method1() {
-                new C().method2();
-        }
-
-        public void method2() {
-        }
-
-        public static void main(String[] args) {
-                new C().method1();
-        }
-
-}

diff --git a/tests/bugs153/pr147841/A.java b/tests/bugs153/pr147841/A.java
new file mode 100644 (file)
index 0000000..7159184
--- /dev/null
+++ b/tests/bugs153/pr147841/A.java
@@ -0,0 +1,12 @@
+package pkg;
+
+public aspect A {
+
+        before() : execution(* pack.C.method1()) && this(pack.C) {
+                System.err.println("before exec method1 and this is C");
+        }
+
+        before() : call(* pack.C.method2()) && target(pack.C) {
+                System.err.println("before call to method2 and target is C");
+        }
+}

diff --git a/tests/bugs153/pr147841/C.java b/tests/bugs153/pr147841/C.java
new file mode 100644 (file)
index 0000000..3b6b490
--- /dev/null
+++ b/tests/bugs153/pr147841/C.java
@@ -0,0 +1,19 @@
+package pack;
+
+public class C {
+
+        public C() {
+        }
+
+        public void method1() {
+                new C().method2();
+        }
+
+        public void method2() {
+        }
+
+        public static void main(String[] args) {
+                new C().method1();
+        }
+
+}

diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
index 69ca72beb82b7c2953eb3f7032bc708af3eb4aee..fb56374e4dfc67674c5350a8299a099d9d73d4b0 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
@@ -36,7 +36,6 @@ public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 //  public void testBrokenIfArgsCflowAtAj_pr145018() { runTest("ataj crashing with cflow, if and args");}
 //  public void testItdCallingGenericMethod_pr145391() { runTest("itd calling generic method");}
 //  public void testItdCallingGenericMethod_pr145391_2() { runTest("itd calling generic method - 2");}
-//  public void testAdviceNotWovenAspectPath_pr147841() { runTest("advice not woven on aspectpath");}
 //  public void testClassCastForInvalidAnnotationValue_pr148537() { runTest("classcast annotation value");}
        
        

diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
index bdd47d991458a6856b8267b702bbf2f548e8ba50..0c40980708b587266574eb3a95e7a0fbacfe0043 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
+++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
@@ -77,23 +77,8 @@
        </stderr>
      </run>
     </ajc-test>
-    
-    <ajc-test dir="bugs152/pr147841" title="advice not woven on aspectpath">
-      <compile files="A.java" options="-Xlint:ignore" outjar="apath.jar"/>
-      <!--compile files="C.java" outjar="cpa.jar" classpath="cpath.jar"/-->
-      <compile files="C.java" options="-showWeaveInfo" aspectpath="apath.jar">
-        <message kind="weave" text="foo"/>
-      </compile>
-      <run class="C">
-        <stderr>
-          <line text="foo"/>
-        </stderr>
-      </run>
-    </ajc-test>    
-    
-
-
-       <ajc-test dir="bugs152/pr145391" title="itd calling generic method">
+ 
+       <ajc-test dir="bugs152/pr145391" title="itd calling generic method">
      <compile files="GenericType.java" options="-1.5"/>
      <run class="GenericType"/>
     </ajc-test>