Fix API usage against JDK 1.5.0.
diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/ExecEnvPoolTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/ExecEnvPoolTest.java
index 57995ab..ce9a8dc 100644
--- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/ExecEnvPoolTest.java
+++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/ExecEnvPoolTest.java
@@ -164,7 +164,7 @@
}
execSvc.shutdown();
- final boolean finished = execSvc.awaitTermination(1, TimeUnit.MINUTES);
+ final boolean finished = execSvc.awaitTermination(60, TimeUnit.SECONDS);
if (!finished) {
LOG.info(String.format("ExecEnvPoolTest#testEcoreCopyPerformance Timed out; %d runs completed", timings.size()));
}
diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagTest.java
index f5c9d77..59369d3 100644
--- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagTest.java
+++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyBagTest.java
@@ -367,9 +367,8 @@
final long refStart2 = System.nanoTime();
Collections.sort(expected2, new Comparator<Object>() {
public int compare(Object o1, Object o2) {
- return Integer.compare(
- (Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1)),
- (Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o2)));
+ return ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1))).compareTo(
+ ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o2))));
}
});
final long refEnd2 = System.nanoTime();
diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListTest.java
index 18b6c38..d27a984 100644
--- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListTest.java
+++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyListTest.java
@@ -777,9 +777,8 @@
final long refStart2 = System.nanoTime();
Collections.sort(expected2, new Comparator<Object>() {
public int compare(Object o1, Object o2) {
- return Integer.compare(
- (Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1)),
- (Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o2)));
+ return ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1))).compareTo(
+ ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o2))));
}
});
final long refEnd2 = System.nanoTime();
diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyOrderedSetTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyOrderedSetTest.java
index 51eaa00..4ea0587 100644
--- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyOrderedSetTest.java
+++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazyOrderedSetTest.java
@@ -948,9 +948,8 @@
final long refStart2 = System.nanoTime();
Collections.sort(expected2, new Comparator<Object>() {
public int compare(Object o1, Object o2) {
- return Integer.compare(
- (Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1)),
- (Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o2)));
+ return ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1))).compareTo(
+ ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o2))));
}
});
final long refEnd2 = System.nanoTime();
diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetTest.java
index 1c4dad4..7500535 100644
--- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetTest.java
+++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/util/tests/LazySetTest.java
@@ -435,9 +435,8 @@
final long refStart2 = System.nanoTime();
Collections.sort(expected2, new Comparator<Object>() {
public int compare(Object o1, Object o2) {
- return Integer.compare(
- (Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1)),
- (Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o2)));
+ return ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o1))).compareTo(
+ ((Integer) byHashCode.execute(byHashCode.getParentFrame().getSubFrame(byHashCode, o2))));
}
});
final long refEnd2 = System.nanoTime();
