Replace nearly all test uses of ConfiguredTarget#getConfiguration with utility method getConfiguration(ConfiguredTarget). Done using IntelliJ structural replace, with

$val$.getConfiguration() -> getConfiguration($val$)

and Expression type: TransitiveInfoCollection, applying constraint within type hierarchy. Had to clean up a few compile errors.

PiperOrigin-RevId: 190692493

17 files changed, 110 insertions, 113 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index bcbee28f47..61076f9111 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -343,7 +343,7 @@ public class BuildViewTest extends BuildViewTestBase {
         "sh_binary(name = 'binary', srcs = ['binary.sh'])");
     ConfiguredTarget ct = Iterables.getOnlyElement(update("//package:binary").getTargetsToBuild());
     BuildConfiguration.Options options =
-        ct.getConfiguration().getOptions().get(BuildConfiguration.Options.class);
+        getConfiguration(ct).getOptions().get(BuildConfiguration.Options.class);
     assertThat(options.hostCpu).isEqualTo("$CONFIG HOOK 1");
   }
 
@@ -357,7 +357,7 @@ public class BuildViewTest extends BuildViewTestBase {
         "sh_binary(name = 'binary', srcs = ['binary.sh'])");
     ConfiguredTarget ct = Iterables.getOnlyElement(update("//package:binary").getTargetsToBuild());
     BuildConfiguration.Options options =
-        ct.getConfiguration().getOptions().get(BuildConfiguration.Options.class);
+        getConfiguration(ct).getOptions().get(BuildConfiguration.Options.class);
     assertThat(options.hostCpu).isEqualTo("$CONFIG HOOK 1$CONFIG HOOK 2");
   }
 
@@ -1240,7 +1240,7 @@ public class BuildViewTest extends BuildViewTestBase {
     useConfiguration("--experimental_dynamic_configs=on");
     AnalysisResult res = update("//foo:x");
     ConfiguredTarget topLevelTarget = Iterables.getOnlyElement(res.getTargetsToBuild());
-    assertThat(topLevelTarget.getConfiguration().getFragmentsMap().keySet())
+    assertThat(getConfiguration(topLevelTarget).getFragmentsMap().keySet())
         .containsExactly(ruleClassProvider.getUniversalFragment());
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/ConfigurationsForLateBoundTargetsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/ConfigurationsForLateBoundTargetsTest.java
index 75e51e4aec..3696c59a27 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/ConfigurationsForLateBoundTargetsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/ConfigurationsForLateBoundTargetsTest.java
@@ -95,8 +95,8 @@ public class ConfigurationsForLateBoundTargetsTest extends AnalysisTestCase {
     ConfiguredTarget dep = Iterables.getOnlyElement(
         SkyframeExecutorTestUtils.getExistingConfiguredTargets(
             skyframeExecutor, Label.parseAbsolute("//foo:latebound_dep")));
-    assertThat(dep.getConfiguration()).isNotEqualTo(getTargetConfiguration());
-    assertThat(LateBoundSplitUtil.getOptions(dep.getConfiguration()).fooFlag).isEqualTo("PATCHED!");
+    assertThat(getConfiguration(dep)).isNotEqualTo(getTargetConfiguration());
+    assertThat(LateBoundSplitUtil.getOptions(getConfiguration(dep)).fooFlag).isEqualTo("PATCHED!");
   }
 
   @Test
@@ -117,10 +117,10 @@ public class ConfigurationsForLateBoundTargetsTest extends AnalysisTestCase {
     ConfiguredTarget dep = Iterables.getOnlyElement(
         SkyframeExecutorTestUtils.getExistingConfiguredTargets(
             skyframeExecutor, Label.parseAbsolute("//foo:latebound_dep")));
-    assertThat(dep.getConfiguration()).isEqualTo(getHostConfiguration());
+    assertThat(getConfiguration(dep)).isEqualTo(getHostConfiguration());
     // This is technically redundant, but slightly stronger in sanity checking that the host
     // configuration doesn't happen to match what the patch would have done.
-    assertThat(LateBoundSplitUtil.getOptions(dep.getConfiguration()).fooFlag).isEmpty();
+    assertThat(LateBoundSplitUtil.getOptions(getConfiguration(dep)).fooFlag).isEmpty();
   }
 
   @Test
@@ -136,9 +136,9 @@ public class ConfigurationsForLateBoundTargetsTest extends AnalysisTestCase {
         skyframeExecutor, Label.parseAbsolute("//foo:latebound_dep"));
     assertThat(deps).hasSize(2);
     assertThat(
-        ImmutableList.of(
-            LateBoundSplitUtil.getOptions(Iterables.get(deps, 0).getConfiguration()).fooFlag,
-            LateBoundSplitUtil.getOptions(Iterables.get(deps, 1).getConfiguration()).fooFlag))
+            ImmutableList.of(
+                LateBoundSplitUtil.getOptions(getConfiguration(Iterables.get(deps, 0))).fooFlag,
+                LateBoundSplitUtil.getOptions(getConfiguration(Iterables.get(deps, 1))).fooFlag))
         .containsExactly("one", "two");
   }
 
@@ -160,9 +160,9 @@ public class ConfigurationsForLateBoundTargetsTest extends AnalysisTestCase {
     ConfiguredTarget dep = Iterables.getOnlyElement(
         SkyframeExecutorTestUtils.getExistingConfiguredTargets(
             skyframeExecutor, Label.parseAbsolute("//foo:latebound_dep")));
-    assertThat(dep.getConfiguration()).isEqualTo(getHostConfiguration());
+    assertThat(getConfiguration(dep)).isEqualTo(getHostConfiguration());
     // This is technically redundant, but slightly stronger in sanity checking that the host
     // configuration doesn't happen to match what the split would have done.
-    assertThat(LateBoundSplitUtil.getOptions(dep.getConfiguration()).fooFlag).isEmpty();
+    assertThat(LateBoundSplitUtil.getOptions(getConfiguration(dep)).fooFlag).isEmpty();
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/OutputFileConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/analysis/OutputFileConfiguredTargetTest.java
index be97295b71..220a5048a4 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/OutputFileConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/OutputFileConfiguredTargetTest.java
@@ -105,8 +105,7 @@ public class OutputFileConfiguredTargetTest extends BuildViewTestBase {
         getConfiguredTargetAndData("//foo:host_src3.cc", getHostConfiguration());
     TransitiveInfoCollection hostGeneratedFileConsumer3 =
         ((OutputFileConfiguredTarget) hostSrc3.getConfiguredTarget()).getGeneratingRule();
-    assertThat(hostSrc3.getConfiguration())
-        .isEqualTo(hostGeneratedFileConsumer3.getConfiguration());
+    assertThat(hostSrc3.getConfiguration()).isEqualTo(getConfiguration(hostGeneratedFileConsumer3));
     // TODO(gregce): enable below for Bazel tests, which for some reason realize the same instance
 //    assertThat(hostSrc3.getConfiguration())
 //        .isNotSameAs(hostGeneratedFileConsumer3.getConfiguration());
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index ccf67ee88b..768afe2a6a 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -31,6 +31,7 @@ import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.ServerDirectories;
+import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection;
@@ -455,7 +456,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase {
         reporter, parsedLabel, configuration);
   }
 
-  protected final BuildConfiguration getConfiguration(ConfiguredTarget ct) {
+  protected final BuildConfiguration getConfiguration(TransitiveInfoCollection ct) {
     return skyframeExecutor.getConfiguration(reporter, ct.getConfigurationKey());
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestBase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestBase.java
index de4cc1eccb..5a78e5e80e 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestBase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestBase.java
@@ -140,7 +140,7 @@ public abstract class BuildViewTestBase extends AnalysisTestCase {
     AnalysisResult result = getAnalysisResult();
     assertThat(result.getTargetsToBuild()).hasSize(1);
     ConfiguredTarget targetA = Iterables.get(result.getTargetsToBuild(), 0);
-    assertThat(targetA.getConfiguration().getCpu()).isEqualTo(goodCpu);
+    assertThat(getConfiguration(targetA).getCpu()).isEqualTo(goodCpu);
     // Unfortunately, we get the same error twice - we can't distinguish the configurations.
     assertContainsEvent("if genrules produce executables, they are allowed only one output");
   }
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 44f7ecdbfe..5f37d87b8b 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
@@ -1123,7 +1123,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
   protected final Artifact getBinArtifact(String packageRelativePath, ConfiguredTarget owner) {
     return getPackageRelativeDerivedArtifact(
         packageRelativePath,
-        owner.getConfiguration().getBinDirectory(RepositoryName.MAIN),
+        getConfiguration(owner).getBinDirectory(RepositoryName.MAIN),
         ConfiguredTargetKey.of(
             owner, skyframeExecutor.getConfiguration(reporter, owner.getConfigurationKey())));
   }
@@ -1159,13 +1159,13 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
       AspectParameters parameters) {
     return getPackageRelativeDerivedArtifact(
         packageRelativePath,
-        owner.getConfiguration().getBinDirectory(RepositoryName.MAIN),
+        getConfiguration(owner).getBinDirectory(RepositoryName.MAIN),
         (AspectValue.AspectKey)
             AspectValue.createAspectKey(
                     owner.getLabel(),
-                    owner.getConfiguration(),
+                    getConfiguration(owner),
                     new AspectDescriptor(creatingAspectFactory, parameters),
-                    owner.getConfiguration())
+                    getConfiguration(owner))
                 .argument());
   }
 
@@ -1229,15 +1229,14 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
       AspectParameters params) {
     return getPackageRelativeDerivedArtifact(
         packageRelativePath,
-        owner
-            .getConfiguration()
+        getConfiguration(owner)
             .getGenfilesDirectory(owner.getLabel().getPackageIdentifier().getRepository()),
         (AspectValue.AspectKey)
             AspectValue.createAspectKey(
                     owner.getLabel(),
-                    owner.getConfiguration(),
+                    getConfiguration(owner),
                     new AspectDescriptor(creatingAspectFactory, params),
-                    owner.getConfiguration())
+                    getConfiguration(owner))
                 .argument());
   }
 
@@ -1602,7 +1601,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
   private BuildConfiguration getConfiguration(String label) {
     BuildConfiguration config;
     try {
-      config = getConfiguredTarget(label).getConfiguration();
+      config = getConfiguration(getConfiguredTarget(label));
       config = view.getConfigurationForTesting(getTarget(label), config, reporter);
     } catch (LabelSyntaxException e) {
       throw new IllegalArgumentException(e);
@@ -2022,7 +2021,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
   protected Artifact getImplicitOutputArtifact(
       ConfiguredTarget target, SafeImplicitOutputsFunction outputFunction) {
     return getImplicitOutputArtifact(
-        target, target.getConfiguration(), target.getConfiguration(), outputFunction);
+        target, getConfiguration(target), getConfiguration(target), outputFunction);
   }
 
   protected final Artifact getImplicitOutputArtifact(
@@ -2045,7 +2044,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
     } else {
       root = configuration.getGenfilesDirectory(repository);
     }
-    ArtifactOwner owner = ConfiguredTargetKey.of(target.getLabel(), target.getConfiguration());
+    ArtifactOwner owner = ConfiguredTargetKey.of(target.getLabel(), getConfiguration(target));
 
     RawAttributeMapper attr = RawAttributeMapper.of(associatedRule);
 
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 c4a040069c..e0f16892e0 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
@@ -480,16 +480,16 @@ public class GenRuleConfiguredTargetTest extends BuildViewTestCase {
       }
       switch (name) {
         case "src":
-          assertConfigurationsEqual(getTargetConfiguration(), prereq.getConfiguration());
+          assertConfigurationsEqual(getTargetConfiguration(), getConfiguration(prereq));
           foundSrc = true;
           break;
         case "tool":
-          assertThat(getHostConfiguration().equalsOrIsSupersetOf(prereq.getConfiguration()))
+          assertThat(getHostConfiguration().equalsOrIsSupersetOf(getConfiguration(prereq)))
               .isTrue();
           foundTool = true;
           break;
         case GENRULE_SETUP_PATH:
-          assertThat(prereq.getConfiguration()).isNull();
+          assertThat(getConfiguration(prereq)).isNull();
           foundSetup = true;
           break;
         default:
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index 3a4015fb20..9b81ffcd66 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -1602,8 +1602,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
 
     // No prefix should be added because of resource filtering.
     assertThat(
-            binary
-                .getConfiguration()
+            getConfiguration(binary)
                 .getFragment(AndroidConfiguration.class)
                 .getOutputDirectoryName())
         .isNull();
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
index d1a3954e94..e9bbb6e7de 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
@@ -1590,8 +1590,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
     ConfiguredTarget genruleTarget = getConfiguredTarget("//java/srclessdeps:some_genrule");
     ConfiguredTarget target = getDirectPrerequisite(genruleTarget, "//java/srclessdeps:foo");
     assertThat(
-            target
-                .getConfiguration()
+            getConfiguration(target)
                 .getFragment(AndroidConfiguration.class)
                 .allowSrcsLessAndroidLibraryDeps())
         .isTrue();
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java
index c34e1ccdcc..7957e5d697 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java
@@ -76,11 +76,11 @@ public class AndroidSkylarkTest extends BuildViewTestCase {
     assertThat(splitDeps).containsKey("armeabi-v7a");
     assertThat(splitDeps.get("k8")).hasSize(2);
     assertThat(splitDeps.get("armeabi-v7a")).hasSize(2);
-    assertThat(splitDeps.get("k8").get(0).getConfiguration().getCpu()).isEqualTo("k8");
-    assertThat(splitDeps.get("k8").get(1).getConfiguration().getCpu()).isEqualTo("k8");
-    assertThat(splitDeps.get("armeabi-v7a").get(0).getConfiguration().getCpu())
+    assertThat(getConfiguration(splitDeps.get("k8").get(0)).getCpu()).isEqualTo("k8");
+    assertThat(getConfiguration(splitDeps.get("k8").get(1)).getCpu()).isEqualTo("k8");
+    assertThat(getConfiguration(splitDeps.get("armeabi-v7a").get(0)).getCpu())
         .isEqualTo("armeabi-v7a");
-    assertThat(splitDeps.get("armeabi-v7a").get(1).getConfiguration().getCpu())
+    assertThat(getConfiguration(splitDeps.get("armeabi-v7a").get(1)).getCpu())
         .isEqualTo("armeabi-v7a");
 
     // Check that ctx.split_attr.dep has this structure (that is, that the values are not lists):
@@ -93,8 +93,8 @@ public class AndroidSkylarkTest extends BuildViewTestCase {
         (Map<String, ConfiguredTarget>) target.get("split_attr_dep");
     assertThat(splitDep).containsKey("k8");
     assertThat(splitDep).containsKey("armeabi-v7a");
-    assertThat(splitDep.get("k8").getConfiguration().getCpu()).isEqualTo("k8");
-    assertThat(splitDep.get("armeabi-v7a").getConfiguration().getCpu()).isEqualTo("armeabi-v7a");
+    assertThat(getConfiguration(splitDep.get("k8")).getCpu()).isEqualTo("k8");
+    assertThat(getConfiguration(splitDep.get("armeabi-v7a")).getCpu()).isEqualTo("armeabi-v7a");
 
     // The regular ctx.attr.deps should be a single list with all the branches of the split merged
     // together (i.e. for aspects).
@@ -103,7 +103,7 @@ public class AndroidSkylarkTest extends BuildViewTestCase {
     assertThat(attrDeps).hasSize(4);
     ListMultimap<String, Object> attrDepsMap = ArrayListMultimap.create();
     for (ConfiguredTarget ct : attrDeps) {
-      attrDepsMap.put(ct.getConfiguration().getCpu(), target);
+      attrDepsMap.put(getConfiguration(ct).getCpu(), target);
     }
     assertThat(attrDepsMap).valuesForKey("k8").hasSize(2);
     assertThat(attrDepsMap).valuesForKey("armeabi-v7a").hasSize(2);
@@ -115,7 +115,7 @@ public class AndroidSkylarkTest extends BuildViewTestCase {
     assertThat(attrDep).hasSize(2);
     ListMultimap<String, Object> attrDepMap = ArrayListMultimap.create();
     for (ConfiguredTarget ct : attrDep) {
-      attrDepMap.put(ct.getConfiguration().getCpu(), target);
+      attrDepMap.put(getConfiguration(ct).getCpu(), target);
     }
     assertThat(attrDepMap).valuesForKey("k8").hasSize(1);
     assertThat(attrDepMap).valuesForKey("armeabi-v7a").hasSize(1);
@@ -124,8 +124,8 @@ public class AndroidSkylarkTest extends BuildViewTestCase {
     @SuppressWarnings("unchecked")
     List<ConfiguredTarget> k8Deps = (List<ConfiguredTarget>) target.get("k8_deps");
     assertThat(k8Deps).hasSize(2);
-    assertThat(k8Deps.get(0).getConfiguration().getCpu()).isEqualTo("k8");
-    assertThat(k8Deps.get(1).getConfiguration().getCpu()).isEqualTo("k8");
+    assertThat(getConfiguration(k8Deps.get(0)).getCpu()).isEqualTo("k8");
+    assertThat(getConfiguration(k8Deps.get(1)).getCpu()).isEqualTo("k8");
   }
 
   @Test
@@ -144,8 +144,8 @@ public class AndroidSkylarkTest extends BuildViewTestCase {
 
     String cpu = "armeabi-v7a";
     assertThat(splitDeps.get(cpu)).hasSize(2);
-    assertThat(splitDeps.get(cpu).get(0).getConfiguration().getCpu()).isEqualTo(cpu);
-    assertThat(splitDeps.get(cpu).get(1).getConfiguration().getCpu()).isEqualTo(cpu);
+    assertThat(getConfiguration(splitDeps.get(cpu).get(0)).getCpu()).isEqualTo(cpu);
+    assertThat(getConfiguration(splitDeps.get(cpu).get(1)).getCpu()).isEqualTo(cpu);
   }
 
   @Test
@@ -161,8 +161,8 @@ public class AndroidSkylarkTest extends BuildViewTestCase {
 
     // Split transition isn't in effect, so the deps are compiled normally (i.e. using --cpu).
     assertThat(splitDeps.get(Runtime.NONE)).hasSize(2);
-    assertThat(splitDeps.get(Runtime.NONE).get(0).getConfiguration().getCpu()).isEqualTo("k8");
-    assertThat(splitDeps.get(Runtime.NONE).get(1).getConfiguration().getCpu()).isEqualTo("k8");
+    assertThat(getConfiguration(splitDeps.get(Runtime.NONE).get(0)).getCpu()).isEqualTo("k8");
+    assertThat(getConfiguration(splitDeps.get(Runtime.NONE).get(1)).getCpu()).isEqualTo("k8");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
index e44cd778d2..584a930867 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
@@ -998,7 +998,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
         ")");
     ConfiguredTarget target = getConfiguredTarget("//foo");
     CppCompileAction action = getCppCompileAction(target);
-    String genfilesDir = target.getConfiguration().getGenfilesFragment().toString();
+    String genfilesDir = getConfiguration(target).getGenfilesFragment().toString();
     // Local include paths come first.
     assertContainsSublist(
         action.getCompilerOptions(),
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java
index a3ddc7710d..02365f10bb 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java
@@ -108,7 +108,7 @@ public class CcToolchainTest extends BuildViewTestCase {
         (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useInterfaceSharedObjects(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isFalse();
 
     useConfiguration("--interface_shared_objects");
@@ -116,7 +116,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useInterfaceSharedObjects(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isFalse();
 
     getAnalysisMock()
@@ -132,7 +132,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useInterfaceSharedObjects(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isTrue();
 
     useConfiguration("--nointerface_shared_objects");
@@ -140,7 +140,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useInterfaceSharedObjects(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isFalse();
   }
 
@@ -180,7 +180,7 @@ public class CcToolchainTest extends BuildViewTestCase {
 
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isFalse();
 
     // Mode-specific settings.
@@ -189,7 +189,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isTrue();
 
     useConfiguration("-c", "dbg", "--fission=opt");
@@ -197,7 +197,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isFalse();
 
     useConfiguration("-c", "dbg", "--fission=opt,dbg");
@@ -205,7 +205,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isTrue();
 
     useConfiguration("-c", "fastbuild", "--fission=opt,dbg");
@@ -213,7 +213,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isFalse();
 
     useConfiguration("-c", "fastbuild", "--fission=opt,dbg");
@@ -221,7 +221,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isFalse();
 
     // Universally enabled
@@ -230,7 +230,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isTrue();
 
     useConfiguration("-c", "opt", "--fission=yes");
@@ -238,7 +238,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isTrue();
 
     useConfiguration("-c", "fastbuild", "--fission=yes");
@@ -246,7 +246,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isTrue();
 
     // Universally disabled
@@ -255,7 +255,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isFalse();
 
     useConfiguration("-c", "opt", "--fission=no");
@@ -263,7 +263,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isFalse();
 
     useConfiguration("-c", "fastbuild", "--fission=no");
@@ -271,7 +271,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.useFission(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isFalse();
   }
 
@@ -374,7 +374,7 @@ public class CcToolchainTest extends BuildViewTestCase {
         (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.getDynamicMode(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isEqualTo(DynamicMode.OFF);
 
     useConfiguration("--lipo=off", "--lipo_context=//foo");
@@ -382,7 +382,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     toolchainProvider = (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);
     assertThat(
             CppHelper.getDynamicMode(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isEqualTo(DynamicMode.DEFAULT);
   }
 
@@ -417,7 +417,7 @@ public class CcToolchainTest extends BuildViewTestCase {
 
     assertThat(
             CppHelper.getDynamicMode(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isEqualTo(DynamicMode.DEFAULT);
 
     // Test "off"
@@ -427,7 +427,7 @@ public class CcToolchainTest extends BuildViewTestCase {
 
     assertThat(
             CppHelper.getDynamicMode(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isEqualTo(DynamicMode.OFF);
 
     // Test "fully"
@@ -437,7 +437,7 @@ public class CcToolchainTest extends BuildViewTestCase {
 
     assertThat(
             CppHelper.getDynamicMode(
-                target.getConfiguration().getFragment(CppConfiguration.class), toolchainProvider))
+                getConfiguration(target).getFragment(CppConfiguration.class), toolchainProvider))
         .isEqualTo(DynamicMode.FULLY);
 
     // Check an invalid value for disable_dynamic.
@@ -510,7 +510,7 @@ public class CcToolchainTest extends BuildViewTestCase {
 
     assertDoesNotContainSublist(
         CppHelper.getCompilerOptions(
-            lib.getConfiguration().getFragment(CppConfiguration.class),
+            getConfiguration(lib).getFragment(CppConfiguration.class),
             toolchain,
             Collections.emptyList()),
         "--param",
@@ -537,13 +537,13 @@ public class CcToolchainTest extends BuildViewTestCase {
     String defaultSettingFalse = "crosstool_default_false";
     List<String> copts =
         CppHelper.getCompilerOptions(
-            lib.getConfiguration().getFragment(CppConfiguration.class),
+            getConfiguration(lib).getFragment(CppConfiguration.class),
             toolchain,
             Collections.emptyList());
     assertThat(copts).doesNotContain("-DDEFAULT_FALSE");
     copts =
         CppHelper.getCompilerOptions(
-            lib.getConfiguration().getFragment(CppConfiguration.class),
+            getConfiguration(lib).getFragment(CppConfiguration.class),
             toolchain,
             ImmutableList.of(defaultSettingFalse));
     assertThat(copts).contains("-DDEFAULT_FALSE");
@@ -554,7 +554,7 @@ public class CcToolchainTest extends BuildViewTestCase {
 
     copts =
         CppHelper.getCompilerOptions(
-            lib.getConfiguration().getFragment(CppConfiguration.class),
+            getConfiguration(lib).getFragment(CppConfiguration.class),
             toolchain,
             ImmutableList.of(defaultSettingFalse));
     assertThat(copts).contains("-DDEFAULT_FALSE");
@@ -574,7 +574,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     List<String> expected = new ArrayList<>();
     expected.addAll(
         CppHelper.getCompilerOptions(
-            lib.getConfiguration().getFragment(CppConfiguration.class),
+            getConfiguration(lib).getFragment(CppConfiguration.class),
             toolchain,
             Collections.emptyList()));
     expected.add("-Dfoo");
@@ -585,7 +585,7 @@ public class CcToolchainTest extends BuildViewTestCase {
     assertThat(
             ImmutableList.copyOf(
                 CppHelper.getCompilerOptions(
-                    lib.getConfiguration().getFragment(CppConfiguration.class),
+                    getConfiguration(lib).getFragment(CppConfiguration.class),
                     toolchain,
                     Collections.emptyList())))
         .isEqualTo(ImmutableList.copyOf(expected));
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelperTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelperTest.java
index f5a42439ff..c2f5b77c4b 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelperTest.java
@@ -63,7 +63,7 @@ public class CppLinkstampCompileHelperTest extends BuildViewTestCase {
     List<String> arguments = linkstampCompileAction.getArguments();
     assertThatArgumentsAreValid(
         arguments,
-        target.getConfiguration().getFragment(CppConfiguration.class).toString(),
+        getConfiguration(target).getFragment(CppConfiguration.class).toString(),
         target.getLabel().getCanonicalForm(),
         executable.getFilename());
   }
@@ -119,7 +119,7 @@ public class CppLinkstampCompileHelperTest extends BuildViewTestCase {
     List<String> arguments = linkstampCompileAction.getArguments();
     assertThatArgumentsAreValid(
         arguments,
-        target.getConfiguration().getFragment(CppConfiguration.class).toString(),
+        getConfiguration(target).getFragment(CppConfiguration.class).toString(),
         target.getLabel().getCanonicalForm(),
         executable.getFilename());
   }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
index 7862f5a1f2..46168736d2 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
@@ -108,8 +108,8 @@ public class AppleBinaryTest extends ObjcRuleTestCase {
     ConfiguredTarget a = getConfiguredTarget("//a:a");
     ConfiguredTarget b = getDirectPrerequisite(a, "//a:b");
 
-    PathFragment aPath = a.getConfiguration().getOutputDirectory(RepositoryName.MAIN).getExecPath();
-    PathFragment bPath = b.getConfiguration().getOutputDirectory(RepositoryName.MAIN).getExecPath();
+    PathFragment aPath = getConfiguration(a).getOutputDirectory(RepositoryName.MAIN).getExecPath();
+    PathFragment bPath = getConfiguration(b).getOutputDirectory(RepositoryName.MAIN).getExecPath();
 
     assertThat(aPath.getPathString()).doesNotMatch("-min[0-9]");
     assertThat(bPath.getPathString()).contains("-min7.0-");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
index 6a72c21ef9..df0569b701 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
@@ -103,8 +103,9 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
             TestConstants.TOOLS_REPOSITORY_PATH_PREFIX + "third_party/java/j2objc/jre_core.h",
             "java/com/google/dummy/test/_j2objc/test/java/com/google/dummy/test/test.h");
 
-    String execPath = j2objcLibraryTarget.getConfiguration().getBinDirectory(RepositoryName.MAIN)
-        .getExecPath() + "/";
+    String execPath =
+        getConfiguration(j2objcLibraryTarget).getBinDirectory(RepositoryName.MAIN).getExecPath()
+            + "/";
     assertThat(
             Iterables.transform(
                 provider.get(ObjcProvider.INCLUDE), PathFragment::getSafePathString))
@@ -132,7 +133,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
 
     ConfiguredTarget target = getConfiguredTarget("//java/com/google/test:transpile");
     ObjcProvider provider = target.get(ObjcProvider.SKYLARK_CONSTRUCTOR);
-    String genfilesFragment = target.getConfiguration().getGenfilesFragment().toString();
+    String genfilesFragment = getConfiguration(target).getGenfilesFragment().toString();
     assertThat(Artifact.toRootRelativePaths(provider.get(ObjcProvider.LIBRARY)))
         .containsExactly(
             TestConstants.TOOLS_REPOSITORY_PATH_PREFIX
@@ -145,8 +146,8 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
                 + genfilesFragment
                 + "/java/com/google/test/test.h");
 
-    String execPath = target.getConfiguration().getBinDirectory(RepositoryName.MAIN)
-        .getExecPath() + "/";
+    String execPath =
+        getConfiguration(target).getBinDirectory(RepositoryName.MAIN).getExecPath() + "/";
     assertThat(
             Iterables.transform(
                 provider.get(ObjcProvider.INCLUDE), PathFragment::getSafePathString))
@@ -425,8 +426,8 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
     Artifact mappingFile = getFirstArtifactEndingWith(
         mappingFileProvider.getHeaderMappingFiles(), "lib1.mapping.j2objc");
     SpawnAction headerMappingAction = (SpawnAction) getGeneratingAction(mappingFile);
-    String execPath = target.getConfiguration().getBinDirectory(RepositoryName.MAIN)
-        .getExecPath() + "/";
+    String execPath =
+        getConfiguration(target).getBinDirectory(RepositoryName.MAIN).getExecPath() + "/";
     assertThat(Artifact.toRootRelativePaths(headerMappingAction.getInputs()))
         .containsAllOf(
             "java/com/google/transpile/libOne.java", "java/com/google/transpile/jar.srcjar");
@@ -550,7 +551,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
             "java/com/google/dummy/test/_j2objc/test/java/com/google/dummy/test/test.h");
 
     String execPath =
-        objcTarget.getConfiguration().getBinDirectory(RepositoryName.MAIN).getExecPath() + "/";
+        getConfiguration(objcTarget).getBinDirectory(RepositoryName.MAIN).getExecPath() + "/";
     assertThat(
             Iterables.transform(
                 provider.get(ObjcProvider.INCLUDE), PathFragment::getSafePathString))
@@ -596,7 +597,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
             "app/_j2objc/dummyTwo/app/dummyTwo.h");
 
     String execPath =
-        objcTarget.getConfiguration().getBinDirectory(RepositoryName.MAIN).getExecPath() + "/";
+        getConfiguration(objcTarget).getBinDirectory(RepositoryName.MAIN).getExecPath() + "/";
     assertThat(
             Iterables.transform(
                 provider.get(ObjcProvider.INCLUDE), PathFragment::getSafePathString))
@@ -630,7 +631,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
     List<String> linkArgs = normalizeBashArgs(linkAction.getArguments());
     ConfiguredTarget target = getConfiguredTargetInAppleBinaryTransition("//x:test");
     String binDir =
-        target.getConfiguration().getBinDirectory(RepositoryName.MAIN).getExecPathString();
+        getConfiguration(target).getBinDirectory(RepositoryName.MAIN).getExecPathString();
     Artifact fileList = getFirstArtifactEndingWith(linkAction.getInputs(), "test-linker.objlist");
     ParameterFileWriteAction filelistWriteAction =
         (ParameterFileWriteAction) getGeneratingAction(fileList);
@@ -887,7 +888,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
     Artifact archiveSourceMappingFile =
         getBinArtifact("test.archive_source_mapping.j2objc", javaTarget);
     String execPath =
-        javaTarget.getConfiguration().getBinDirectory(RepositoryName.MAIN).getExecPath() + "/";
+        getConfiguration(javaTarget).getBinDirectory(RepositoryName.MAIN).getExecPath() + "/";
 
     ParameterFileWriteAction paramFileAction =
         (ParameterFileWriteAction) getGeneratingAction(paramFile);
@@ -978,10 +979,10 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
     ConfiguredTarget j2objcLibraryTarget =
         getConfiguredTarget("//java/com/google/dummy/test:transpile");
     String genfilesFragment =
-        j2objcLibraryTarget.getConfiguration().getGenfilesFragment().toString();
-    String binFragment = j2objcLibraryTarget.getConfiguration().getBinFragment().toString();
+        getConfiguration(j2objcLibraryTarget).getGenfilesFragment().toString();
+    String binFragment = getConfiguration(j2objcLibraryTarget).getBinFragment().toString();
     AppleConfiguration appleConfiguration =
-        j2objcLibraryTarget.getConfiguration().getFragment(AppleConfiguration.class);
+        getConfiguration(j2objcLibraryTarget).getFragment(AppleConfiguration.class);
 
     String commandLine = Joiner.on(" ").join(compileAction.getArguments());
     ImmutableList<String> expectedArgs =
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
index dfb5adb1e8..9d29af75ec 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
@@ -294,7 +294,7 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase {
         "a/BUILD",
         "genrule(name = 'gen', srcs = ['gen.in'], cmd = '', outs = ['gen.out'])");
     ConfiguredTarget genIn = Iterables.getOnlyElement(getConfiguredDeps("//a:gen", "srcs"));
-    assertThat(genIn.getConfiguration()).isNull();
+    assertThat(getConfiguration(genIn)).isNull();
   }
 
   @Test
@@ -307,7 +307,7 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase {
     List<ConfiguredTarget> deps = getConfiguredDeps("//a:binary", "deps");
     assertThat(deps).hasSize(2);
     for (ConfiguredTarget dep : deps) {
-      assertThat(getTargetConfiguration().equalsOrIsSupersetOf(dep.getConfiguration())).isTrue();
+      assertThat(getTargetConfiguration().equalsOrIsSupersetOf(getConfiguration(dep))).isTrue();
     }
   }
 
@@ -318,7 +318,7 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase {
         "cc_binary(name = 'host_tool', srcs = ['host_tool.cc'])",
         "genrule(name = 'gen', srcs = [], cmd = '', outs = ['gen.out'], tools = [':host_tool'])");
     ConfiguredTarget toolDep = Iterables.getOnlyElement(getConfiguredDeps("//a:gen", "tools"));
-    assertThat(toolDep.getConfiguration().isHostConfiguration()).isTrue();
+    assertThat(getConfiguration(toolDep).isHostConfiguration()).isTrue();
   }
 
   @Test
@@ -338,15 +338,14 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase {
     ConfiguredTarget dep1 = deps.get(0);
     ConfiguredTarget dep2 = deps.get(1);
     assertThat(
-        ImmutableList.<String>of(
-            dep1.getConfiguration().getCpu(),
-            dep2.getConfiguration().getCpu()))
+            ImmutableList.<String>of(
+                getConfiguration(dep1).getCpu(), getConfiguration(dep2).getCpu()))
         .containsExactly("armeabi-v7a", "k8");
     // We don't care what order split deps are listed, but it must be deterministic.
     assertThat(
-        ConfigurationResolver.SPLIT_DEP_ORDERING.compare(
-            Dependency.withConfiguration(dep1.getLabel(), dep1.getConfiguration()),
-            Dependency.withConfiguration(dep2.getLabel(), dep2.getConfiguration())))
+            ConfigurationResolver.SPLIT_DEP_ORDERING.compare(
+                Dependency.withConfiguration(dep1.getLabel(), getConfiguration(dep1)),
+                Dependency.withConfiguration(dep2.getLabel(), getConfiguration(dep2))))
         .isLessThan(0);
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
index 28a922668a..7105d917ef 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
@@ -179,7 +179,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
         ")",
         "rule_class_transition(name='rule_class')");
     List<ConfiguredTarget> deps = getConfiguredDeps("//a:attribute", "without_transition");
-    BuildConfiguration ruleclass = Iterables.getOnlyElement(deps).getConfiguration();
+    BuildConfiguration ruleclass = getConfiguration(Iterables.getOnlyElement(deps));
     assertThat(ruleclass.getCpu()).isEqualTo("SET BY PATCH");
   }
 
@@ -194,7 +194,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
         ")",
         "rule_class_transition(name='rule_class')");
     List<ConfiguredTarget> deps = getConfiguredDeps("//a:attribute", "with_host_cpu_transition");
-    BuildConfiguration ruleclass = Iterables.getOnlyElement(deps).getConfiguration();
+    BuildConfiguration ruleclass = getConfiguration(Iterables.getOnlyElement(deps));
     assertThat(ruleclass.getCpu()).isEqualTo("SET BY PATCH");
     assertThat(ruleclass.getHostCpu()).isEqualTo("SET BY SPLIT");
   }
@@ -210,7 +210,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
         ")",
         "rule_class_transition(name='rule_class')");
     List<ConfiguredTarget> deps = getConfiguredDeps("//a:attribute", "with_cpu_transition");
-    BuildConfiguration ruleclass = Iterables.getOnlyElement(deps).getConfiguration();
+    BuildConfiguration ruleclass = getConfiguration(Iterables.getOnlyElement(deps));
     assertThat(ruleclass.getCpu()).isEqualTo("SET BY PATCH");
   }
 
@@ -226,7 +226,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
         ")",
         "rule_class_transition(name='rule_class')");
     List<ConfiguredTarget> deps = getConfiguredDeps("//a:empty", "with_empty_transition");
-    BuildConfiguration ruleclass = Iterables.getOnlyElement(deps).getConfiguration();
+    BuildConfiguration ruleclass = getConfiguration(Iterables.getOnlyElement(deps));
     assertThat(ruleclass.getCpu()).isEqualTo("SET BY PATCH");
   }
 
@@ -240,7 +240,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
         ")");
     ConfiguredTarget target =
         Iterables.getOnlyElement(update("//a:rule_class").getTargetsToBuild());
-    assertThat(target.getConfiguration().getCpu()).isEqualTo("SET BY PATCH");
+    assertThat(getConfiguration(target).getCpu()).isEqualTo("SET BY PATCH");
   }
 
   @Test
@@ -255,7 +255,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
         "simple(name='sim')");
     ConfiguredTarget target =
         Iterables.getOnlyElement(update("//a:sim").getTargetsToBuild());
-    assertThat(target.getConfiguration().getCpu()).isNotEqualTo("SET BY PATCH");
+    assertThat(getConfiguration(target).getCpu()).isNotEqualTo("SET BY PATCH");
   }
 
   @Test
@@ -275,7 +275,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
         "   sets_test_filter_to='funkiest',",
         ")");
     List<ConfiguredTarget> deps = getConfiguredDeps("//a:top", "without_transition");
-    BuildConfiguration config = Iterables.getOnlyElement(deps).getConfiguration();
+    BuildConfiguration config = getConfiguration(Iterables.getOnlyElement(deps));
     assertThat(config.getFragment(TestConfiguration.class).getTestFilter())
         .isEqualTo("SET BY PATCH FACTORY: funkiest");
   }
@@ -296,7 +296,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
         "   sets_test_filter_to='',",
         ")");
     List<ConfiguredTarget> deps = getConfiguredDeps("//a:top", "without_transition");
-    BuildConfiguration config = Iterables.getOnlyElement(deps).getConfiguration();
+    BuildConfiguration config = getConfiguration(Iterables.getOnlyElement(deps));
     assertThat(config.getFragment(TestConfiguration.class).getTestFilter())
         .isEqualTo("SET ON COMMAND LINE: original and best");
   }
@@ -313,7 +313,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
         "   sets_test_filter_to='Maximum Dance',",
         ")");
     ConfiguredTarget target = Iterables.getOnlyElement(update("//a:factory").getTargetsToBuild());
-    assertThat(target.getConfiguration().getFragment(TestConfiguration.class).getTestFilter())
+    assertThat(getConfiguration(target).getFragment(TestConfiguration.class).getTestFilter())
         .isEqualTo("SET BY PATCH FACTORY: Maximum Dance");
   }
 
@@ -333,7 +333,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
         reporter,
         Label.parseAbsoluteUnchecked("@//a:factory"),
         getTargetConfiguration());
-    assertThat(target.getConfiguration().getFragment(TestConfiguration.class).getTestFilter())
+    assertThat(getConfiguration(target).getFragment(TestConfiguration.class).getTestFilter())
         .isEqualTo("SET ON COMMAND LINE: original and best");
   }