Author: ggregory
Date: Mon Nov 27 19:17:06 2017
New Revision: 1816496
URL: http://svn.apache.org/viewvc?rev=1816496&view=rev
Log:
Refactor test.
Modified:
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java
Modified:
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java?rev=1816496&r1=1816495&r2=1816496&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java
(original)
+++
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java
Mon Nov 27 19:17:06 2017
@@ -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) {
