Skip to content

Commit 4133ac7

Browse files
committed
ObjectIndexTest: make tests pass with OpenJDK 12
Closes #474.
1 parent 41f3136 commit 4133ac7

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

src/test/java/org/scijava/object/ObjectIndexTest.java

+18-7
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import static org.junit.Assert.assertTrue;
3737

3838
import java.util.ArrayList;
39+
import java.util.Arrays;
3940
import java.util.Iterator;
4041
import java.util.List;
4142

@@ -209,15 +210,25 @@ public void testToString() {
209210
objectIndex.add(new Integer(5));
210211
objectIndex.add(new Float(2.5f));
211212
objectIndex.add(new Integer(3));
212-
final String[] expected =
213-
{ "java.io.Serializable: {5, 2.5, 3}",
214-
"java.lang.Comparable: {5, 2.5, 3}", "java.lang.Float: {2.5}",
215-
"java.lang.Integer: {5, 3}", "java.lang.Number: {5, 2.5, 3}",
216-
"java.lang.Object: {5, 2.5, 3}",
217-
"org.scijava.object.ObjectIndex$All: {5, 2.5, 3}" };
213+
214+
final List<String> expected = new ArrayList<>();
215+
expected.addAll(Arrays.asList(
216+
"java.io.Serializable: {5, 2.5, 3}",
217+
"java.lang.Comparable: {5, 2.5, 3}", "java.lang.Float: {2.5}",
218+
"java.lang.Integer: {5, 3}", "java.lang.Number: {5, 2.5, 3}",
219+
"java.lang.Object: {5, 2.5, 3}"
220+
));
221+
final String[] javaVersion = System.getProperty("java.version").split("\\.");
222+
final int majorVersion = Integer.parseInt(javaVersion[0]);
223+
if (majorVersion >= 12) {
224+
expected.add("java.lang.constant.Constable: {5, 2.5, 3}");
225+
expected.add("java.lang.constant.ConstantDesc: {5, 2.5, 3}");
226+
}
227+
expected.add("org.scijava.object.ObjectIndex$All: {5, 2.5, 3}");
228+
218229
final String[] actual =
219230
objectIndex.toString().split(System.getProperty("line.separator"));
220-
assertArrayEquals(expected, actual);
231+
assertArrayEquals(expected.toArray(), actual);
221232
}
222233

223234
}

0 commit comments

Comments
 (0)