summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2005-06-08 08:46:20 +0000
committeraclement <aclement>2005-06-08 08:46:20 +0000
commit36b591b08a5760d6189c9dd467e96f1574be7951 (patch)
tree946b127e578d0583b6dd0c09488f800e8dcf36a6
parent1eb4ca895e3219f6448d71114953a786b8edd217 (diff)
downloadaspectj-36b591b08a5760d6189c9dd467e96f1574be7951.tar.gz
aspectj-36b591b08a5760d6189c9dd467e96f1574be7951.zip
Improved generic ITD tests.
-rw-r--r--tests/java5/generics/itds/A.java2
-rw-r--r--tests/java5/generics/itds/B.java2
-rw-r--r--tests/java5/generics/itds/C.java3
3 files changed, 5 insertions, 2 deletions
diff --git a/tests/java5/generics/itds/A.java b/tests/java5/generics/itds/A.java
index f75d7f90a..b54bcd1f6 100644
--- a/tests/java5/generics/itds/A.java
+++ b/tests/java5/generics/itds/A.java
@@ -10,7 +10,7 @@ public class A {
aspect X {
<T extends Number> T Utils.max(T first,T second) {
- if (first>second) return first; else return second;
+ if (first.intValue()>second.intValue()) return first; else return second;
}
}
diff --git a/tests/java5/generics/itds/B.java b/tests/java5/generics/itds/B.java
index 321d828b7..72fb43415 100644
--- a/tests/java5/generics/itds/B.java
+++ b/tests/java5/generics/itds/B.java
@@ -10,7 +10,7 @@ public class B {
aspect X {
static <T extends Number> T Utils.max(T first,T second) {
- if (first>second) return first; else return second;
+ if (first.intValue()>second.intValue()) return first; else return second;
}
}
diff --git a/tests/java5/generics/itds/C.java b/tests/java5/generics/itds/C.java
index 536b6a843..b1a630cfc 100644
--- a/tests/java5/generics/itds/C.java
+++ b/tests/java5/generics/itds/C.java
@@ -6,3 +6,6 @@ public abstract aspect C<T> {
return (this.data!=null?data:defaultValue);
}
}
+
+class Foo {
+}