Merged post 1.8.5 changes into Java9 branch

16 files changed, 127 insertions, 0 deletions

diff --git a/tests/bugs189/352389/A.java b/tests/bugs189/352389/A.java
new file mode 100644
index 000000000..d82598fa1
--- /dev/null
+++ b/tests/bugs189/352389/A.java
@@ -0,0 +1,3 @@
+public aspect A {
+before(): execution(* m(..)) { System.out.println("a"); }
+}
diff --git a/tests/bugs189/352389/B.java b/tests/bugs189/352389/B.java
new file mode 100644
index 000000000..950dfae0a
--- /dev/null
+++ b/tests/bugs189/352389/B.java
@@ -0,0 +1,3 @@
+public aspect B {
+before(): execution(* m(..)) { System.out.println("b"); }
+}
diff --git a/tests/bugs189/352389/C.java b/tests/bugs189/352389/C.java
new file mode 100644
index 000000000..f86644d3b
--- /dev/null
+++ b/tests/bugs189/352389/C.java
@@ -0,0 +1,3 @@
+public aspect C {
+before(): execution(* m(..)) { System.out.println("c"); }
+}
diff --git a/tests/bugs189/352389/Code.java b/tests/bugs189/352389/Code.java
new file mode 100644
index 000000000..c7c4e64ff
--- /dev/null
+++ b/tests/bugs189/352389/Code.java
@@ -0,0 +1,7 @@
+public class Code {
+public static void main(String []argv) {
+  new Code().m();
+}
+
+public void m() {}
+}
diff --git a/tests/bugs189/433351/ClassProj1.java b/tests/bugs189/433351/ClassProj1.java
new file mode 100644
index 000000000..ce06e88ab
--- /dev/null
+++ b/tests/bugs189/433351/ClassProj1.java
@@ -0,0 +1,8 @@
+package test;
+
+public abstract class ClassProj1<T> implements InterfaceProj1<String> {
+
+	public int aMethod() {
+		return 1;
+	}
+}
diff --git a/tests/bugs189/433351/ClassProj2.java b/tests/bugs189/433351/ClassProj2.java
new file mode 100644
index 000000000..2aca8b08e
--- /dev/null
+++ b/tests/bugs189/433351/ClassProj2.java
@@ -0,0 +1,9 @@
+package test.extender;
+
+public abstract class ClassProj2<T> implements InterfaceProj2<T> {
+
+	public int bMethod() {
+		return 2;
+	}
+	
+}
diff --git a/tests/bugs189/433351/Extender.aj b/tests/bugs189/433351/Extender.aj
new file mode 100644
index 000000000..433275660
--- /dev/null
+++ b/tests/bugs189/433351/Extender.aj
@@ -0,0 +1,10 @@
+package test.extender;
+import test.*;
+
+public aspect Extender {
+
+	declare parents: InterfaceProj1 extends InterfaceProj2;
+
+//	declare parents: test.ClassProj1 extends ClassProj2;
+
+}
diff --git a/tests/bugs189/433351/Extender2.aj b/tests/bugs189/433351/Extender2.aj
new file mode 100644
index 000000000..351c70eeb
--- /dev/null
+++ b/tests/bugs189/433351/Extender2.aj
@@ -0,0 +1,10 @@
+package test.extender;
+import test.*;
+
+public aspect Extender2 {
+
+	declare parents: InterfaceProj1 extends java.io.Serializable;
+
+//	declare parents: test.ClassProj1 extends ClassProj2;
+
+}
diff --git a/tests/bugs189/433351/Extender3.aj b/tests/bugs189/433351/Extender3.aj
new file mode 100644
index 000000000..9fcda9e52
--- /dev/null
+++ b/tests/bugs189/433351/Extender3.aj
@@ -0,0 +1,10 @@
+package test.extender;
+import test.*;
+
+public aspect Extender3 {
+
+	declare parents: InterfaceProj1 extends InterfaceProj2;
+
+	declare parents: test.ClassProj1 extends ClassProj2;
+
+}
diff --git a/tests/bugs189/433351/InterfaceProj1.java b/tests/bugs189/433351/InterfaceProj1.java
new file mode 100644
index 000000000..7d90bef54
--- /dev/null
+++ b/tests/bugs189/433351/InterfaceProj1.java
@@ -0,0 +1,7 @@
+package test;
+
+public interface InterfaceProj1<T> {
+
+	public abstract int aMethod();
+	
+}
diff --git a/tests/bugs189/433351/InterfaceProj2.java b/tests/bugs189/433351/InterfaceProj2.java
new file mode 100644
index 000000000..b6846f54c
--- /dev/null
+++ b/tests/bugs189/433351/InterfaceProj2.java
@@ -0,0 +1,7 @@
+package test.extender;
+
+public interface InterfaceProj2<T> {
+
+	public abstract int bMethod();
+	
+}
\ No newline at end of file
diff --git a/tests/bugs189/485583/Bar.aj b/tests/bugs189/485583/Bar.aj
new file mode 100644
index 000000000..aa69e37f0
--- /dev/null
+++ b/tests/bugs189/485583/Bar.aj
@@ -0,0 +1,8 @@
+//import org.aspectj.lang.annotation.*;
+//
+//@SuppressLoggerWarning
+@org.aspectj.lang.annotation.Aspect
+public abstract class  Bar {    
+    public abstract pointcut applicationCode();
+}
+
diff --git a/tests/bugs189/485583/Foo.aj b/tests/bugs189/485583/Foo.aj
new file mode 100644
index 000000000..3997385f7
--- /dev/null
+++ b/tests/bugs189/485583/Foo.aj
@@ -0,0 +1,4 @@
+
+public abstract class Foo {
+    public abstract pointcut deprecatedCode();
+}
diff --git a/tests/bugs189/486203/While.java b/tests/bugs189/486203/While.java
new file mode 100644
index 000000000..f41e74aa8
--- /dev/null
+++ b/tests/bugs189/486203/While.java
@@ -0,0 +1,14 @@
+import java.util.function.Consumer;
+
+class While {
+	void m() {
+		t(Long.class, value -> {
+			int x = 1;
+			while (--x >= 0)
+				;
+		});
+	}
+
+	<T> void t(Class<T> clazz, Consumer<T> object) {
+	}
+}
diff --git a/tests/bugs189/486612/Azpect.java b/tests/bugs189/486612/Azpect.java
new file mode 100644
index 000000000..e5a1ba3e5
--- /dev/null
+++ b/tests/bugs189/486612/Azpect.java
@@ -0,0 +1,7 @@
+aspect Azpect {
+ declare parents: B implements I;
+ declare parents: D implements I;
+  before(): staticinitialization(!Azpect){}
+}
+
+interface I {}
diff --git a/tests/bugs189/486612/Code.java b/tests/bugs189/486612/Code.java
new file mode 100644
index 000000000..089d93244
--- /dev/null
+++ b/tests/bugs189/486612/Code.java
@@ -0,0 +1,17 @@
+import java.io.*;
+
+public class Code {
+  public static void main(String []argv) {
+  }
+}
+
+class B<T extends SomeClass & SomeInterface> extends C<T> implements Serializable {
+}
+
+class C<T> {}
+
+class SomeClass {}
+interface SomeInterface {}
+interface SomeOtherInterface {}
+
+class D<T extends SomeInterface&SomeOtherInterface> {}