Test and fix for 165885: generic fields and pipelining problem

4 files changed, 99 insertions, 0 deletions

diff --git a/tests/src/org/aspectj/systemtest/AllTests16.java b/tests/src/org/aspectj/systemtest/AllTests16.java
new file mode 100644
index 000000000..d187b5777
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/AllTests16.java
@@ -0,0 +1,21 @@
+/*
+ * Created on 19-01-2005
+ */
+package org.aspectj.systemtest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.aspectj.systemtest.ajc160.AllTestsAspectJ160;
+
+public class AllTests16 {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("AspectJ System Test Suite - JDK 1.6");
+		//$JUnit-BEGIN$
+		suite.addTest(AllTests15.suite());
+		suite.addTest(AllTestsAspectJ160.suite());
+		//$JUnit-END$
+		return suite;
+	}
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java b/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
new file mode 100644
index 000000000..5b22d1717
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM 
+ * 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.ajc160;
+
+import java.io.File;
+
+import org.aspectj.testing.XMLBasedAjcTestCase;
+
+import junit.framework.Test;
+
+/**
+ * These are tests for AspectJ1.6 - they do not require a 1.6 VM.
+ */
+public class Ajc160Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
+	
+  public void testGenericFieldNPE_pr165885() { runTest("generic field npe");}
+
+ 
+  /////////////////////////////////////////
+  public static Test suite() {
+    return XMLBasedAjcTestCase.loadSuite(Ajc160Tests.class);
+  }
+
+  protected File getSpecFile() {
+    return new File("../tests/src/org/aspectj/systemtest/ajc160/ajc160.xml");
+  }
+
+  
+}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc160/AllTestsAspectJ160.java b/tests/src/org/aspectj/systemtest/ajc160/AllTestsAspectJ160.java
new file mode 100644
index 000000000..1e93dca56
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc160/AllTestsAspectJ160.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM 
+ * 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.ajc160;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTestsAspectJ160 {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("AspectJ 1.6.0 tests");
+		//$JUnit-BEGIN$
+		suite.addTest(Ajc160Tests.suite());
+        //$JUnit-END$
+		return suite;
+	}
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml b/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml
new file mode 100644
index 000000000..2e12408fa
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml
@@ -0,0 +1,16 @@
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
+
+<!-- AspectJ v1.6.0 Tests -->
+<suite>
+
+ <!-- first section - dont need a 1.6 vm but fixed in the 1.6 branch of AspectJ -->
+    <ajc-test dir="bugs160/pr165885" title="generic field npe">
+      <compile files="Concrete.java,Abstract.java,Aspect.java" options="-1.5">
+        <message kind="warning" line="8" text="foo"/>
+	  </compile>
+    </ajc-test>
+    
+    
+ <!-- second section - need a 1.6 vm -->
+
+</suite>
\ No newline at end of file