these tests are now for 1.5.4, not 1.6.0

46 files changed, 163 insertions, 0 deletions

diff --git a/tests/bugs160/pr165631/Bug.java b/tests/bugs154/pr165631/Bug.java
index e1ceb22ad..e1ceb22ad 100644
--- a/tests/bugs160/pr165631/Bug.java
+++ b/tests/bugs154/pr165631/Bug.java
diff --git a/tests/bugs160/pr165631/Bug2.java b/tests/bugs154/pr165631/Bug2.java
index 0754042e9..0754042e9 100644
--- a/tests/bugs160/pr165631/Bug2.java
+++ b/tests/bugs154/pr165631/Bug2.java
diff --git a/tests/bugs160/pr165885/Abstract.java b/tests/bugs154/pr165885/Abstract.java
index b2de830c4..b2de830c4 100644
--- a/tests/bugs160/pr165885/Abstract.java
+++ b/tests/bugs154/pr165885/Abstract.java
diff --git a/tests/bugs160/pr165885/Aspect.java b/tests/bugs154/pr165885/Aspect.java
index 127a8f271..127a8f271 100644
--- a/tests/bugs160/pr165885/Aspect.java
+++ b/tests/bugs154/pr165885/Aspect.java
diff --git a/tests/bugs160/pr165885/Concrete.java b/tests/bugs154/pr165885/Concrete.java
index 520d75a75..520d75a75 100644
--- a/tests/bugs160/pr165885/Concrete.java
+++ b/tests/bugs154/pr165885/Concrete.java
diff --git a/tests/bugs160/pr166084/Simple.java b/tests/bugs154/pr166084/Simple.java
index c5992b4ee..c5992b4ee 100644
--- a/tests/bugs160/pr166084/Simple.java
+++ b/tests/bugs154/pr166084/Simple.java
diff --git a/tests/bugs160/pr166084/X.java b/tests/bugs154/pr166084/X.java
index e60c2c397..e60c2c397 100644
--- a/tests/bugs160/pr166084/X.java
+++ b/tests/bugs154/pr166084/X.java
diff --git a/tests/bugs160/pr166084/simple.jar b/tests/bugs154/pr166084/simple.jar
index 3151ded97..3151ded97 100644
--- a/tests/bugs160/pr166084/simple.jar
+++ b/tests/bugs154/pr166084/simple.jar
diff --git a/tests/bugs160/pr168044/AbstractNode.java b/tests/bugs154/pr168044/AbstractNode.java
index bb1401fb4..bb1401fb4 100644
--- a/tests/bugs160/pr168044/AbstractNode.java
+++ b/tests/bugs154/pr168044/AbstractNode.java
diff --git a/tests/bugs160/pr168063/A.java b/tests/bugs154/pr168063/A.java
index c4831ff9d..c4831ff9d 100644
--- a/tests/bugs160/pr168063/A.java
+++ b/tests/bugs154/pr168063/A.java
diff --git a/tests/bugs160/pr169706/A.java b/tests/bugs154/pr169706/A.java
index a40ef7bcf..a40ef7bcf 100644
--- a/tests/bugs160/pr169706/A.java
+++ b/tests/bugs154/pr169706/A.java
diff --git a/tests/bugs160/pr169706/B.java b/tests/bugs154/pr169706/B.java
index 120fb1868..120fb1868 100644
--- a/tests/bugs160/pr169706/B.java
+++ b/tests/bugs154/pr169706/B.java
diff --git a/tests/bugs160/pr169706/C.java b/tests/bugs154/pr169706/C.java
index 8acb6675c..8acb6675c 100644
--- a/tests/bugs160/pr169706/C.java
+++ b/tests/bugs154/pr169706/C.java
diff --git a/tests/bugs160/pr169706/MyAnnotation.java b/tests/bugs154/pr169706/MyAnnotation.java
index 723084377..723084377 100644
--- a/tests/bugs160/pr169706/MyAnnotation.java
+++ b/tests/bugs154/pr169706/MyAnnotation.java
diff --git a/tests/bugs160/pr169706/MyAspect.java b/tests/bugs154/pr169706/MyAspect.java
index e533064db..e533064db 100644
--- a/tests/bugs160/pr169706/MyAspect.java
+++ b/tests/bugs154/pr169706/MyAspect.java
diff --git a/tests/bugs160/pr169706/Test.java b/tests/bugs154/pr169706/Test.java
index b8af6a677..b8af6a677 100644
--- a/tests/bugs160/pr169706/Test.java
+++ b/tests/bugs154/pr169706/Test.java
diff --git a/tests/bugs160/pr170467/Bug.aj b/tests/bugs154/pr170467/Bug.aj
index 4c68eda07..4c68eda07 100644
--- a/tests/bugs160/pr170467/Bug.aj
+++ b/tests/bugs154/pr170467/Bug.aj
diff --git a/tests/bugs160/pr170467/Bug2.aj b/tests/bugs154/pr170467/Bug2.aj
index 89b5121c4..89b5121c4 100644
--- a/tests/bugs160/pr170467/Bug2.aj
+++ b/tests/bugs154/pr170467/Bug2.aj
diff --git a/tests/bugs160/pr171952/Foo.java b/tests/bugs154/pr171952/Foo.java
index d60b9a65c..d60b9a65c 100644
--- a/tests/bugs160/pr171952/Foo.java
+++ b/tests/bugs154/pr171952/Foo.java
diff --git a/tests/bugs160/pr171952/FooAspect.java b/tests/bugs154/pr171952/FooAspect.java
index a376442fc..a376442fc 100644
--- a/tests/bugs160/pr171952/FooAspect.java
+++ b/tests/bugs154/pr171952/FooAspect.java
diff --git a/tests/bugs160/pr171953/test/AbstractExecutable.java b/tests/bugs154/pr171953/test/AbstractExecutable.java
index 6d9f880a6..6d9f880a6 100644
--- a/tests/bugs160/pr171953/test/AbstractExecutable.java
+++ b/tests/bugs154/pr171953/test/AbstractExecutable.java
diff --git a/tests/bugs160/pr171953/test/AnotherExecutable.java b/tests/bugs154/pr171953/test/AnotherExecutable.java
index 75103a696..75103a696 100644
--- a/tests/bugs160/pr171953/test/AnotherExecutable.java
+++ b/tests/bugs154/pr171953/test/AnotherExecutable.java
diff --git a/tests/bugs160/pr171953/test/Executable.java b/tests/bugs154/pr171953/test/Executable.java
index 13cb945b1..13cb945b1 100644
--- a/tests/bugs160/pr171953/test/Executable.java
+++ b/tests/bugs154/pr171953/test/Executable.java
diff --git a/tests/bugs160/pr171953/test/ExecutionAspect.aj b/tests/bugs154/pr171953/test/ExecutionAspect.aj
index 1dd0266d8..1dd0266d8 100644
--- a/tests/bugs160/pr171953/test/ExecutionAspect.aj
+++ b/tests/bugs154/pr171953/test/ExecutionAspect.aj
diff --git a/tests/bugs160/pr171953/test/RunnableAspect.aj b/tests/bugs154/pr171953/test/RunnableAspect.aj
index fa12b7b99..fa12b7b99 100644
--- a/tests/bugs160/pr171953/test/RunnableAspect.aj
+++ b/tests/bugs154/pr171953/test/RunnableAspect.aj
diff --git a/tests/bugs160/pr171953/test/SecondTestExecutable.java b/tests/bugs154/pr171953/test/SecondTestExecutable.java
index 1743a9728..1743a9728 100644
--- a/tests/bugs160/pr171953/test/SecondTestExecutable.java
+++ b/tests/bugs154/pr171953/test/SecondTestExecutable.java
diff --git a/tests/bugs160/pr171953/test/SubTestExecutable.java b/tests/bugs154/pr171953/test/SubTestExecutable.java
index 8dd83bd03..8dd83bd03 100644
--- a/tests/bugs160/pr171953/test/SubTestExecutable.java
+++ b/tests/bugs154/pr171953/test/SubTestExecutable.java
diff --git a/tests/bugs160/pr171953/test/TestExecutable.java b/tests/bugs154/pr171953/test/TestExecutable.java
index bfd296a2d..bfd296a2d 100644
--- a/tests/bugs160/pr171953/test/TestExecutable.java
+++ b/tests/bugs154/pr171953/test/TestExecutable.java
diff --git a/tests/bugs160/pr171953_2/test/AbstractProcessor.java b/tests/bugs154/pr171953_2/test/AbstractProcessor.java
index 008fba159..008fba159 100644
--- a/tests/bugs160/pr171953_2/test/AbstractProcessor.java
+++ b/tests/bugs154/pr171953_2/test/AbstractProcessor.java
diff --git a/tests/bugs160/pr171953_2/test/ListFactory.java b/tests/bugs154/pr171953_2/test/ListFactory.java
index 473ccac20..473ccac20 100644
--- a/tests/bugs160/pr171953_2/test/ListFactory.java
+++ b/tests/bugs154/pr171953_2/test/ListFactory.java
diff --git a/tests/bugs160/pr171953_2/test/ListFactoryAspect.aj b/tests/bugs154/pr171953_2/test/ListFactoryAspect.aj
index acfc27e70..acfc27e70 100644
--- a/tests/bugs160/pr171953_2/test/ListFactoryAspect.aj
+++ b/tests/bugs154/pr171953_2/test/ListFactoryAspect.aj
diff --git a/tests/bugs160/pr171953_2/test/ListFactoryConsumer.java b/tests/bugs154/pr171953_2/test/ListFactoryConsumer.java
index 41747d902..41747d902 100644
--- a/tests/bugs160/pr171953_2/test/ListFactoryConsumer.java
+++ b/tests/bugs154/pr171953_2/test/ListFactoryConsumer.java
diff --git a/tests/bugs160/pr171953_2/test/Processor.java b/tests/bugs154/pr171953_2/test/Processor.java
index c76cdaaf9..c76cdaaf9 100644
--- a/tests/bugs160/pr171953_2/test/Processor.java
+++ b/tests/bugs154/pr171953_2/test/Processor.java
diff --git a/tests/bugs160/pr171953_2/test/SimpleListFactoryConsumer.java b/tests/bugs154/pr171953_2/test/SimpleListFactoryConsumer.java
index ab1ec7cf7..ab1ec7cf7 100644
--- a/tests/bugs160/pr171953_2/test/SimpleListFactoryConsumer.java
+++ b/tests/bugs154/pr171953_2/test/SimpleListFactoryConsumer.java
diff --git a/tests/bugs160/pr172107/Instrumentation.aj b/tests/bugs154/pr172107/Instrumentation.aj
index d937dcbb0..d937dcbb0 100644
--- a/tests/bugs160/pr172107/Instrumentation.aj
+++ b/tests/bugs154/pr172107/Instrumentation.aj
diff --git a/tests/bugs160/pr172107/ReadWriteAJBug172107.java b/tests/bugs154/pr172107/ReadWriteAJBug172107.java
index 999ed5bd6..999ed5bd6 100644
--- a/tests/bugs160/pr172107/ReadWriteAJBug172107.java
+++ b/tests/bugs154/pr172107/ReadWriteAJBug172107.java
diff --git a/tests/bugs160/pr174449/Foo.java b/tests/bugs154/pr174449/Foo.java
index 68a400d7d..68a400d7d 100644
--- a/tests/bugs160/pr174449/Foo.java
+++ b/tests/bugs154/pr174449/Foo.java
diff --git a/tests/bugs160/pr175806/A.java b/tests/bugs154/pr175806/A.java
index 562276c39..562276c39 100644
--- a/tests/bugs160/pr175806/A.java
+++ b/tests/bugs154/pr175806/A.java
diff --git a/tests/bugs154/pr197719/test/aspects/C1.java b/tests/bugs154/pr197719/test/aspects/C1.java
new file mode 100644
index 000000000..363c79a93
--- /dev/null
+++ b/tests/bugs154/pr197719/test/aspects/C1.java
@@ -0,0 +1,14 @@
+package test.aspects;

+

+public class C1 {

+

+    @MyAnn

+    protected void aMethod() {

+      System.out.println("Calling aMethod");

+    }

+    

+    public void callAMethod() {

+        aMethod(); // Should be a marker here...

+    }

+

+}

diff --git a/tests/bugs154/pr197719/test/aspects/C3.java b/tests/bugs154/pr197719/test/aspects/C3.java
new file mode 100644
index 000000000..abcde9b58
--- /dev/null
+++ b/tests/bugs154/pr197719/test/aspects/C3.java
@@ -0,0 +1,43 @@
+package test.aspects;

+

+import test.aspects2.C2;

+

+

+public class C3 {

+    /*

+    public void callAMethodC2() {

+        C1 c1 = new C1();

+        c1.aMethod(); // Should be a marker here...

+        

+        C2 c2 = new C2();

+        c2.aMethod();  // Should be a marker here...

+    }

+    

+    public void innerClassCall() {

+        InnerClass ic = new InnerClass();

+        

+        ic.foo();

+    }

+    protected class InnerClass {

+        public void foo() {

+            C1 c1 = new C1();

+            c1.aMethod();  // Should be a marker here...

+

+            C2 c2 = new C2();

+            c2.aMethod();  // Should be a marker here...

+        }

+    }

+    

+    public static void main(String [] args) {

+        C1 c1 = new C1();

+        

+        c1.aMethod(); // Should be a marker here...

+        c1.callAMethod();

+        

+        C3 c2 = new C3();

+        

+        c2.callAMethodC2();

+        c2.innerClassCall();

+    }

+    */

+}

diff --git a/tests/bugs154/pr197719/test/aspects/MyAnn.java b/tests/bugs154/pr197719/test/aspects/MyAnn.java
new file mode 100644
index 000000000..6610201b8
--- /dev/null
+++ b/tests/bugs154/pr197719/test/aspects/MyAnn.java
@@ -0,0 +1,13 @@
+package test.aspects;

+

+import java.lang.annotation.ElementType;

+import java.lang.annotation.Inherited;

+import java.lang.annotation.Retention;

+import java.lang.annotation.RetentionPolicy;

+import java.lang.annotation.Target;

+

+@Inherited

+@Retention(RetentionPolicy.RUNTIME)

+@Target(ElementType.METHOD)

+public @interface MyAnn {

+}

diff --git a/tests/bugs154/pr197719/test/aspects/MyAnnAspect.java b/tests/bugs154/pr197719/test/aspects/MyAnnAspect.java
new file mode 100644
index 000000000..e29619767
--- /dev/null
+++ b/tests/bugs154/pr197719/test/aspects/MyAnnAspect.java
@@ -0,0 +1,24 @@
+package test.aspects;

+

+import org.aspectj.lang.ProceedingJoinPoint;

+import org.aspectj.lang.annotation.Around;

+import org.aspectj.lang.annotation.Aspect;

+import org.aspectj.lang.annotation.Pointcut;

+

+@Aspect

+public class MyAnnAspect {

+	

+	@Pointcut("call(@MyAnn * *(..))")

+	void validatedMethod() {}

+	

+

+    @Around("validatedMethod()")

+    public Object validateMethodImpl(ProceedingJoinPoint thisJoinPoint) throws Throwable {

+		return doInvoke(thisJoinPoint);

+	}

+	

+    private Object doInvoke(final ProceedingJoinPoint thisJoinPoint) throws Throwable {

+        System.out.println("Invoking : " + thisJoinPoint);

+        return thisJoinPoint.proceed();

+    }

+}

diff --git a/tests/bugs154/pr197719/test/aspects2/C2.java b/tests/bugs154/pr197719/test/aspects2/C2.java
new file mode 100644
index 000000000..799e7ac75
--- /dev/null
+++ b/tests/bugs154/pr197719/test/aspects2/C2.java
@@ -0,0 +1,34 @@
+package test.aspects2;

+

+import test.aspects.C1;

+

+

+public class C2 extends C1 {

+    public void callAMethodC2() {

+        aMethod(); // Should be a marker here...

+    }

+    

+    public void innerClassCall() {

+        InnerClass ic = new InnerClass();

+        

+        ic.foo();

+    }

+    protected class InnerClass {

+        public void foo() {

+            aMethod(); // Should be a marker here...

+        }

+    }

+    

+    public static void main(String [] args) {

+        C1 c1 = new C1();

+        

+        c1.callAMethod();

+        

+        C2 c2 = new C2();

+        

+        c2.aMethod(); // Should be a marker here...

+        c2.callAMethod();

+        c2.callAMethodC2();

+        c2.innerClassCall();

+    }

+}

diff --git a/tests/bugs154/pr205907/Test.aj b/tests/bugs154/pr205907/Test.aj
new file mode 100644
index 000000000..c06be67b2
--- /dev/null
+++ b/tests/bugs154/pr205907/Test.aj
@@ -0,0 +1,6 @@
+aspect Test {
+
+  pointcut p(): bean(foo*);
+
+  before(): p() { }
+}
\ No newline at end of file
diff --git a/tests/bugs154/pr206732/Advised.aj b/tests/bugs154/pr206732/Advised.aj
new file mode 100644
index 000000000..1e3abf13f
--- /dev/null
+++ b/tests/bugs154/pr206732/Advised.aj
@@ -0,0 +1,12 @@
+package bugs;
+
+
+
+public class Advised {}
+
+aspect ITD {
+
+          public void Advised.f() {}
+
+}
+
diff --git a/tests/bugs154/pr206732/Ref.aj b/tests/bugs154/pr206732/Ref.aj
new file mode 100644
index 000000000..85f6f42e5
--- /dev/null
+++ b/tests/bugs154/pr206732/Ref.aj
@@ -0,0 +1,17 @@
+package notbugs;
+
+
+
+import bugs.Advised;
+
+
+
+public class Ref {
+
+          public void g() {
+
+                   new Advised().f();
+
+          }
+
+}
\ No newline at end of file