186673: test and fix. Don't rely on suffix for identifying jars and zips

5 files changed, 49 insertions, 0 deletions

diff --git a/tests/bugs154/pr186673/A.java b/tests/bugs154/pr186673/A.java
new file mode 100644
index 000000000..c064fb795
--- /dev/null
+++ b/tests/bugs154/pr186673/A.java
@@ -0,0 +1,19 @@
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.*;
+
+@interface I {}
+
+@I
+public class A {
+  public void m() {}
+}
+
+@Aspect
+class X {
+  @Around("execution(* (@I *).*(..))") 
+  public Object foo(ProceedingJoinPoint pjp) {
+return null;
+  }
+}
+
+
diff --git a/tests/bugs154/pr186673/Apple.java b/tests/bugs154/pr186673/Apple.java
new file mode 100644
index 000000000..c08a4f301
--- /dev/null
+++ b/tests/bugs154/pr186673/Apple.java
@@ -0,0 +1,3 @@
+public class Apple {
+  public void m() {}
+}
diff --git a/tests/bugs154/pr186673/Main.java b/tests/bugs154/pr186673/Main.java
new file mode 100644
index 000000000..379057148
--- /dev/null
+++ b/tests/bugs154/pr186673/Main.java
@@ -0,0 +1,6 @@
+public class Main {
+  public static void main(String []argv) {
+    new Apple().m();
+    new Orange().m();
+  }
+}
diff --git a/tests/bugs154/pr186673/Orange.java b/tests/bugs154/pr186673/Orange.java
new file mode 100644
index 000000000..9aed34dd2
--- /dev/null
+++ b/tests/bugs154/pr186673/Orange.java
@@ -0,0 +1,3 @@
+public class Orange {
+  public void m() {}
+}
diff --git a/tests/bugs154/pr186673/ant.xml b/tests/bugs154/pr186673/ant.xml
new file mode 100644
index 000000000..8cfc30728
--- /dev/null
+++ b/tests/bugs154/pr186673/ant.xml
@@ -0,0 +1,18 @@
+<project name="ltw with funny libraries" default="default" basedir=".">

+    <target name="default" >

+      <echo> This script builds the AspectJ examples.  </echo>

+      <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">

+          <classpath> 

+            <pathelement path="${aj.root}/lib/aspectj/aspectjtools.jar"/>

+          </classpath>

+      </taskdef>

+       <iajc destdir="${classes.dir}" argfiles="${list}" 

+       		fork="true"

+       		forkclasspath="${aspectjtools.jar}"

+          classpath="${aspectjrt.jar}"/>

+

+       <antcall target="Ajx-run" >

+         <param name="class" value="${class}"/>

+       </antcall>

+    </target>

+</project>