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
diff --git a/tools/aapt2/link/TableMerger_test.cpp b/tools/aapt2/link/TableMerger_test.cpp
index 1697217..300b56d 100644
--- a/tools/aapt2/link/TableMerger_test.cpp
+++ b/tools/aapt2/link/TableMerger_test.cpp
@@ -45,16 +45,16 @@
TEST_F(TableMergerTest, SimpleMerge) {
std::unique_ptr<ResourceTable> tableA = test::ResourceTableBuilder()
.setPackageId("com.app.a", 0x7f)
- .addReference("@com.app.a:id/foo", "@com.app.a:id/bar")
- .addReference("@com.app.a:id/bar", "@com.app.b:id/foo")
- .addValue("@com.app.a:styleable/view", test::StyleableBuilder()
- .addItem("@com.app.b:id/foo")
+ .addReference("com.app.a:id/foo", "com.app.a:id/bar")
+ .addReference("com.app.a:id/bar", "com.app.b:id/foo")
+ .addValue("com.app.a:styleable/view", test::StyleableBuilder()
+ .addItem("com.app.b:id/foo")
.build())
.build();
std::unique_ptr<ResourceTable> tableB = test::ResourceTableBuilder()
.setPackageId("com.app.b", 0x7f)
- .addSimple("@com.app.b:id/foo")
+ .addSimple("com.app.b:id/foo")
.build();
ResourceTable finalTable;
@@ -67,15 +67,15 @@
EXPECT_TRUE(merger.getMergedPackages().count("com.app.b") != 0);
// Entries from com.app.a should not be mangled.
- AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("@com.app.a:id/foo")));
- AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("@com.app.a:id/bar")));
- AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("@com.app.a:styleable/view")));
+ AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("com.app.a:id/foo")));
+ AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("com.app.a:id/bar")));
+ AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("com.app.a:styleable/view")));
// The unmangled name should not be present.
- AAPT_EXPECT_FALSE(finalTable.findResource(test::parseNameOrDie("@com.app.b:id/foo")));
+ AAPT_EXPECT_FALSE(finalTable.findResource(test::parseNameOrDie("com.app.b:id/foo")));
// Look for the mangled name.
- AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("@com.app.a:id/com.app.b$foo")));
+ AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("com.app.a:id/com.app.b$foo")));
}
TEST_F(TableMergerTest, MergeFile) {
@@ -86,14 +86,14 @@
ResourceFile fileDesc;
fileDesc.config = test::parseConfigOrDie("hdpi-v4");
- fileDesc.name = test::parseNameOrDie("@layout/main");
+ fileDesc.name = test::parseNameOrDie("layout/main");
fileDesc.source = Source("res/layout-hdpi/main.xml");
test::TestFile testFile("path/to/res/layout-hdpi/main.xml.flat");
ASSERT_TRUE(merger.mergeFile(fileDesc, &testFile));
FileReference* file = test::getValueForConfig<FileReference>(&finalTable,
- "@com.app.a:layout/main",
+ "com.app.a:layout/main",
test::parseConfigOrDie("hdpi-v4"));
ASSERT_NE(nullptr, file);
EXPECT_EQ(std::string("res/layout-hdpi-v4/main.xml"), *file->path);
@@ -106,7 +106,7 @@
TableMerger merger(mContext.get(), &finalTable, tableMergerOptions);
ResourceFile fileDesc;
- fileDesc.name = test::parseNameOrDie("@xml/foo");
+ fileDesc.name = test::parseNameOrDie("xml/foo");
test::TestFile fileA("path/to/fileA.xml.flat");
test::TestFile fileB("path/to/fileB.xml.flat");
@@ -117,11 +117,11 @@
TEST_F(TableMergerTest, MergeFileReferences) {
std::unique_ptr<ResourceTable> tableA = test::ResourceTableBuilder()
.setPackageId("com.app.a", 0x7f)
- .addFileReference("@com.app.a:xml/file", "res/xml/file.xml")
+ .addFileReference("com.app.a:xml/file", "res/xml/file.xml")
.build();
std::unique_ptr<ResourceTable> tableB = test::ResourceTableBuilder()
.setPackageId("com.app.b", 0x7f)
- .addFileReference("@com.app.b:xml/file", "res/xml/file.xml")
+ .addFileReference("com.app.b:xml/file", "res/xml/file.xml")
.build();
ResourceTable finalTable;
@@ -132,11 +132,11 @@
ASSERT_TRUE(merger.merge({}, tableA.get()));
ASSERT_TRUE(merger.mergeAndMangle({}, "com.app.b", tableB.get(), &collection));
- FileReference* f = test::getValue<FileReference>(&finalTable, "@com.app.a:xml/file");
+ FileReference* f = test::getValue<FileReference>(&finalTable, "com.app.a:xml/file");
ASSERT_NE(f, nullptr);
EXPECT_EQ(std::string("res/xml/file.xml"), *f->path);
- f = test::getValue<FileReference>(&finalTable, "@com.app.a:xml/com.app.b$file");
+ f = test::getValue<FileReference>(&finalTable, "com.app.a:xml/com.app.b$file");
ASSERT_NE(f, nullptr);
EXPECT_EQ(std::string("res/xml/com.app.b$file.xml"), *f->path);
}
@@ -144,11 +144,11 @@
TEST_F(TableMergerTest, OverrideResourceWithOverlay) {
std::unique_ptr<ResourceTable> base = test::ResourceTableBuilder()
.setPackageId("", 0x00)
- .addValue("@bool/foo", ResourceUtils::tryParseBool("true"))
+ .addValue("bool/foo", ResourceUtils::tryParseBool("true"))
.build();
std::unique_ptr<ResourceTable> overlay = test::ResourceTableBuilder()
.setPackageId("", 0x00)
- .addValue("@bool/foo", ResourceUtils::tryParseBool("false"))
+ .addValue("bool/foo", ResourceUtils::tryParseBool("false"))
.build();
ResourceTable finalTable;
@@ -159,7 +159,7 @@
ASSERT_TRUE(merger.merge({}, base.get()));
ASSERT_TRUE(merger.mergeOverlay({}, overlay.get()));
- BinaryPrimitive* foo = test::getValue<BinaryPrimitive>(&finalTable, "@com.app.a:bool/foo");
+ BinaryPrimitive* foo = test::getValue<BinaryPrimitive>(&finalTable, "com.app.a:bool/foo");
ASSERT_NE(nullptr, foo);
EXPECT_EQ(0x0u, foo->value.data);
}
@@ -167,11 +167,11 @@
TEST_F(TableMergerTest, MergeAddResourceFromOverlay) {
std::unique_ptr<ResourceTable> tableA = test::ResourceTableBuilder()
.setPackageId("", 0x7f)
- .setSymbolState("@bool/foo", {}, SymbolState::kUndefined)
+ .setSymbolState("bool/foo", {}, SymbolState::kUndefined)
.build();
std::unique_ptr<ResourceTable> tableB = test::ResourceTableBuilder()
.setPackageId("", 0x7f)
- .addValue("@bool/foo", ResourceUtils::tryParseBool("true"))
+ .addValue("bool/foo", ResourceUtils::tryParseBool("true"))
.build();
ResourceTable finalTable;
@@ -187,7 +187,7 @@
.build();
std::unique_ptr<ResourceTable> tableB = test::ResourceTableBuilder()
.setPackageId("", 0x7f)
- .addValue("@bool/foo", ResourceUtils::tryParseBool("true"))
+ .addValue("bool/foo", ResourceUtils::tryParseBool("true"))
.build();
ResourceTable finalTable;
@@ -205,7 +205,7 @@
.build();
std::unique_ptr<ResourceTable> tableB = test::ResourceTableBuilder()
.setPackageId("", 0x7f)
- .addValue("@bool/foo", ResourceUtils::tryParseBool("true"))
+ .addValue("bool/foo", ResourceUtils::tryParseBool("true"))
.build();
ResourceTable finalTable;