from branch: simple @AJ tests

3 files changed, 123 insertions, 0 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
new file mode 100644
index 000000000..8d5b3dadf
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2005 Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ * initial development             Jonas Bonér, Alexandre Vasseur 
+ *******************************************************************************/
+package org.aspectj.systemtest.ajc150.ataspectj;
+
+import java.io.File;
+
+import junit.framework.Test;
+
+import org.aspectj.testing.XMLBasedAjcTestCase;
+
+/**
+ * A suite for @AspectJ aspects located in java5/ataspectj
+ *
+ * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
+ */
+public class AtAjSyntaxTests extends XMLBasedAjcTestCase {
+	
+	public static Test suite() {
+	    return XMLBasedAjcTestCase.loadSuite(AtAjSyntaxTests.class);
+	}
+
+	protected File getSpecFile() {
+	  return new File("../tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150.xml");
+	}
+	
+    public void testSingletonAspectBinding() {
+        runTest("singletonAspectBindings");
+    }
+	
+    public void testCflow() {
+        runTest("CflowTest");
+    }
+	
+    public void testPointcutReference() {
+        runTest("PointcutReferenceTest");
+    }
+	
+    public void testXXJoinPoint() {
+        runTest("XXJoinPointTest");
+    }
+
+    public void testPrecedence() {
+        runTest("PrecedenceTest");
+    }
+
+// FIXME alex restore when AJC can compile it... #86452
+//    public void testAfterX() {
+//        runTest("AfterXTest");
+//    }
+
+// FIXME alex @AJ impl + test
+// FIXME andy is this working or not Alex? It was commented out in the branch but uncommenting it - it
+//       runs fine for me.
+    public void testIfPointcut() {
+        runTest("IfPointcutTest");
+    }
+
+// FIXME alex java.lang.VerifyError: (class: ataspectj/BindingTest, method: dup_aroundBody5$advice signature: (ILorg/aspectj/lang/JoinPoint;Lataspectj/BindingTest$TestAspect_1;ILorg/aspectj/lang/ProceedingJoinPoint;)Ljava/lang/Object;) Register 0 contains wrong type
+//    public void testBindings() {
+//        runTest("BindingTest");
+//    }
+}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150-tests.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150-tests.xml
new file mode 100644
index 000000000..4de17dfb8
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150-tests.xml
@@ -0,0 +1,41 @@
+<!-- @AspectJ v1.5.0 Tests -->
+
+    <ajc-test dir="java5/ataspectj" title="singletonAspectBindings">
+        <compile files="ataspectj/SingletonAspectBindingsTest.java,ataspectj/TestHelper.java" options="-1.5 -XnoInline"/>
+        <run class="ataspectj.SingletonAspectBindingsTest"/>
+    </ajc-test>
+    
+    <ajc-test dir="java5/ataspectj" title="CflowTest">
+        <compile files="ataspectj/CflowTest.java,ataspectj/TestHelper.java" options="-1.5"/>
+        <run class="ataspectj.CflowTest"/>
+    </ajc-test>
+    
+    <ajc-test dir="java5/ataspectj" title="PointcutReferenceTest">
+        <compile files="ataspectj/PointcutReferenceTest.java,ataspectj/TestHelper.java" options="-1.5"/>
+        <run class="ataspectj.PointcutReferenceTest"/>
+    </ajc-test>
+    
+    <ajc-test dir="java5/ataspectj" title="XXJoinPointTest">
+        <compile files="ataspectj/XXJoinPointTest.java,ataspectj/TestHelper.java" options="-1.5"/>
+        <run class="ataspectj.XXJoinPointTest"/>
+    </ajc-test>
+    
+    <ajc-test dir="java5/ataspectj" title="PrecedenceTest">
+        <compile files="ataspectj/PrecedenceTest.java,ataspectj/TestHelper.java" options="-1.5"/>
+        <run class="ataspectj.PrecedenceTest"/>
+    </ajc-test>
+    
+    <ajc-test dir="java5/ataspectj" title="AfterXTest">
+        <compile files="ataspectj/AfterXTest.java,ataspectj/TestHelper.java" options="-1.5"/>
+        <run class="ataspectj.AfterXTest"/>
+    </ajc-test>
+    
+    <ajc-test dir="java5/ataspectj" title="IfPointcutTest">
+        <compile files="ataspectj/IfPointcutTest.java,ataspectj/TestHelper.java" options="-1.5"/>
+        <run class="ataspectj.IfPointcutTest"/>
+    </ajc-test>
+    
+    <ajc-test dir="java5/ataspectj" title="BindingTest">
+        <compile files="ataspectj/BindingTest.java,ataspectj/TestHelper.java" options="-1.5"/>
+        <run class="ataspectj.BindingTest"/>
+    </ajc-test>
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150.xml
new file mode 100644
index 000000000..fb3611111
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150.xml
@@ -0,0 +1,12 @@
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
+<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150-tests.xml">
+]>
+
+<!--  @AspectJ v1.5.0 Tests -->
+
+<suite>
+
+&tests;
+
+</suite>
+