Move helper methods for accessing platform providers to a utility class.

Change-Id: I45d0cf8e5096ad4ab516af5ddaa98eea8d516c04
PiperOrigin-RevId: 157788771

7 files changed, 21 insertions, 22 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD
index 6bacfd18c5..0b9feba7f1 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD
@@ -16,8 +16,8 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:syntax",
         "//src/main/java/com/google/devtools/build/lib:util",
         "//src/main/java/com/google/devtools/build/lib/analysis/platform",
+        "//src/main/java/com/google/devtools/build/lib/analysis/platform:utils",
         "//src/main/java/com/google/devtools/build/lib/cmdline",
-        "//src/main/java/com/google/devtools/build/lib/rules/platform",
         "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
         "//src/test/java/com/google/devtools/build/lib:packages_testutil",
         "//src/test/java/com/google/devtools/build/lib/skylark:testutil",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfoTest.java b/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfoTest.java
index ddc66d71b3..ca34b45f40 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfoTest.java
@@ -20,7 +20,6 @@ import com.google.common.testing.EqualsTester;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.rules.platform.ConstraintSetting;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -58,8 +57,8 @@ public class ConstraintSettingInfoTest extends BuildViewTestCase {
 
     ConfiguredTarget setting = getConfiguredTarget("//test/platform:custom");
     assertThat(setting).isNotNull();
-    assertThat(ConstraintSetting.constraintSetting(setting)).isNotNull();
-    assertThat(ConstraintSetting.constraintSetting(setting).label())
+    assertThat(PlatformProviderUtils.constraintSetting(setting)).isNotNull();
+    assertThat(PlatformProviderUtils.constraintSetting(setting).label())
         .isEqualTo(Label.parseAbsolute("//test/platform:custom"));
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfoTest.java b/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfoTest.java
index 9a6e6d21c3..9684124862 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfoTest.java
@@ -20,7 +20,6 @@ import com.google.common.testing.EqualsTester;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.rules.platform.ConstraintValue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -73,10 +72,10 @@ public class ConstraintValueInfoTest extends BuildViewTestCase {
 
     ConfiguredTarget value = getConfiguredTarget("//test/platform:custom");
     assertThat(value).isNotNull();
-    assertThat(ConstraintValue.constraintValue(value)).isNotNull();
-    assertThat(ConstraintValue.constraintValue(value).constraint().label())
+    assertThat(PlatformProviderUtils.constraintValue(value)).isNotNull();
+    assertThat(PlatformProviderUtils.constraintValue(value).constraint().label())
         .isEqualTo(Label.parseAbsolute("//test/platform:basic"));
-    assertThat(ConstraintValue.constraintValue(value).label())
+    assertThat(PlatformProviderUtils.constraintValue(value).label())
         .isEqualTo(Label.parseAbsolute("//test/platform:custom"));
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java b/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
index d8f0029011..4553647f1f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
@@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat;
 import com.google.common.testing.EqualsTester;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
-import com.google.devtools.build.lib.rules.platform.Platform;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -116,7 +115,7 @@ public class PlatformInfoTest extends BuildViewTestCase {
     ConfiguredTarget platform = getConfiguredTarget("//test/platform:custom");
     assertThat(platform).isNotNull();
 
-    PlatformInfo provider = Platform.platform(platform);
+    PlatformInfo provider = PlatformProviderUtils.platform(platform);
     assertThat(provider).isNotNull();
     assertThat(provider.constraints()).hasSize(1);
     ConstraintSettingInfo constraintSetting =
diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD b/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD
index 981b5b15f2..781420d5f7 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD
@@ -15,8 +15,8 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:syntax",
         "//src/main/java/com/google/devtools/build/lib:util",
         "//src/main/java/com/google/devtools/build/lib/analysis/platform",
+        "//src/main/java/com/google/devtools/build/lib/analysis/platform:utils",
         "//src/main/java/com/google/devtools/build/lib/cmdline",
-        "//src/main/java/com/google/devtools/build/lib/rules/platform",
         "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
         "//src/test/java/com/google/devtools/build/lib:packages_testutil",
         "//src/test/java/com/google/devtools/build/lib/skylark:testutil",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java b/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java
index fbf1e196cb..23ff526c18 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java
@@ -17,6 +17,7 @@ package com.google.devtools.build.lib.rules.platform;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
+import com.google.devtools.build.lib.analysis.platform.PlatformProviderUtils;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
 import org.junit.Before;
@@ -45,22 +46,22 @@ public class ConstraintTest extends BuildViewTestCase {
   public void testConstraint() throws Exception {
     ConfiguredTarget setting = getConfiguredTarget("//constraint:basic");
     assertThat(setting).isNotNull();
-    assertThat(ConstraintSetting.constraintSetting(setting)).isNotNull();
-    assertThat(ConstraintSetting.constraintSetting(setting)).isNotNull();
-    assertThat(ConstraintSetting.constraintSetting(setting).label())
+    assertThat(PlatformProviderUtils.constraintSetting(setting)).isNotNull();
+    assertThat(PlatformProviderUtils.constraintSetting(setting)).isNotNull();
+    assertThat(PlatformProviderUtils.constraintSetting(setting).label())
         .isEqualTo(Label.parseAbsolute("//constraint:basic"));
     ConfiguredTarget fooValue = getConfiguredTarget("//constraint:foo");
     assertThat(fooValue).isNotNull();
-    assertThat(ConstraintValue.constraintValue(fooValue)).isNotNull();
-    assertThat(ConstraintValue.constraintValue(fooValue).constraint().label())
+    assertThat(PlatformProviderUtils.constraintValue(fooValue)).isNotNull();
+    assertThat(PlatformProviderUtils.constraintValue(fooValue).constraint().label())
         .isEqualTo(Label.parseAbsolute("//constraint:basic"));
-    assertThat(ConstraintValue.constraintValue(fooValue).label())
+    assertThat(PlatformProviderUtils.constraintValue(fooValue).label())
         .isEqualTo(Label.parseAbsolute("//constraint:foo"));
     ConfiguredTarget barValue = getConfiguredTarget("//constraint:bar");
     assertThat(barValue).isNotNull();
-    assertThat(ConstraintValue.constraintValue(barValue).constraint().label())
+    assertThat(PlatformProviderUtils.constraintValue(barValue).constraint().label())
         .isEqualTo(Label.parseAbsolute("//constraint:basic"));
-    assertThat(ConstraintValue.constraintValue(barValue).label())
+    assertThat(PlatformProviderUtils.constraintValue(barValue).label())
         .isEqualTo(Label.parseAbsolute("//constraint:bar"));
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java b/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java
index ee430b51e5..152aca3f8f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java
@@ -21,6 +21,7 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.platform.ConstraintSettingInfo;
 import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo;
 import com.google.devtools.build.lib.analysis.platform.PlatformInfo;
+import com.google.devtools.build.lib.analysis.platform.PlatformProviderUtils;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.util.CPU;
@@ -57,7 +58,7 @@ public class PlatformTest extends BuildViewTestCase {
     ConfiguredTarget platform = getConfiguredTarget("//constraint:plat1");
     assertThat(platform).isNotNull();
 
-    PlatformInfo provider = Platform.platform(platform);
+    PlatformInfo provider = PlatformProviderUtils.platform(platform);
     assertThat(provider).isNotNull();
     assertThat(provider.constraints()).hasSize(1);
     ConstraintSettingInfo constraintSetting =
@@ -89,7 +90,7 @@ public class PlatformTest extends BuildViewTestCase {
     ConfiguredTarget platform = getConfiguredTarget("//host:host_platform");
     assertThat(platform).isNotNull();
 
-    PlatformInfo provider = Platform.platform(platform);
+    PlatformInfo provider = PlatformProviderUtils.platform(platform);
     assertThat(provider).isNotNull();
 
     // Check the CPU and OS.
@@ -135,7 +136,7 @@ public class PlatformTest extends BuildViewTestCase {
     ConfiguredTarget platform = getConfiguredTarget("//constraint/remote:plat_remote");
     assertThat(platform).isNotNull();
 
-    PlatformInfo provider = Platform.platform(platform);
+    PlatformInfo provider = PlatformProviderUtils.platform(platform);
     assertThat(provider).isNotNull();
     assertThat(provider.remoteExecutionProperties())
         .containsExactlyEntriesIn(ImmutableMap.of("foo", "val1", "bar", "val2"));