389750: fix for ITDs that use generics made on generic types

4 files changed, 107 insertions, 0 deletions

diff --git a/tests/src/org/aspectj/systemtest/AllTests17.java b/tests/src/org/aspectj/systemtest/AllTests17.java
index 447ab1d51..9384d501c 100644
--- a/tests/src/org/aspectj/systemtest/AllTests17.java
+++ b/tests/src/org/aspectj/systemtest/AllTests17.java
@@ -8,12 +8,14 @@ import junit.framework.TestSuite;
 
 import org.aspectj.systemtest.ajc170.AllTestsAspectJ170;
 import org.aspectj.systemtest.ajc171.AllTestsAspectJ171;
+import org.aspectj.systemtest.ajc172.AllTestsAspectJ172;
 
 public class AllTests17 {
 
 	public static Test suite() {
 		TestSuite suite = new TestSuite("AspectJ System Test Suite - 1.7");
 		// $JUnit-BEGIN$
+		suite.addTest(AllTestsAspectJ172.suite());
 		suite.addTest(AllTestsAspectJ171.suite());
 		suite.addTest(AllTestsAspectJ170.suite());
 		suite.addTest(AllTests16.suite());
diff --git a/tests/src/org/aspectj/systemtest/ajc172/Ajc172Tests.java b/tests/src/org/aspectj/systemtest/ajc172/Ajc172Tests.java
new file mode 100644
index 000000000..0ad0af282
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc172/Ajc172Tests.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.ajc172;
+
+import java.io.File;
+
+import junit.framework.Test;
+
+import org.aspectj.testing.XMLBasedAjcTestCase;
+
+/**
+ * @author Andy Clement
+ */ 
+public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
+	
+	public void testInconsistentClassFile_pr389750() {
+		runTest("inconsistent class file");
+	}
+	
+	public void testInconsistentClassFile_pr389750_2() {
+		runTest("inconsistent class file 2");
+	}
+
+	public void testInconsistentClassFile_pr389750_3() {
+		runTest("inconsistent class file 3");
+	}
+
+	public void testInconsistentClassFile_pr389750_4() {
+		runTest("inconsistent class file 4");
+	}
+
+	// ---
+
+	public static Test suite() {
+		return XMLBasedAjcTestCase.loadSuite(Ajc172Tests.class);
+	}
+
+	@Override
+	protected File getSpecFile() {
+		return new File("../tests/src/org/aspectj/systemtest/ajc172/ajc172.xml");
+	}
+
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc172/AllTestsAspectJ172.java b/tests/src/org/aspectj/systemtest/ajc172/AllTestsAspectJ172.java
new file mode 100644
index 000000000..b79cc40fa
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc172/AllTestsAspectJ172.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.ajc172;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTestsAspectJ172 {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("AspectJ 1.7.2 tests");
+		// $JUnit-BEGIN$
+		suite.addTest(Ajc172Tests.suite());
+		// $JUnit-END$
+		return suite;
+	}
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc172/ajc172.xml b/tests/src/org/aspectj/systemtest/ajc172/ajc172.xml
new file mode 100644
index 000000000..c88e5abf6
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc172/ajc172.xml
@@ -0,0 +1,29 @@
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
+
+<suite>
+
+	<ajc-test dir="bugs172/pr389750" title="inconsistent class file">
+      <compile files="Code.aj" options="-1.5">
+      </compile>
+      <compile files="Clazz.java" options="-1.5"/>
+    </ajc-test>
+    
+	<ajc-test dir="bugs172/pr389750" title="inconsistent class file 2">
+      <compile files="Code2.aj" outjar="azpect.jar" options="-1.5">
+      </compile>
+      <compile files="Clazz2.java" aspectpath="azpect.jar" options="-1.5"/>
+    </ajc-test>
+    
+	<ajc-test dir="bugs172/pr389750" title="inconsistent class file 3">
+      <compile files="Code3.aj" outjar="azpect.jar" options="-1.5">
+      </compile>
+      <compile files="Clazz3.java" aspectpath="azpect.jar" options="-1.5"/>
+    </ajc-test>
+    
+	<ajc-test dir="bugs172/pr389750" title="inconsistent class file 4">
+      <compile files="Code4.aj" outjar="azpect.jar" options="-1.5">
+      </compile>
+      <compile files="Clazz4.java" aspectpath="azpect.jar" options="-1.5"/>
+    </ajc-test>
+
+</suite>