[commons-bcel] branch master updated: Make testing of extra Java installations easier.

[gg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git


The following commit(s) were added to refs/heads/master by this push:
     new e280662  Make testing of extra Java installations easier.
e280662 is described below

commit e280662fdf9abcff8c68469f4efb2e5ebc070893
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jan 6 11:50:23 2020 -0500

    Make testing of extra Java installations easier.
---
 .../java/org/apache/bcel/generic/JdkGenericDumpTestCase.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java b/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
index d891741..4bef3be 100644
--- a/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
@@ -165,18 +165,21 @@ public class JdkGenericDumpTestCase {
         addAllJavaHomesOnWindows(KEY_JRE_9, javaHomes);
         addAllJavaHomesOnWindows(KEY_JDK, javaHomes);
         addAllJavaHomesOnWindows(KEY_JDK_9, javaHomes);
-        addAllJavaHomes(EXTRA_JAVA_HOMES, javaHomes);
+        addAllJavaHomesFromKey(EXTRA_JAVA_HOMES, javaHomes);
         return javaHomes;
     }
 
-    private static void addAllJavaHomes(final String extraJavaHomesProp, final Set<String> javaHomes) {
-        final String path = System.getProperty(extraJavaHomesProp);
+    private static void addAllJavaHomesFromKey(final String extraJavaHomesKey, final Set<String> javaHomes) {
+        addAllJavaHomesFromPath(javaHomes, System.getProperty(extraJavaHomesKey));
+        addAllJavaHomesFromPath(javaHomes, System.getenv(extraJavaHomesKey));
+    }
+
+    private static void addAllJavaHomesFromPath(final Set<String> javaHomes, final String path) {
         if (StringUtils.isEmpty(path)) {
             return;
         }
         final String[] paths = path.split(File.pathSeparator);
         javaHomes.addAll(Arrays.asList(paths));
-
     }
 
     private static Set<String> findJavaHomesOnWindows(final String keyJavaHome, final String[] keys) {