Ensure that only ObjC tests initialize the MockObjcSupport.

PiperOrigin-RevId: 189181919

1 files changed, 6 insertions, 2 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 70842812a8..20ac616e1b 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -217,8 +217,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
             analysisMock.getProductName());
     actionKeyContext = new ActionKeyContext();
     mockToolsConfig = new MockToolsConfig(rootDirectory, false);
-    analysisMock.setupMockClient(mockToolsConfig);
-    analysisMock.setupMockWorkspaceFiles(directories.getEmbeddedBinariesRoot());
+    initializeMockClient();
 
     packageCacheOptions = parsePackageCacheOptions();
     skylarkSemanticsOptions = parseSkylarkSemanticsOptions();
@@ -281,6 +280,11 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
     ResourceManager.instance().setAvailableResources(getStartingResources());
   }
 
+  public void initializeMockClient() throws IOException {
+    analysisMock.setupMockClient(mockToolsConfig);
+    analysisMock.setupMockWorkspaceFiles(directories.getEmbeddedBinariesRoot());
+  }
+
   protected Map<String, String> getPlatformSetRegexps() {
     return null;
   }