< prev index next >
jdk/test/java/lang/Runtime/Version/Basic.java
Print this page
@@ -21,24 +21,24 @@
* questions.
*/
/*
* @test
- * @summary Unit test for jdk.Version.
- * @bug 8072379
+ * @summary Unit test for java.lang.Runtime.Version.
+ * @bug 8072379 8144062
*/
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.lang.Runtime.Version;
import java.math.BigInteger;
import java.util.stream.Collectors;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
-import jdk.Version;
import static java.lang.System.out;
public class Basic {
private static final Class<? extends Throwable> IAE
= IllegalArgumentException.class;
@@ -114,12 +114,12 @@
tryCatch("9-pre+-opt", IAE);
tryCatch("1.4142+-", IAE);
tryCatch("2.9979+-%", IAE);
- //// Test for current()
- testCurrent();
+ //// Test for Runtime.version()
+ testVersion();
//// Test for equals{IgnoreOpt}?(), hashCode(), compareTo{IgnoreOpt}?()
// compare: after "<" == -1, equal == 0, before ">" == 1
// v0 v1 eq eqNO cmp cmpNO
testEHC("9", "9", true, true, 0, 0);
@@ -217,22 +217,23 @@
fail(s, ex);
else
pass();
}
- private static void testCurrent() {
- Version current = Version.current();
- String javaVer = System.getProperty("java.version");
+ private static void testVersion() {
+ Version current = Runtime.version();
+ String javaVer = System.getProperty("java.runtime.version");
- // java.version == $VNUM(\-$PRE)
- String [] ver = javaVer.split("-");
+ // java.runtime.version == $VNUM(\-$PRE)?(\+$BUILD)?(-$OPT)?
+ String [] jv = javaVer.split("\\+");
+ String [] ver = jv[0].split("-");
List<Integer> javaVerVNum
= Arrays.stream(ver[0].split("\\."))
.map(v -> Integer.parseInt(v))
.collect(Collectors.toList());
if (!javaVerVNum.equals(current.version())) {
- fail("testCurrent() version()", javaVerVNum.toString(),
+ fail("Runtime.version()", javaVerVNum.toString(),
current.version().toString());
} else {
pass();
}
< prev index next >