--- a/test/hotspot/jtreg/runtime/appcds/OldClassTest.java Thu Feb 15 09:22:25 2018 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/OldClassTest.java Wed Feb 14 07:08:25 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -65,11 +65,11 @@
OutputAnalyzer output = TestCommon.dump(jar, appClasses);
TestCommon.checkExecReturn(output, 0, true, "Pre JDK 1.5 class not supported by CDS");
- output = TestCommon.execCommon(
+ TestCommon.run(
"-cp", jar,
"-verbose:class",
- "Hello");
- TestCommon.checkExecReturn(output, 0, true, "Hello Unicode world (Old)");
+ "Hello")
+ .assertNormalExit("Hello Unicode world (Old)");
// CASE 2: if we exlcude old version of this class, we should not pick up
// the newer version of this class in a subsequent classpath element.
@@ -77,11 +77,11 @@
output = TestCommon.dump(classpath, appClasses);
TestCommon.checkExecReturn(output, 0, true, "Pre JDK 1.5 class not supported by CDS");
- output = TestCommon.execCommon(
+ TestCommon.run(
"-cp", classpath,
"-verbose:class",
- "Hello");
- TestCommon.checkExecReturn(output, 0, true, "Hello Unicode world (Old)");
+ "Hello")
+ .assertNormalExit("Hello Unicode world (Old)");
}
static void createTestJarFile(File jarSrcFile, File jarFile) throws Exception {