From de965ac47e5dedf9dd43004d7523dbfa5ab64de1 Mon Sep 17 00:00:00 2001 From: dslomov Date: Mon, 31 Jul 2017 21:07:51 +0200 Subject: Better names for declared providers-related classes. Follows https://docs.google.com/document/d/1aAIVWvHPERDz2cv_PCFGwr8dvh5FcAkENFoRsNS4clk/. RELNOTES: None. PiperOrigin-RevId: 163728291 --- .../devtools/build/lib/syntax/EvalUtilsTest.java | 27 +++++++++++----------- .../build/lib/syntax/SkylarkEvaluationTest.java | 13 +++++------ .../devtools/build/lib/syntax/ValidationTest.java | 8 +++---- 3 files changed, 22 insertions(+), 26 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/syntax') 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 b7e6f0454c..3782c3250d 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 @@ -20,7 +20,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.NativeClassObjectConstructor; +import com.google.devtools.build.lib.packages.NativeProvider; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.syntax.EvalUtils.ComparisonException; import com.google.devtools.build.lib.syntax.SkylarkList.MutableList; @@ -115,19 +115,18 @@ public class EvalUtilsTest extends EvaluationTestCase { @Test public void testComparatorWithDifferentTypes() throws Exception { Object[] objects = { - "1", - 2, - true, - Runtime.NONE, - SkylarkList.Tuple.of(1, 2, 3), - SkylarkList.Tuple.of("1", "2", "3"), - SkylarkList.MutableList.of(env, 1, 2, 3), - SkylarkList.MutableList.of(env, "1", "2", "3"), - SkylarkDict.of(env, "key", 123), - SkylarkDict.of(env, 123, "value"), - NestedSetBuilder.stableOrder().add(1).add(2).add(3).build(), - NativeClassObjectConstructor.STRUCT.create( - ImmutableMap.of("key", (Object) "value"), "no field %s"), + "1", + 2, + true, + Runtime.NONE, + SkylarkList.Tuple.of(1, 2, 3), + SkylarkList.Tuple.of("1", "2", "3"), + SkylarkList.MutableList.of(env, 1, 2, 3), + SkylarkList.MutableList.of(env, "1", "2", "3"), + 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"), }; 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 d760a9e20d..983c7a29ff 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 @@ -25,8 +25,8 @@ import com.google.devtools.build.lib.analysis.RuleConfiguredTarget; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.packages.NativeClassObjectConstructor; -import com.google.devtools.build.lib.packages.SkylarkClassObject; +import com.google.devtools.build.lib.packages.Info; +import com.google.devtools.build.lib.packages.NativeProvider; import com.google.devtools.build.lib.skylarkinterface.Param; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -1424,11 +1424,10 @@ public class SkylarkEvaluationTest extends EvaluationTest { } @SkylarkModule(name = "SkylarkClassObjectWithSkylarkCallables", doc = "") - static final class SkylarkClassObjectWithSkylarkCallables extends SkylarkClassObject { - private static final NativeClassObjectConstructor - CONSTRUCTOR = - new NativeClassObjectConstructor( - SkylarkClassObjectWithSkylarkCallables.class, "struct_with_skylark_callables") {}; + static final class SkylarkClassObjectWithSkylarkCallables extends Info { + private static final NativeProvider CONSTRUCTOR = + new NativeProvider( + SkylarkClassObjectWithSkylarkCallables.class, "struct_with_skylark_callables") {}; SkylarkClassObjectWithSkylarkCallables() { super( diff --git a/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java index 10c80c784f..27b84423b6 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget; import com.google.devtools.build.lib.events.Event; -import com.google.devtools.build.lib.packages.SkylarkClassObject; +import com.google.devtools.build.lib.packages.Info; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.syntax.SkylarkList.MutableList; import com.google.devtools.build.lib.syntax.SkylarkList.Tuple; @@ -298,8 +298,7 @@ public class ValidationTest extends EvaluationTestCase { assertThat(EvalUtils.getSkylarkType(emptyTupleClass)).isEqualTo(Tuple.class); assertThat(EvalUtils.getSkylarkType(tupleClass)).isEqualTo(Tuple.class); - assertThat(EvalUtils.getSkylarkType(SkylarkClassObject.class)) - .isEqualTo(SkylarkClassObject.class); + assertThat(EvalUtils.getSkylarkType(Info.class)).isEqualTo(Info.class); try { EvalUtils.getSkylarkType(ClassObject.class); throw new Exception("Should have raised IllegalArgumentException exception"); @@ -338,8 +337,7 @@ public class ValidationTest extends EvaluationTestCase { // TODO(bazel-team): move to some other place to remove dependency of syntax tests on Artifact? assertThat(SkylarkType.of(Artifact.SpecialArtifact.class)) .isEqualTo(SkylarkType.of(Artifact.class)); - assertThat(SkylarkType.of(RuleConfiguredTarget.class)) - .isNotEqualTo(SkylarkType.of(SkylarkClassObject.class)); + assertThat(SkylarkType.of(RuleConfiguredTarget.class)).isNotEqualTo(SkylarkType.of(Info.class)); } @Test -- cgit v1.2.3