fix: accept either JRE 8 or JRE 9 style classpath in test (#3972)

kythe · Aug 8, 2019 · 3ea7de6 · 3ea7de6
1 parent f95e439
commit 3ea7de6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/kythe/javatests/com/google/devtools/kythe/platform/java/OptionsTest.java b/kythe/javatests/com/google/devtools/kythe/platform/java/OptionsTest.java
@@ -143,7 +143,7 @@ public void updateWithJavaOptions_updatesBootClassPath() {
     int idx = updatedArgs.indexOf("--boot-class-path");
     assertThat(updatedArgs).hasSize(idx + 2);
     assertThat(updatedArgs.get(idx + 1)).startsWith("not/a/real/path:also/fake");
-    assertThat(updatedArgs.get(idx + 1)).contains("lib/modules");
+    assertThat(updatedArgs.get(idx + 1)).matches(".*(\\.jar|lib/modules)");
   }
 
   @Test
@@ -157,7 +157,7 @@ public void updateWithJavaOptions_emptyDetailsAddsBootClassPath() {
         .startsWith("not/a/real/path:also/fake");
 
     assertThat(updatedArgs.get(updatedArgs.indexOf("--boot-class-path") + 1))
-        .contains("lib/modules");
+        .matches(".*(\\.jar|lib/modules)");
   }
 
   @Test
@@ -206,6 +206,6 @@ public void updateWithJavaOptions_updatesSomePathsFromDetails() {
     assertThat(updatedArgs.get(updatedArgs.indexOf("--source-path") + 1))
         .matches("source/from/details");
     assertThat(updatedArgs.get(updatedArgs.indexOf("--boot-class-path") + 1))
-        .contains("lib/modules");
+        .matches(".*(\\.jar|lib/modules)");
   }
 }