Ensure that only ObjC tests initialize the MockObjcSupport.

PiperOrigin-RevId: 189181919

4 files changed, 14 insertions, 12 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;
   }
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
index 9408a49b42..5010faf11d 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
@@ -183,7 +183,6 @@ public final class BazelMockCcSupport extends MockCcSupport {
     } else {
       config.create("tools/cpp/link_dynamic_library.sh", "");
     }
-    MockObjcSupport.setup(config);
     MockPlatformSupport.setup(config, "/bazel_tools_workspace/platforms");
     MockPlatformSupport.setup(config, "/bazel_tools_workspace/");
   }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java
index a7ca2273c2..e49d6477fb 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java
@@ -31,7 +31,7 @@ import com.google.devtools.build.lib.rules.cpp.CppLinkAction;
 import com.google.devtools.build.lib.rules.cpp.Link;
 import com.google.devtools.build.lib.rules.cpp.LinkBuildVariablesTestCase;
 import com.google.devtools.build.lib.testutil.TestConstants;
-import org.junit.Before;
+import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -43,8 +43,9 @@ import org.junit.runners.JUnit4;
 @RunWith(JUnit4.class)
 public class ObjcBuildVariablesTest extends LinkBuildVariablesTestCase {
 
-  @Before
-  public void initializeToolsConfigMock() throws Exception {
+  @Override
+  public void initializeMockClient() throws IOException {
+    super.initializeMockClient();
     MockObjcSupport.setup(mockToolsConfig);
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
index 40fefa60aa..ad8e91b80a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
@@ -85,6 +85,7 @@ import com.google.devtools.build.xcode.bundlemerge.proto.BundleMergeProtos;
 import com.google.devtools.build.xcode.bundlemerge.proto.BundleMergeProtos.BundleFile;
 import com.google.devtools.build.xcode.bundlemerge.proto.BundleMergeProtos.MergeZip;
 import com.google.devtools.build.xcode.plmerge.proto.PlMergeProtos;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -95,7 +96,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import javax.annotation.Nullable;
-import org.junit.Before;
 
 /**
  * Superclass for all Obj-C rule tests.
@@ -260,13 +260,11 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
     return getFirstArtifactEndingWith(artifacts, suffix).getExecPathString();
   }
 
-  @Before
-  public final void initializeMockToolsConfig() throws Exception {
+  @Override
+  public void initializeMockClient() throws IOException {
+    super.initializeMockClient();
     MockObjcSupport.setup(mockToolsConfig);
     MockProtoSupport.setup(mockToolsConfig);
-
-    // Set flags required by objc builds.
-    useConfiguration();
   }
 
   protected static String frameworkDir(ConfiguredTarget target) {