tests for Fix 106736 - permitting classes dir as aspect URL (also permitting .zip files)

7 files changed, 79 insertions, 0 deletions

diff --git a/weaver/testdata/WeavingURLClassLoaderTest/build.xml b/weaver/testdata/WeavingURLClassLoaderTest/build.xml
new file mode 100644
index 000000000..753f99328
--- /dev/null
+++ b/weaver/testdata/WeavingURLClassLoaderTest/build.xml
@@ -0,0 +1,65 @@
+
+<!--
+	bug 106736 (classes dir); also permitting .zip variants
+	To upgrade binary input form, reset ${aspectj.lib.dir} below.
+-->
+<project name="WeavingURLClassLoaderTest" default="all" basedir=".">
+
+    <target name="all"     depends="init"
+        description="build libs, test that failure works">
+        <property name="out.lib.dir"
+            location="${basedir}/builtLibs"/>
+        <iajc outjar="${out.lib.dir}/main.zip" 
+            srcdir="${basedir}"
+            classpath="${aspectjrt.jar}"
+            includes="packag/Main.java"/>
+        <iajc outjar="${out.lib.dir}/aspect.zip"
+            classpath="${aspectjrt.jar}"
+            srcdir="${basedir}"
+            includes="packag/Aspect.aj"/>
+        <iajc outjar="${out.lib.dir}/aspect.jar"
+            classpath="${aspectjrt.jar}"
+            srcdir="${basedir}"
+            includes="packag/Aspect.aj"/>
+        <iajc destDir="${out.lib.dir}/classes"
+            classpath="${aspectjrt.jar}"
+            srcdir="${basedir}"
+            includes="packag/Aspect.aj"/>
+        
+        <iajc outjar="${out.lib.dir}/test.jar"
+            classpath="${aspectjrt.jar}"
+            aspectpath="${out.lib.dir}/aspect.jar"
+            inpath="${out.lib.dir}/main.zip"/>
+        <java classname="packag.Main">
+            <classpath>
+                <pathelement location="${out.lib.dir}/test.jar"/>
+                <pathelement location="${out.lib.dir}/aspect.jar"/>
+                <pathelement location="${aspectjrt.jar}"/>
+        	</classpath>
+        </java>
+        <delete file="${out.lib.dir}/test.jar"/>
+        
+    </target>
+
+    <target name="init"     depends="">
+        <!-- 
+        	warning: checked-in aspectjtools.jar is from last release,
+        	but current (HEAD) ltw requires aspect binaries to be built 
+        	with the current weaver, not last release.  I use
+	        location="${basedir}/../../../lib/aspectj/lib"/>
+        -->
+        <property name="aspectj.lib.dir"
+	        location="${basedir}/../../../aj-build/install/lib"/>
+        <property name="aspectjtools.jar"
+            location="${aspectj.lib.dir}/aspectjtools.jar"/>
+        <property name="aspectjrt.jar"
+            location="${aspectj.lib.dir}/aspectjrt.jar"/>
+        <taskdef 
+            resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
+             <classpath> 
+               <pathelement path="${aspectjtools.jar}"/> 
+             </classpath>
+         </taskdef>
+    </target>
+
+</project>
\ No newline at end of file
diff --git a/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/aspect.jar b/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/aspect.jar
new file mode 100644
index 000000000..77469d6f0
--- /dev/null
+++ b/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/aspect.jar
diff --git a/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/aspect.zip b/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/aspect.zip
new file mode 100644
index 000000000..a5aebe491
--- /dev/null
+++ b/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/aspect.zip
diff --git a/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/classes/packag/Aspect.class b/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/classes/packag/Aspect.class
new file mode 100644
index 000000000..57b29b005
--- /dev/null
+++ b/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/classes/packag/Aspect.class
diff --git a/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/main.zip b/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/main.zip
new file mode 100644
index 000000000..e0204709e
--- /dev/null
+++ b/weaver/testdata/WeavingURLClassLoaderTest/builtLibs/main.zip
diff --git a/weaver/testdata/WeavingURLClassLoaderTest/packag/Aspect.aj b/weaver/testdata/WeavingURLClassLoaderTest/packag/Aspect.aj
new file mode 100644
index 000000000..02eb2b822
--- /dev/null
+++ b/weaver/testdata/WeavingURLClassLoaderTest/packag/Aspect.aj
@@ -0,0 +1,7 @@
+package packag;
+
+public aspect Aspect {
+	void around() : execution(public static void *.main(String[])) {
+		// don't proceed, avoid exception
+	}
+}
diff --git a/weaver/testdata/WeavingURLClassLoaderTest/packag/Main.java b/weaver/testdata/WeavingURLClassLoaderTest/packag/Main.java
new file mode 100644
index 000000000..cd0452056
--- /dev/null
+++ b/weaver/testdata/WeavingURLClassLoaderTest/packag/Main.java
@@ -0,0 +1,7 @@
+package packag;
+
+public class Main {
+    public static void main(String[] args) {
+        throw new Error("around advice should have applied here");
+    }
+}
\ No newline at end of file