Bug 155033 "Use ajcore for LTW problems" (add ajcore LTW testcases)

5 files changed, 29 insertions, 8 deletions

diff --git a/tests/ltw/HelloWorld.java b/tests/ltw/HelloWorldWithException.java
index 9c810cf25..b043000a1 100644
--- a/tests/ltw/HelloWorld.java
+++ b/tests/ltw/HelloWorldWithException.java
@@ -1,4 +1,4 @@
-public class HelloWorld {
+public class HelloWorldWithException {
 	
 	public static void main (String[] args) throws Exception {
 		System.out.println("Hello World!");
diff --git a/tests/ltw/ant.xml b/tests/ltw/ant.xml
index e1cb0a6bd..dff2071e7 100644
--- a/tests/ltw/ant.xml
+++ b/tests/ltw/ant.xml
@@ -8,7 +8,7 @@
 	<property name="aj.bootpath" refid="aj.path"/>
 
     <target name="JDK14 LTW with XML">
-        <java fork="yes" classname="HelloWorld" failonerror="yes">
+        <java fork="yes" classname="HelloWorldWithException" failonerror="yes">
             <classpath refid="aj.path"/>
             <jvmarg value="-Djava.system.class.loader=org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
         	<sysproperty key="aj.class.path" path="${aj.sandbox}/hello.jar:${aj.sandbox}/handler.jar"/>
@@ -24,7 +24,7 @@
     </target>
 
     <target name="JDK14 LTW with ASPECTPATH">
-        <java fork="yes" classname="HelloWorld" failonerror="yes">
+        <java fork="yes" classname="HelloWorldWithException" failonerror="yes">
             <classpath refid="aj.path"/>
             <jvmarg value="-Djava.system.class.loader=org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
         	<sysproperty key="aj.class.path" path="${aj.sandbox}/hello.jar:${aj.sandbox}/handler.jar"/>
@@ -47,7 +47,7 @@
     <target name="override default path using -Dorg.aspectj.weaver.loadtime.configuration">
         <copy file="${aj.root}/tests/ltw/aop-orgaspectjweaverloadtimeconfiguration.xml"
               tofile="${aj.sandbox}/META-INF/aop-random.xml"/>
-        <java fork="yes" classname="HelloWorld" failonerror="yes">
+        <java fork="yes" classname="HelloWorldWithException" failonerror="yes">
             <classpath refid="aj.path"/>
             <classpath>
                 <pathelement path="${aj.sandbox}/hello.jar:${aj.sandbox}/handler.jar:${aj.sandbox}/tracing.jar"/>
@@ -68,7 +68,7 @@
 	     SecurityManager that will be loaded _before_ the class loader
 	     hierarch is fully initialized. -->
     <target name="NPE with custom agent">
-        <java fork="yes" classname="HelloWorld" failonerror="yes">
+        <java fork="yes" classname="HelloWorldWithException" failonerror="yes">
         	
         	<!-- Prepend custom URLClassLoader and append AspectJ
         	     to bootclasspath -->
@@ -97,7 +97,7 @@
     <target name="simple LTW">
         <copy file="${aj.root}/tests/ltw/aop-simple.xml"
               tofile="${aj.sandbox}/META-INF/aop.xml"/>
-        <java fork="yes" classname="HelloWorld" failonerror="yes">
+        <java fork="yes" classname="HelloWorldWithException" failonerror="yes">
             <classpath refid="aj.path"/>
             <!-- use META-INF/aop.xml style -->
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
@@ -105,4 +105,18 @@
         </java>
     </target>
 
+    <target name="dump on error">
+        <copy file="${aj.root}/tests/ltw/aop-dumponerror.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"/>
+        <java fork="yes" classname="HelloWorldWithException" failonerror="no">
+            <classpath refid="aj.path"/>
+            <jvmarg value="-Dorg.aspectj.weaver.Dump.condition=error"/>
+        	<sysproperty key="org.aspectj.dump.directory" path="${aj.sandbox}"/>
+            <!-- use META-INF/aop.xml style -->
+            <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
+<!--            <jvmarg line="${jdwp}"/>-->
+            <jvmarg value="-Dorg.aspectj.tracing.factory=default"/>
+        </java>
+    </target>
+
 </project>
diff --git a/tests/ltw/aop-dumponerror.xml b/tests/ltw/aop-dumponerror.xml
new file mode 100644
index 000000000..8115618bc
--- /dev/null
+++ b/tests/ltw/aop-dumponerror.xml
@@ -0,0 +1,7 @@
+<aspectj>
+	<aspects>
+        <concrete-aspect name="SubAspect" extends="MissingAspect">
+        	<pointcut name="scope" expression=""/>
+        </concrete-aspect>
+	</aspects>
+</aspectj>
\ No newline at end of file
diff --git a/tests/ltw/server-helloworld.properties b/tests/ltw/server-helloworld.properties
index baf42dbe0..09ec740a7 100644
--- a/tests/ltw/server-helloworld.properties
+++ b/tests/ltw/server-helloworld.properties
@@ -2,4 +2,4 @@
 loader.application=Application,hello.jar;handler.jar
 
 # main=Class,Loader
-main=HelloWorld,Application
\ No newline at end of file
+main=HelloWorldWithException,Application
\ No newline at end of file
diff --git a/tests/ltw/server-parentandchild.properties b/tests/ltw/server-parentandchild.properties
index d0a7af85e..b917f564e 100644
--- a/tests/ltw/server-parentandchild.properties
+++ b/tests/ltw/server-parentandchild.properties
@@ -3,4 +3,4 @@ loader.parent=Parent,parent.jar
 loader.child=Child,child.jar,Parent
 
 # main=Class,Loader
-main=Child,Child
\ No newline at end of file
+main=HelloWorldWithException,Child
\ No newline at end of file