aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2006-08-25 09:59:11 +0000
committeraclement <aclement>2006-08-25 09:59:11 +0000
commit04c679e8e06ab8295a9d6916960cdcfc1c0025af (patch)
tree9c2639b9df246f5ca4a2e8466747f79e124c653a
parente00c0f2931f040ca7796a8b4c51efba3d93d6d13 (diff)
downloadaspectj-04c679e8e06ab8295a9d6916960cdcfc1c0025af.tar.gz
aspectj-04c679e8e06ab8295a9d6916960cdcfc1c0025af.zip
testcode for 152848 'deploying generics code when non-generics types are about'
-rw-r--r--tests/bugs153/pr152848/AnAspect.java3
-rw-r--r--tests/bugs153/pr152848/BaseType.java3
-rw-r--r--tests/bugs153/pr152848/PairGeneric.java1
-rw-r--r--tests/bugs153/pr152848/PairNormal.java1
-rw-r--r--tests/src/org/aspectj/systemtest/ajc153/ajc153.xml7
5 files changed, 15 insertions, 0 deletions
diff --git a/tests/bugs153/pr152848/AnAspect.java b/tests/bugs153/pr152848/AnAspect.java
new file mode 100644
index 000000000..f3784ddc3
--- /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
index 000000000..66e907a43
--- /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
index 000000000..76878cc73
--- /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
index 000000000..2484ed83d
--- /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 b1910ee63..68bd94185 100644
--- 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"/>