From 3021284f5d910a406d26a01ce836bbb5f5cd6bfc Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Fri, 21 Oct 2005 06:56:11 +0000
Subject: test and fix for pr111915

---
 tests/bugs150/pr111915.java                             | 17 +++++++++++++++++
 .../src/org/aspectj/systemtest/ajc150/Ajc150Tests.java  |  4 ++++
 tests/src/org/aspectj/systemtest/ajc150/ajc150.xml      |  7 +++++++
 3 files changed, 28 insertions(+)
 create mode 100644 tests/bugs150/pr111915.java

(limited to 'tests')

diff --git a/tests/bugs150/pr111915.java b/tests/bugs150/pr111915.java
new file mode 100644
index 000000000..f0ca3abae
--- /dev/null
+++ b/tests/bugs150/pr111915.java
@@ -0,0 +1,17 @@
+import java.io.*;
+
+class SomeClass {
+    public void doSomething() { }
+}
+
+aspect DoesntCompile {
+
+    declare parents : SomeClass implements Serializable;
+
+    pointcut doSomething(SomeClass someClass) :
+            execution(void SomeClass.doSomething()) &&
+            this(someClass);
+
+    void around(Serializable myWorld) : doSomething(myWorld) { }
+    
+}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index a6f8acb46..1aabffea6 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -485,6 +485,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	  runTest("parameterized generic methods");
   }
   
+  public void testIllegalChangeToPointcutDeclaration_pr111915() {
+	runTest("test illegal change to pointcut declaration");
+  }
+  
   public void testCantProvideDefaultImplViaITD_pr110307_1() {runTest("Cant provide default implementation via ITD - 1");}
   public void testCantProvideDefaultImplViaITD_pr110307_2() {runTest("Cant provide default implementation via ITD - 2");}
   public void testCantProvideDefaultImplViaITD_pr110307_3() {runTest("Cant provide default implementation via ITD - 3");}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index d0aaa64ca..b4546aac7 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -6,6 +6,13 @@
     <ajc-test dir="java5/staticImports" title="import static java.lang.System.out">
         <compile files="StaticImport.aj" options="-1.5"/>
     </ajc-test>
+    
+    <ajc-test dir="bugs150" title="test illegal change to pointcut declaration">
+        <compile files="pr111915.java" options="-1.5 -showWeaveInfo">
+          <message kind="weave" text="Join point 'method-execution(void SomeClass.doSomething())' in Type 'SomeClass' (pr111915.java:4) advised by around advice from 'DoesntCompile' (pr111915.java:15)"/>
+          <message kind="weave" text="Extending interface set for type 'SomeClass' (pr111915.java) to include 'java.io.Serializable' (pr111915.java)"/>
+        </compile>
+    </ajc-test> 
 
     <ajc-test dir="java5/bridgeMethods" pr="72766" title="Ignore bridge methods">
         <compile files="AspectX.aj" inpath="testcode.jar" options="-showWeaveInfo">
-- 
cgit v1.2.3