Generalize JVM source code expectations

The tests won't necessarily run with Java 11.

And if the Java version is 1.8 or earlier, use the second digit.

Author: ctrueden

src/scyjava/_introspect.py

@@ -99,7 +99,9 @@ def jsource(data) -> str:
         cls_path = str(jcls.getName()).replace(".", "/")
 
         # Discern the Java version.
-        java_version = jvm_version()[0]
+        jv_digits = jvm_version()
+        assert jv_digits is not None and len(jv_digits) > 1
+        java_version = jv_digits[1] if jv_digits[0] == 1 else jv_digits[0]
 
         # Note: some classes (e.g. corba and jaxp) will not be located correctly before
         # Java 10, because they fall under a different subtree than `jdk`. But Java 11+

tests/test_inspect.py

@@ -2,6 +2,8 @@
 Tests for functions in inspect submodule.
 """
 
+import re
+
 from scyjava import inspect
 from scyjava.config import mode, Mode
 
@@ -18,14 +20,16 @@ def test_inspect_members(self):
         members = []
         inspect.members("java.lang.Iterable", writer=members.append)
         expected = [
-            "Source code URL: "
-            "https://github.com/openjdk/jdk/blob/jdk-11-ga/"
-            "src/java.base/share/classes/java/lang/Iterable.java",
+            "Source code URL: https://github.com/openjdk/jdk/blob/"
+            ".../share/classes/java/lang/Iterable.java",
             "                         * indicates static modifier",
             "java.util.Iterator         = iterator()",
             "java.util.Spliterator      = spliterator()",
             "void                       = forEach(java.util.function.Consumer)",
             "",
             "",
         ]
-        assert "".join(members).split("\n") == expected
+        pattern = r"(https://github.com/openjdk/jdk/blob/)" \
+            "[^ ]*(/share/classes/java/lang/Iterable\.java)"
+        members_string = re.sub(pattern, r"\1...\2", "".join(members))
+        assert members_string.split("\n") == expected

tests/test_introspect.py

@@ -96,12 +96,12 @@ def test_jsource_jdk_class(self):
         if mode == Mode.JEP:
             # JEP does not support the jclass function.
             return
-        jv = scyjava.jvm_version()[0]
+        jv_digits = scyjava.jvm_version()
+        jv = jv_digits[1] if jv_digits[0] == 1 else jv_digits[0]
         source = scyjava.jsource("java.util.List")
-        assert (
-            source == f"https://github.com/openjdk/jdk/blob/jdk-{jv}-ga/"
-            "src/java.base/share/classes/java/util/List.java"
-        )
+        assert source.startswith(f"https://github.com/openjdk/jdk/blob/")
+        assert source.endswith("/share/classes/java/util/List.java")
+        assert str(jv) in source
 
     def test_imagej_legacy(self):
         if mode == Mode.JEP: