From 96180fa5de610990f7ab6df5906b6deb5636df9c Mon Sep 17 00:00:00 2001 From: John Cater Date: Fri, 2 Jun 2017 02:54:37 +0200 Subject: Move helper methods for accessing platform providers to a utility class. Change-Id: I45d0cf8e5096ad4ab516af5ddaa98eea8d516c04 PiperOrigin-RevId: 157788771 --- .../java/com/google/devtools/build/lib/analysis/platform/BUILD | 2 +- .../build/lib/analysis/platform/ConstraintSettingInfoTest.java | 5 ++--- .../build/lib/analysis/platform/ConstraintValueInfoTest.java | 7 +++---- .../devtools/build/lib/analysis/platform/PlatformInfoTest.java | 3 +-- 4 files changed, 7 insertions(+), 10 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/analysis') 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 = -- cgit v1.2.3