testcode for 152848 'deploying generics code when non-generics types are about'

diff --git a/tests/bugs153/pr152848/AnAspect.java b/tests/bugs153/pr152848/AnAspect.java
new file mode 100644 (file)
index 0000000..f3784dd
--- /dev/null
+++ b/tests/bugs153/pr152848/AnAspect.java
@@ -0,0 +1,3 @@
+public aspect AnAspect {
+  before(): staticinitialization(*) {}
+}

diff --git a/tests/bugs153/pr152848/BaseType.java b/tests/bugs153/pr152848/BaseType.java
new file mode 100644 (file)
index 0000000..66e907a
--- /dev/null
+++ b/tests/bugs153/pr152848/BaseType.java
@@ -0,0 +1,3 @@
+public class BaseType {
+  Pair<String,String> foo;
+}

diff --git a/tests/bugs153/pr152848/PairGeneric.java b/tests/bugs153/pr152848/PairGeneric.java
new file mode 100644 (file)
index 0000000..76878cc
--- /dev/null
+++ b/tests/bugs153/pr152848/PairGeneric.java
@@ -0,0 +1 @@
+class Pair<A,B> {}

diff --git a/tests/bugs153/pr152848/PairNormal.java b/tests/bugs153/pr152848/PairNormal.java
new file mode 100644 (file)
index 0000000..2484ed8
--- /dev/null
+++ b/tests/bugs153/pr152848/PairNormal.java
@@ -0,0 +1 @@
+class Pair {}

diff --git a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
index b1910ee631f21a868f953e9e91fbd0528942cff3..68bd94185c845ea90936e4eaa856da8b36cc041e 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
+++ b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
@@ -3,6 +3,13 @@
 <!-- AspectJ v1.5.3 Tests -->
 <suite>
 
+    <ajc-test dir="bugs153/pr152848" title="mixing generics">
+      <compile files="PairGeneric.java" options="-1.5" outjar="pair.jar"/>
+      <compile files="BaseType.java" options="-1.5" outjar="basetype.jar" classpath="pair.jar"/>
+      <compile files="PairNormal.java" outjar="pair.jar"/>
+      <compile files="AnAspect.java" options="-1.5 -Xset:runMinimalMemory=true" inpath="basetype.jar;pair.jar"/>
+    </ajc-test>
+
     <ajc-test dir="bugs153/pr152871" title="parsing bytecode less">
       <compile files="MyClass.java" options="-1.5"/>
       <compile files="MyAspect.java" options="-1.5 -Xlint:ignore"/>