From 4381a1d6e8f711957f430aac0c301acec6dfa0eb Mon Sep 17 00:00:00 2001 From: Vladimir Moskva Date: Tue, 13 Sep 2016 09:29:39 +0000 Subject: Global cleanup change. -- MOS_MIGRATED_REVID=132976702 --- .../build/lib/skylark/SkylarkRuleClassFunctionsTest.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java') 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 3e677be5b9..78e4b4e51d 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 @@ -408,13 +408,6 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { "unexpected keyword 'bad_keyword' in call to string", "attr.string(bad_keyword = '')"); } - @Test - public void testAttrCfg_deprecated() throws Exception { - Attribute attr = evalAttributeDefinition("attr.label(cfg = HOST_CFG, allow_files = True)") - .build("a1"); - assertEquals(ConfigurationTransition.HOST, attr.getConfigurationTransition()); - } - @Test public void testAttrCfg() throws Exception { Attribute attr = evalAttributeDefinition("attr.label(cfg = 'host', allow_files = True)") @@ -664,8 +657,8 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { public void testTextMessageInvalidStructure() throws Exception { checkErrorContains( "Invalid text format, expected a struct, a string, a bool, or an int " - + "but got a ConfigurationTransition for struct field 'a'", - "struct(a=DATA_CFG).to_proto()"); + + "but got a function for struct field 'a'", + "struct(a=rule).to_proto()"); } private void checkJson(String from, String expected) throws Exception { @@ -711,8 +704,8 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { public void testJsonInvalidStructure() throws Exception { checkErrorContains( "Invalid text format, expected a struct, a string, a bool, or an int but got a " - + "ConfigurationTransition for struct field 'a'", - "struct(a=DATA_CFG).to_json()"); + + "function for struct field 'a'", + "struct(a=rule).to_json()"); } @Test -- cgit v1.2.3