Improved generic ITD tests.

diff --git a/tests/java5/generics/itds/A.java b/tests/java5/generics/itds/A.java
index f75d7f90a4110fecbf05e3657503990b2e80e94a..b54bcd1f6af59cd4c3d70fb2322bca3d649981d7 100644 (file)
--- 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 321d828b7f78dd1564c4a703a6320a5daa222152..72fb43415d1615e60b5ca5d952b84fdf62a9ba4b 100644 (file)
--- 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 536b6a84372547505e6edc32b49831cc39b74ada..b1a630cfc67af15009a85a0fe48a26ddd95112d1 100644 (file)
--- 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 {
+}