diff options
author | dslomov <dslomov@google.com> | 2017-04-11 17:55:55 +0000 |
---|---|---|
committer | Jakob Buchgraber <buchgr@google.com> | 2017-04-12 11:49:05 +0200 |
commit | 3aa7d2f0548d4fda0df94722127245896c2b3ead (patch) | |
tree | 5c810f13cf6a77caa57dabb1bc2101acf7211b64 /src/test/java/com/google/devtools/build/lib/skylark | |
parent | 350f63822c6f693e2742166c690ea013979ab896 (diff) |
Used 'DefaultInfo' instead of `ctx.default_provider`.
This follows our CamelCaseInfo naming conventions for providers.
RELNOTES: None.
PiperOrigin-RevId: 152832215
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skylark')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java index a1f8ed68b1..0d4f74fe8c 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java @@ -849,7 +849,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { "test/foo.bzl", "foo_provider = provider()", "def _impl(ctx):", - " default = ctx.default_provider(", + " default = DefaultInfo(", " runfiles=ctx.runfiles(ctx.files.runs),", " )", " foo = foo_provider()", @@ -865,7 +865,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { "test/bar.bzl", "load(':foo.bzl', 'foo_provider')", "def _impl(ctx):", - " provider = ctx.attr.deps[0][ctx.default_provider]", + " provider = ctx.attr.deps[0][DefaultInfo]", " return struct(", " provider = provider,", " dir = str(sorted(dir(provider))),", @@ -892,7 +892,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { Object provider = providers.getValue("provider"); assertThat(provider).isInstanceOf(DefaultProvider.class); assertThat(((DefaultProvider) provider).getConstructor().getPrintableName()) - .isEqualTo("default_provider"); + .isEqualTo("DefaultInfo"); assertThat(providers.getValue("dir")) .isEqualTo( @@ -923,7 +923,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { scratch.file( "test/bar.bzl", "def _impl(ctx):", - " provider = ctx.attr.deps[0][ctx.default_provider]", + " provider = ctx.attr.deps[0][DefaultInfo]", " return struct(", " provider = provider,", " dir = str(sorted(dir(provider))),", @@ -948,7 +948,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { Object provider = providers.getValue("provider"); assertThat(provider).isInstanceOf(DefaultProvider.class); assertThat(((DefaultProvider) provider).getConstructor().getPrintableName()) - .isEqualTo("default_provider"); + .isEqualTo("DefaultInfo"); assertThat(providers.getValue("dir")) .isEqualTo( @@ -989,8 +989,8 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { "load(':foo.bzl', 'foo_provider')", "def _impl(ctx):", " dep = ctx.attr.deps[0]", - " provider = dep[ctx.default_provider]", // The goal is to test this object - " return struct(", // so we return it here + " provider = dep[DefaultInfo]", // The goal is to test this object + " return struct(", // so we return it here " default = provider,", " )", "bar_rule = rule(", @@ -1011,7 +1011,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { assertThat(provider).isInstanceOf(DefaultProvider.class); SkylarkClassObject defaultProvider = (DefaultProvider) provider; assertThat((defaultProvider).getConstructor().getPrintableName()) - .isEqualTo("default_provider"); + .isEqualTo("DefaultInfo"); } @Test @@ -1020,7 +1020,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { "test/foo.bzl", "foo_provider = provider()", "def _impl(ctx):", - " default = ctx.default_provider(", + " default = DefaultInfo(", " foo=ctx.runfiles(),", " )", " return [default]", |