diff options
| author | Gary D. Gregory <ggregory@apache.org> | 2017-11-27 19:17:06 +0000 |
|---|---|---|
| committer | Gary D. Gregory <ggregory@apache.org> | 2017-11-27 19:17:06 +0000 |
| commit | 6faa7858155e8311890f14e486f43d5f8cd69835 (patch) | |
| tree | 889d1934b4e9802e3e73c86c43dc020c0d31d55e | |
| parent | db6cf117a225ff973a44972c5fba128b1228a99d (diff) | |
| download | apache-commons-bcel-6faa7858155e8311890f14e486f43d5f8cd69835.tar.gz | |
Refactor test.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/bcel/trunk@1816496 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java b/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java index 580216ae..957dfc84 100644 --- a/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java +++ b/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java @@ -75,15 +75,17 @@ public class JDKGenericDumpTestCase { private static Set<String> findJavaHomesOnWindows() { Set<String> javaHomes = new HashSet<>(); - javaHomes.addAll(findJavaHomesOnWindows(KEY_JRE, Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, KEY_JRE))); - javaHomes - .addAll(findJavaHomesOnWindows(KEY_JRE_9, Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, KEY_JRE_9))); - javaHomes.addAll(findJavaHomesOnWindows(KEY_JDK, Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, KEY_JDK))); - javaHomes - .addAll(findJavaHomesOnWindows(KEY_JDK_9, Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, KEY_JDK_9))); + addAllJavaHomesOnWindows(KEY_JRE, javaHomes); + addAllJavaHomesOnWindows(KEY_JRE_9, javaHomes); + addAllJavaHomesOnWindows(KEY_JDK, javaHomes); + addAllJavaHomesOnWindows(KEY_JDK_9, javaHomes); return javaHomes; } + private static void addAllJavaHomesOnWindows(final String keyJre, Set<String> javaHomes) { + javaHomes.addAll(findJavaHomesOnWindows(keyJre, Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, keyJre))); + } + private static Set<String> findJavaHomesOnWindows(String keyJavaHome, final String[] keys) { final Set<String> javaHomes = new HashSet<>(keys.length); for (final String key : keys) { |