Remove all non-essential call sites of methods on Jvm.

This is so that we can eventually route the information it now contains through JavaRuntimeProvider.

RELNOTES: None.
PiperOrigin-RevId: 161196809

1 files changed, 6 insertions, 13 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java
index 5db130848c..c2dee96a2b 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java
@@ -28,12 +28,10 @@ import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.FileConfiguredTarget;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
-import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.util.AnalysisMock;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
-import com.google.devtools.build.lib.rules.java.Jvm;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -335,18 +333,13 @@ public class GenRuleConfiguredTargetTest extends BuildViewTestCase {
     Artifact javaOutput = getFileConfiguredTarget("//foo:java.txt").getArtifact();
     Artifact javabaseOutput = getFileConfiguredTarget("//foo:javabase.txt").getArtifact();
 
-    String expectedPattern = "echo %s > %s";
+    String javaCommand =
+        ((SpawnAction) getGeneratingAction(javaOutput)).getArguments().get(2);
+    assertThat(javaCommand).containsMatch("jdk/bin/java(.exe)? >");
 
-    BuildConfiguration hostConfig = getHostConfiguration();
-    String expectedJava = hostConfig.getFragment(Jvm.class).getJavaExecutable().getPathString();
-    String expectedJavabase = hostConfig.getFragment(Jvm.class).getJavaHome().getPathString();
-
-    assertCommandEquals(
-        String.format(expectedPattern, expectedJava, javaOutput.getExecPathString()),
-        ((SpawnAction) getGeneratingAction(javaOutput)).getArguments().get(2));
-    assertCommandEquals(
-        String.format(expectedPattern, expectedJavabase, javabaseOutput.getExecPathString()),
-        ((SpawnAction) getGeneratingAction(javabaseOutput)).getArguments().get(2));
+    String javabaseCommand =
+        ((SpawnAction) getGeneratingAction(javabaseOutput)).getArguments().get(2);
+    assertThat(javabaseCommand).contains("jdk >");
   }
 
   // Returns the expansion of 'cmd' for the specified genrule.