AAPT2: Change accepted notation for resource names in tests

Previously the way to name resources in tests was to use reference
notation (@[package:][type/]name). Now we use name notation (no @).

Change-Id: I68f0a36562d89cc78c582d128f370d9556c58707

1 files changed, 21 insertions, 21 deletions

diff --git a/tools/aapt2/ResourceTable_test.cpp b/tools/aapt2/ResourceTable_test.cpp
index cf6660cbff28..4db40a6f4008 100644
--- a/tools/aapt2/ResourceTable_test.cpp
+++ b/tools/aapt2/ResourceTable_test.cpp
@@ -30,13 +30,13 @@ TEST(ResourceTableTest, FailToAddResourceWithBadName) {
     ResourceTable table;
 
     EXPECT_FALSE(table.addResource(
-            test::parseNameOrDie("@android:id/hey,there"),
+            test::parseNameOrDie("android:id/hey,there"),
             ConfigDescription{}, "",
             test::ValueBuilder<Id>().setSource("test.xml", 21u).build(),
             test::getDiagnostics()));
 
     EXPECT_FALSE(table.addResource(
-            test::parseNameOrDie("@android:id/hey:there"),
+            test::parseNameOrDie("android:id/hey:there"),
             ConfigDescription{}, "",
             test::ValueBuilder<Id>().setSource("test.xml", 21u).build(),
             test::getDiagnostics()));
@@ -46,12 +46,12 @@ TEST(ResourceTableTest, AddOneResource) {
     ResourceTable table;
 
     EXPECT_TRUE(table.addResource(
-            test::parseNameOrDie("@android:attr/id"),
+            test::parseNameOrDie("android:attr/id"),
             ConfigDescription{}, "",
             test::ValueBuilder<Id>().setSource("test/path/file.xml", 23u).build(),
             test::getDiagnostics()));
 
-    ASSERT_NE(nullptr, test::getValue<Id>(&table, "@android:attr/id"));
+    ASSERT_NE(nullptr, test::getValue<Id>(&table, "android:attr/id"));
 }
 
 TEST(ResourceTableTest, AddMultipleResources) {
@@ -62,35 +62,35 @@ TEST(ResourceTableTest, AddMultipleResources) {
     memcpy(languageConfig.language, "pl", sizeof(languageConfig.language));
 
     EXPECT_TRUE(table.addResource(
-            test::parseNameOrDie("@android:attr/layout_width"),
+            test::parseNameOrDie("android:attr/layout_width"),
             config, "",
             test::ValueBuilder<Id>().setSource("test/path/file.xml", 10u).build(),
             test::getDiagnostics()));
 
     EXPECT_TRUE(table.addResource(
-            test::parseNameOrDie("@android:attr/id"),
+            test::parseNameOrDie("android:attr/id"),
             config, "",
             test::ValueBuilder<Id>().setSource("test/path/file.xml", 12u).build(),
             test::getDiagnostics()));
 
     EXPECT_TRUE(table.addResource(
-            test::parseNameOrDie("@android:string/ok"),
+            test::parseNameOrDie("android:string/ok"),
             config, "",
             test::ValueBuilder<Id>().setSource("test/path/file.xml", 14u).build(),
             test::getDiagnostics()));
 
     EXPECT_TRUE(table.addResource(
-            test::parseNameOrDie("@android:string/ok"),
+            test::parseNameOrDie("android:string/ok"),
             languageConfig, "",
             test::ValueBuilder<BinaryPrimitive>(android::Res_value{})
                     .setSource("test/path/file.xml", 20u)
                     .build(),
             test::getDiagnostics()));
 
-    ASSERT_NE(nullptr, test::getValue<Id>(&table, "@android:attr/layout_width"));
-    ASSERT_NE(nullptr, test::getValue<Id>(&table, "@android:attr/id"));
-    ASSERT_NE(nullptr, test::getValue<Id>(&table, "@android:string/ok"));
-    ASSERT_NE(nullptr, test::getValueForConfig<BinaryPrimitive>(&table, "@android:string/ok",
+    ASSERT_NE(nullptr, test::getValue<Id>(&table, "android:attr/layout_width"));
+    ASSERT_NE(nullptr, test::getValue<Id>(&table, "android:attr/id"));
+    ASSERT_NE(nullptr, test::getValue<Id>(&table, "android:string/ok"));
+    ASSERT_NE(nullptr, test::getValueForConfig<BinaryPrimitive>(&table, "android:string/ok",
                                                                 languageConfig));
 }
 
@@ -98,22 +98,22 @@ TEST(ResourceTableTest, OverrideWeakResourceValue) {
     ResourceTable table;
 
     ASSERT_TRUE(table.addResource(
-            test::parseNameOrDie("@android:attr/foo"),
+            test::parseNameOrDie("android:attr/foo"),
             ConfigDescription{}, "",
             util::make_unique<Attribute>(true),
             test::getDiagnostics()));
 
-    Attribute* attr = test::getValue<Attribute>(&table, "@android:attr/foo");
+    Attribute* attr = test::getValue<Attribute>(&table, "android:attr/foo");
     ASSERT_NE(nullptr, attr);
     EXPECT_TRUE(attr->isWeak());
 
     ASSERT_TRUE(table.addResource(
-            test::parseNameOrDie("@android:attr/foo"),
+            test::parseNameOrDie("android:attr/foo"),
             ConfigDescription{}, "",
             util::make_unique<Attribute>(false),
             test::getDiagnostics()));
 
-    attr = test::getValue<Attribute>(&table, "@android:attr/foo");
+    attr = test::getValue<Attribute>(&table, "android:attr/foo");
     ASSERT_NE(nullptr, attr);
     EXPECT_FALSE(attr->isWeak());
 }
@@ -121,24 +121,24 @@ TEST(ResourceTableTest, OverrideWeakResourceValue) {
 TEST(ResourceTableTest, ProductVaryingValues) {
     ResourceTable table;
 
-    EXPECT_TRUE(table.addResource(test::parseNameOrDie("@android:string/foo"),
+    EXPECT_TRUE(table.addResource(test::parseNameOrDie("android:string/foo"),
                                   test::parseConfigOrDie("land"), "tablet",
                                   util::make_unique<Id>(),
                                   test::getDiagnostics()));
-    EXPECT_TRUE(table.addResource(test::parseNameOrDie("@android:string/foo"),
+    EXPECT_TRUE(table.addResource(test::parseNameOrDie("android:string/foo"),
                                   test::parseConfigOrDie("land"), "phone",
                                   util::make_unique<Id>(),
                                   test::getDiagnostics()));
 
-    EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, "@android:string/foo",
+    EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, "android:string/foo",
                                                              test::parseConfigOrDie("land"),
                                                              "tablet"));
-    EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, "@android:string/foo",
+    EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, "android:string/foo",
                                                              test::parseConfigOrDie("land"),
                                                              "phone"));
 
     Maybe<ResourceTable::SearchResult> sr = table.findResource(
-            test::parseNameOrDie("@android:string/foo"));
+            test::parseNameOrDie("android:string/foo"));
     AAPT_ASSERT_TRUE(sr);
     std::vector<ResourceConfigValue*> values = sr.value().entry->findAllValues(
             test::parseConfigOrDie("land"));