From d15ad6f11f9beb58de925f812bf7506127d27e27 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Sat, 8 Jan 2011 01:17:40 +0000
Subject: [PATCH] 333469

---
 tests/bugs1611/pr333469/MyList.java                    | 10 ++++++++++
 tests/bugs1611/pr333469/MyList_Serializable.java       |  7 +++++++
 .../org/aspectj/systemtest/ajc1611/Ajc1611Tests.java   |  4 ++++
 tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml   |  7 +++++++
 4 files changed, 28 insertions(+)
 create mode 100644 tests/bugs1611/pr333469/MyList.java
 create mode 100644 tests/bugs1611/pr333469/MyList_Serializable.java

diff --git a/tests/bugs1611/pr333469/MyList.java b/tests/bugs1611/pr333469/MyList.java
new file mode 100644
index 000000000..55cb838c3
--- /dev/null
+++ b/tests/bugs1611/pr333469/MyList.java
@@ -0,0 +1,10 @@
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
+public class MyList extends ArrayList<Integer> {
+	public static void main(String []argv) throws Exception {
+		Field f = MyList.class.getDeclaredField("serialVersionUID");
+		f.setAccessible(true);
+		System.out.println("ser="+f.getLong(new MyList()));
+	}
+}
\ No newline at end of file
diff --git a/tests/bugs1611/pr333469/MyList_Serializable.java b/tests/bugs1611/pr333469/MyList_Serializable.java
new file mode 100644
index 000000000..6d040e58c
--- /dev/null
+++ b/tests/bugs1611/pr333469/MyList_Serializable.java
@@ -0,0 +1,7 @@
+import java.io.Serializable;
+
+aspect MyList_Serializable {
+  declare parents : MyList implements Serializable;
+
+  private static final long MyList.serialVersionUID = 1L; // causes compiler failure
+}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
index 408ebb02d..0c9005e26 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
@@ -21,6 +21,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
  */
 public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+	public void testGenericsAndItds_333469() {
+		runTest("pr333469");
+	}
+
 	public void testMissingType_332388() {
 		runTest("pr332388");
 	}
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
index c9bc40889..c37857222 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
@@ -22,6 +22,13 @@
      </compile>
   </ajc-test>
   
+  <ajc-test dir="bugs1611/pr333469" title="pr333469">
+     <compile files="MyList.java MyList_Serializable.java" options="-1.5"/>
+     <run class="MyList">
+     <stdout><line text="ser=1"/></stdout>
+     </run>
+  </ajc-test>
+  
   <ajc-test dir="bugs1611/pr332388_2" title="pr332388 - 2">
      <compile files="M.java" outjar="M.jar" options="-1.5"/>
      <compile files="A.java" classpath="M.jar" outjar="A.jar" options="-1.5"/>
-- 
2.39.5