44365: cope with also wanting to advise a method called is

3 files changed, 20 insertions, 1 deletions

diff --git a/tests/bugs169/pr44365/Errors2.java b/tests/bugs169/pr44365/Errors2.java
new file mode 100644
index 000000000..444b21b02
--- /dev/null
+++ b/tests/bugs169/pr44365/Errors2.java
@@ -0,0 +1,9 @@
+public class Errors2 {
+	public void is(String s) {
+		
+	}
+}
+
+aspect X {
+  before(): execution(* is(..)) {}
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java b/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java
index 3773e6cf4..bf5bbfcdf 100644
--- a/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java
@@ -58,6 +58,10 @@ public class Ajc169Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		runTest("type category type patterns - e1");
 	}
 
+	public void testTypePatternCategories_44365_e3() {
+		runTest("type category type patterns - e3");
+	}
+
 	public void testTypePatternCategories_44365_e2() {
 		runTest("type category type patterns - e2");
 	}
diff --git a/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml b/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml
index ea56e87bc..308b273b7 100644
--- a/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml
+++ b/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml
@@ -60,7 +60,7 @@
   
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - e1">
      <compile files="Errors1.java" options="-1.5 -showWeaveInfo">
-       <message kind="error" text="Syntax error on token &quot;&amp;&amp;&quot;, &quot;ClassType"/>
+       <message kind="error" text="Syntax error on token &quot;(&quot;, &quot;)"/>
      </compile>
   </ajc-test>
   
@@ -69,6 +69,12 @@
        <message kind="error" text="Syntax error on token &quot;)&quot;, &quot;(&quot; expected"/>
      </compile>
   </ajc-test>
+  
+   <ajc-test dir="bugs169/pr44365" title="type category type patterns - e3">
+     <compile files="Errors2.java" options="-1.5 -showWeaveInfo">
+       <message kind="weave" text="Join point 'method-execution(void Errors2.is(java.lang.String))' in Type"/>
+     </compile>
+  </ajc-test>
 
    <ajc-test dir="bugs169/pr48080" title="inserts in messages">
      <compile files="Warnings.java" options="-1.5">