fixes for Bugzilla Bug 40858

	  	super-qualified pointcut reference cause weaver stack trace
and Bugzilla Bug 40814
	  	no error when defining interface pointcuts

3 files changed, 18 insertions, 9 deletions

diff --git a/tests/bugs/AbstractPointcutCE.java b/tests/bugs/AbstractPointcutCE.java
new file mode 100644
index 000000000..898a72b0a
--- /dev/null
+++ b/tests/bugs/AbstractPointcutCE.java
@@ -0,0 +1,16 @@
+
+
+/** @testcase PR#40814 compile error expected for pointcuts in interfaces
+ *    revised to check for error on abstract pointcuts in interfaces or classes
+ **/
+interface I {
+    abstract pointcut pc(); // CE
+}
+
+abstract class C {
+	abstract pointcut pc(); // CE
+}
+
+class Concrete {
+	abstract pointcut pc(); // CE
+}
diff --git a/tests/bugs/InterfacePointcutCE.java b/tests/bugs/InterfacePointcutCE.java
deleted file mode 100644
index 49bcd33de..000000000
--- a/tests/bugs/InterfacePointcutCE.java
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-/** @testcase PR#40814 compile error expected for pointcuts in interfaces */
-interface I {
-    abstract pointcut pc(); // CE
-    pointcut publicCalls() : call(public * *(..)) || call(public new(..)); // CE
-}
\ No newline at end of file
diff --git a/tests/bugs/SuperPointcutCE.java b/tests/bugs/SuperPointcutCE.java
index 7231fb00e..be6111e16 100644
--- a/tests/bugs/SuperPointcutCE.java
+++ b/tests/bugs/SuperPointcutCE.java
@@ -1,6 +1,6 @@
 
 
-public class MissingTypeSigatureCE {
+public class SuperPointcutCE {
     public static void main(String[] a) {
         new C().run();
     }
@@ -20,7 +20,7 @@ abstract aspect AA {
 /** @testcase PR#40858 weaver trace on mis-qualified pointcut reference */
 aspect B extends AA {
     
-    pointcut pc() : super.pc() 
+    pointcut pc() : super.pc()        // CE super not allowed in 1.1
         && !call(void println(..));
         
     pointcut blah() : UnknownType.pc();  // CE