1 files changed, 9 insertions, 8 deletions
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"));
   }