Move the jdk-version-glob test to unit tests

Signed-off-by: Mats Wichmann <mats@linux.com>

1 files changed, 50 insertions, 0 deletions

diff --git a/src/engine/SCons/Tool/JavaCommonTests.py b/src/engine/SCons/Tool/JavaCommonTests.py
index 10be671..fe04ce9 100644
--- a/src/engine/SCons/Tool/JavaCommonTests.py
+++ b/src/engine/SCons/Tool/JavaCommonTests.py
@@ -30,6 +30,7 @@ import unittest
 import SCons.Scanner.IDL
 import SCons.Tool.JavaCommon
 
+import TestSCons
 
 # Adding trace=trace to any of the parse_jave() calls below will cause
 # the parser to spit out trace messages of the tokens it sees and the
@@ -608,6 +609,55 @@ public class AnonDemo {
         assert expect == classes, (expect, classes)
 
 
+    def test_jdk_globs(self):
+        test = TestSCons.TestSCons(workdir='')
+
+        if sys.platform == 'win32':
+            test.subdir(['Program Files'],
+                        ['Program Files', 'Java'],
+                        ['Program Files', 'Java', 'jdk1.8.0_201'],
+                        ['Program Files', 'Java', 'jdk1.8.0_201', 'bin'],
+                        ['Program Files', 'Java', 'jdk-11.0.2'],
+                        ['Program Files', 'Java', 'jdk-11.0.2', 'bin'])
+
+            test.write(['Program Files', 'Java', 'jdk1.8.0_201', 'bin', 'javac.exe'], "echo Java 1.8")
+            test.write(['Program Files', 'Java', 'jdk-11.0.2', 'bin', 'javac.exe'], "echo Java 11.0")
+        else:
+            test.subdir(['jvm'],
+                        ['jvm', 'java'],
+                        ['jvm', 'java', 'bin'],
+                        ['jvm', 'java-11-openjdk-11.0.2'],
+                        ['jvm', 'java-11-openjdk-11.0.2', 'bin'],
+                        ['jvm', 'java-1.8-openjdk-1.8.0'],
+                        ['jvm', 'java-1.8-openjdk-1.8.0', 'bin'])
+
+            test.write(['jvm', 'java', 'bin', 'javac'], "echo Java 1.8")
+            test.write(['jvm', 'java-11-openjdk-11.0.2', 'bin', 'javac'], "echo Java 11.0")
+            test.write(['jvm', 'java-1.8-openjdk-1.8.0', 'bin', 'javac'], "echo Java 1.8")
+
+        for version in (None, "1.8", "11.0"):
+            if version:
+                if sys.platform == 'win32':
+                    patterns = [
+                        'Program Files*/Java/jdk*%s*/bin' % version,
+                    ]
+                else:
+                    patterns = [
+                        'jvm/*-%s*/bin' % version,
+                    ]
+            else:
+                if sys.platform == 'win32':
+                    patterns = [
+                        'Program Files*/Java/jdk*/bin',
+                    ]
+                else:
+                    patterns = [
+                        'jvm/*/bin',
+                    ]
+            java_path = test.paths(patterns)
+            assert java_path, "no java found by pattern %s" % patterns[0]
+
+
 if __name__ == "__main__":
     unittest.main()