328840

4 files changed, 82 insertions, 0 deletions

diff --git a/tests/src/org/aspectj/systemtest/AllTests16.java b/tests/src/org/aspectj/systemtest/AllTests16.java
index ce32370fe..bcceb20b4 100644
--- a/tests/src/org/aspectj/systemtest/AllTests16.java
+++ b/tests/src/org/aspectj/systemtest/AllTests16.java
@@ -9,6 +9,7 @@ import junit.framework.TestSuite;
 import org.aspectj.systemtest.ajc160.AllTestsAspectJ160;
 import org.aspectj.systemtest.ajc161.AllTestsAspectJ161;
 import org.aspectj.systemtest.ajc1610.AllTestsAspectJ1610;
+import org.aspectj.systemtest.ajc1611.AllTestsAspectJ1611;
 import org.aspectj.systemtest.ajc162.AllTestsAspectJ162;
 import org.aspectj.systemtest.ajc163.AllTestsAspectJ163;
 import org.aspectj.systemtest.ajc164.AllTestsAspectJ164;
@@ -33,6 +34,7 @@ public class AllTests16 {
 		suite.addTest(AllTestsAspectJ167.suite());
 		suite.addTest(AllTestsAspectJ169.suite());
 		suite.addTest(AllTestsAspectJ1610.suite());
+		suite.addTest(AllTestsAspectJ1611.suite());
 		suite.addTest(AllTests15.suite());
 		// $JUnit-END$
 		return suite;
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
new file mode 100644
index 000000000..b6166af2d
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Andy Clement - initial API and implementation
+ *******************************************************************************/
+package org.aspectj.systemtest.ajc1611;
+
+import java.io.File;
+
+import junit.framework.Test;
+
+import org.aspectj.testing.XMLBasedAjcTestCase;
+
+/**
+ * @author Andy Clement
+ */
+public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
+
+	public void testDeclareField_328840() {
+		runTest("pr328840");
+	}
+
+	// ---
+
+	public static Test suite() {
+		return XMLBasedAjcTestCase.loadSuite(Ajc1611Tests.class);
+	}
+
+	@Override
+	protected File getSpecFile() {
+		return new File("../tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml");
+	}
+
+}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/AllTestsAspectJ1611.java b/tests/src/org/aspectj/systemtest/ajc1611/AllTestsAspectJ1611.java
new file mode 100644
index 000000000..6ae1215a5
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc1611/AllTestsAspectJ1611.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Andy Clement - initial API and implementation
+ *******************************************************************************/
+package org.aspectj.systemtest.ajc1611;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTestsAspectJ1611 {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("AspectJ 1.6.11 tests");
+		// $JUnit-BEGIN$
+		suite.addTest(Ajc1611Tests.suite());
+		// $JUnit-END$
+		return suite;
+	}
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
new file mode 100644
index 000000000..40acb25c6
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
@@ -0,0 +1,16 @@
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
+
+<suite>
+
+  <ajc-test dir="bugs1611/pr328840" title="pr328840">
+    <compile files="Wibble.aj" options="-1.5 -showWeaveInfo">
+    <message kind="weave" text="Join point 'field-get(XX Song.i)' in Type 'Song' (Wibble.aj:26) advised by before advice from 'Wibble' (Wibble.aj:9)"/>
+    <message kind="weave" text="'XX i' of type 'Song' (Wibble.aj) is annotated with @Foo field annotation from 'Wibble' (Wibble.aj:7)"/>
+    </compile>
+    <run class="Wibble">
+    <stdout>
+    <line text="@Foo()"/>
+    </stdout></run>
+  </ajc-test>
+  
+</suite>
\ No newline at end of file