Get rid of all remaining non-test non-internal uses of ConfiguredTarget#getConfiguration(). Add convenience methods in four Java test classes for use by refactoring tools to do this#getConfiguration(ConfiguredTarget) instead of ConfiguredTarget#getConfiguration.

PiperOrigin-RevId: 190684008

2 files changed, 8 insertions, 0 deletions

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 8205af49d7..ccf67ee88b 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
@@ -455,6 +455,10 @@ public abstract class AnalysisTestCase extends FoundationTestCase {
         reporter, parsedLabel, configuration);
   }
 
+  protected final BuildConfiguration getConfiguration(ConfiguredTarget ct) {
+    return skyframeExecutor.getConfiguration(reporter, ct.getConfigurationKey());
+  }
+
   /**
    * Returns the corresponding configured target, if it exists. Note that this will only return
    * anything useful after a call to update() with the same label. The label passed in must
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 7d394a78e1..44f7ecdbfe 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
@@ -1613,6 +1613,10 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
     return config;
   }
 
+  protected final BuildConfiguration getConfiguration(ConfiguredTarget ct) {
+    return skyframeExecutor.getConfiguration(reporter, ct.getConfigurationKey());
+  }
+
   /**
    * Returns an attribute value retriever for the given rule for the target configuration.
    */