8179930: jdk.test.lib.artifacts.ArtifactResolver::resolve should return Map instead of HashMap
Reviewed-by: mseledtsov, gtriantafill, vlivanov
--- a/hotspot/test/applications/jcstress/JcstressRunner.java Thu May 11 09:42:19 2017 -0700
+++ b/hotspot/test/applications/jcstress/JcstressRunner.java Thu May 11 16:35:02 2017 -0700
@@ -35,7 +35,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Map;
import java.util.List;
/**
@@ -48,7 +48,7 @@
public static final String MAIN_CLASS = "org.openjdk.jcstress.Main";
public static Path pathToArtifact() {
- HashMap<String, Path> artifacts;
+ Map<String, Path> artifacts;
try {
artifacts = ArtifactResolver.resolve(JcstressRunner.class);
} catch (FileNotFoundException e) {
--- a/hotspot/test/applications/scimark/Scimark.java Thu May 11 09:42:19 2017 -0700
+++ b/hotspot/test/applications/scimark/Scimark.java Thu May 11 16:35:02 2017 -0700
@@ -32,12 +32,12 @@
import jdk.test.lib.artifacts.Artifact;
import jdk.test.lib.artifacts.ArtifactResolver;
import java.nio.file.Path;
-import java.util.HashMap;
+import java.util.Map;
@Artifact(organization = "gov.nist.math", name = "scimark", revision = "2.0", extension = "zip")
public class Scimark {
public static void main(String... args) throws Exception {
- HashMap<String, Path> artifacts = ArtifactResolver.resolve(Scimark.class);
+ Map<String, Path> artifacts = ArtifactResolver.resolve(Scimark.class);
OutputAnalyzer output = new OutputAnalyzer(ProcessTools.createJavaProcessBuilder(
"-cp", artifacts.get("gov.nist.math.scimark-2.0").toString(),