diff options
| author |  cparsons <cparsons@google.com> | 2018-05-24 10:37:03 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-24 10:38:19 -0700 |
| commit | 0c5c1c67da1d3c2d1c6fa76230ef0d41ce47e0c2 (patch) | |
| tree | 453bc6c2732730fc043e09e89de86131c6071504 /src/test/java/com/google/devtools/build/lib/syntax | |
| parent | bc32493847eb5670ed9fdf472abc3a70b1901999 (diff) | |
Migrate struct() to skylarkbuildapi
RELNOTES: None.
PiperOrigin-RevId: 197915097
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/syntax')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java | 4 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java index a34eab24ba..4c1810aa16 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; -import com.google.devtools.build.lib.packages.NativeProvider; +import com.google.devtools.build.lib.packages.StructProvider; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkPrinter; import com.google.devtools.build.lib.skylarkinterface.SkylarkValue; @@ -129,7 +129,7 @@ public class EvalUtilsTest extends EvaluationTestCase { SkylarkDict.of(env, "key", 123), SkylarkDict.of(env, 123, "value"), NestedSetBuilder.stableOrder().add(1).add(2).add(3).build(), - NativeProvider.STRUCT.create(ImmutableMap.of("key", (Object) "value"), "no field %s"), + StructProvider.STRUCT.create(ImmutableMap.of("key", (Object) "value"), "no field %s"), }; for (int i = 0; i < objects.length; ++i) { diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java index 3e0db3dd03..422ac033a5 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java @@ -24,6 +24,7 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.NativeInfo; import com.google.devtools.build.lib.packages.NativeProvider; +import com.google.devtools.build.lib.packages.StructProvider; import com.google.devtools.build.lib.skylarkinterface.Param; import com.google.devtools.build.lib.skylarkinterface.ParamType; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; @@ -385,7 +386,7 @@ public class SkylarkEvaluationTest extends EvaluationTest { builder.put(nativeFunction, FuncallExpression.getBuiltinCallable(this, nativeFunction)); } - return NativeProvider.STRUCT.create(builder.build(), "no native callable '%s'"); + return StructProvider.STRUCT.create(builder.build(), "no native callable '%s'"); } @SkylarkCallable( |