diff options
author | brandjon <brandjon@google.com> | 2018-01-10 08:38:43 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-10 08:40:20 -0800 |
commit | a29648a2cdc223deeed17ef8489f694d133d7de6 (patch) | |
tree | dccb42fbb74340c4202d6f3cf5d2ae50cb2338f9 /src/test | |
parent | 65c13dd5a4c1b4b5a072f7680b8f1cf3c5079b52 (diff) |
Info-related cleanups
- Reorder Info methods for consistency with ClassObject
- "StructConstructor" -> "StructProvider"
- Added javadoc
RELNOTES: None
PiperOrigin-RevId: 181469643
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java index 4efa55af04..bcd42e84a3 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java @@ -1059,7 +1059,7 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { @Test public void testStructConcatenationCommonFields() throws Exception { - checkErrorContains("Cannot concat structs with common field(s): a", + checkErrorContains("Cannot use '+' operator on provider instances with overlapping field(s): a", "x = struct(a = 1, b = 2)", "y = struct(c = 1, a = 2)", "z = x + y\n"); } @@ -1247,7 +1247,7 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { "data2 = provider()" ); - checkEvalError("Cannot concat data1 with data2", + checkEvalError("Cannot use '+' operator on instances of different providers (data1 and data2)", "d1 = data1(x = 1)", "d2 = data2(y = 2)", "d = d1 + d2" @@ -1271,7 +1271,7 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { public void declaredProvidersWithFieldsConcatError() throws Exception { evalAndExport("data1 = provider(fields=['f1', 'f2'])", "data2 = provider(fields=['f3'])"); checkEvalError( - "Cannot concat data1 with data2", + "Cannot use '+' operator on instances of different providers (data1 and data2)", "d1 = data1(f1=1, f2=2)", "d2 = data2(f3=3)", "d = d1 + d2"); @@ -1281,7 +1281,7 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { public void declaredProvidersWithOverlappingFieldsConcatError() throws Exception { evalAndExport("data = provider(fields=['f1', 'f2'])"); checkEvalError( - "Cannot concat structs with common field(s): f1", + "Cannot use '+' operator on provider instances with overlapping field(s): f1", "d1 = data(f1 = 4)", "d2 = data(f1 = 5)", "d1 + d2"); |