summaryrefslogtreecommitdiff
path: root/tools/aapt2/link/ReferenceLinker_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/aapt2/link/ReferenceLinker_test.cpp')
-rw-r--r--tools/aapt2/link/ReferenceLinker_test.cpp106
1 files changed, 53 insertions, 53 deletions
diff --git a/tools/aapt2/link/ReferenceLinker_test.cpp b/tools/aapt2/link/ReferenceLinker_test.cpp
index 76b23098a35c..17c26360313e 100644
--- a/tools/aapt2/link/ReferenceLinker_test.cpp
+++ b/tools/aapt2/link/ReferenceLinker_test.cpp
@@ -23,41 +23,41 @@ namespace aapt {
TEST(ReferenceLinkerTest, LinkSimpleReferences) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addReference(u"@com.app.test:string/foo", ResourceId(0x7f020000),
- u"@com.app.test:string/bar")
+ .setPackageId("com.app.test", 0x7f)
+ .addReference("@com.app.test:string/foo", ResourceId(0x7f020000),
+ "@com.app.test:string/bar")
// Test use of local reference (w/o package name).
- .addReference(u"@com.app.test:string/bar", ResourceId(0x7f020001), u"@string/baz")
+ .addReference("@com.app.test:string/bar", ResourceId(0x7f020001), "@string/baz")
- .addReference(u"@com.app.test:string/baz", ResourceId(0x7f020002),
- u"@android:string/ok")
+ .addReference("@com.app.test:string/baz", ResourceId(0x7f020002),
+ "@android:string/ok")
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test" })
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addPublicSymbol(u"@android:string/ok", ResourceId(0x01040034))
+ .addPublicSymbol("@android:string/ok", ResourceId(0x01040034))
.build())
.build();
ReferenceLinker linker;
ASSERT_TRUE(linker.consume(context.get(), table.get()));
- Reference* ref = test::getValue<Reference>(table.get(), u"@com.app.test:string/foo");
+ Reference* ref = test::getValue<Reference>(table.get(), "@com.app.test:string/foo");
ASSERT_NE(ref, nullptr);
AAPT_ASSERT_TRUE(ref->id);
EXPECT_EQ(ref->id.value(), ResourceId(0x7f020001));
- ref = test::getValue<Reference>(table.get(), u"@com.app.test:string/bar");
+ ref = test::getValue<Reference>(table.get(), "@com.app.test:string/bar");
ASSERT_NE(ref, nullptr);
AAPT_ASSERT_TRUE(ref->id);
EXPECT_EQ(ref->id.value(), ResourceId(0x7f020002));
- ref = test::getValue<Reference>(table.get(), u"@com.app.test:string/baz");
+ ref = test::getValue<Reference>(table.get(), "@com.app.test:string/baz");
ASSERT_NE(ref, nullptr);
AAPT_ASSERT_TRUE(ref->id);
EXPECT_EQ(ref->id.value(), ResourceId(0x01040034));
@@ -65,39 +65,39 @@ TEST(ReferenceLinkerTest, LinkSimpleReferences) {
TEST(ReferenceLinkerTest, LinkStyleAttributes) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addValue(u"@com.app.test:style/Theme", test::StyleBuilder()
- .setParent(u"@android:style/Theme.Material")
- .addItem(u"@android:attr/foo", ResourceUtils::tryParseColor(u"#ff00ff"))
- .addItem(u"@android:attr/bar", {} /* placeholder */)
+ .setPackageId("com.app.test", 0x7f)
+ .addValue("@com.app.test:style/Theme", test::StyleBuilder()
+ .setParent("@android:style/Theme.Material")
+ .addItem("@android:attr/foo", ResourceUtils::tryParseColor("#ff00ff"))
+ .addItem("@android:attr/bar", {} /* placeholder */)
.build())
.build();
{
// We need to fill in the value for the attribute android:attr/bar after we build the
// table, because we need access to the string pool.
- Style* style = test::getValue<Style>(table.get(), u"@com.app.test:style/Theme");
+ Style* style = test::getValue<Style>(table.get(), "@com.app.test:style/Theme");
ASSERT_NE(style, nullptr);
style->entries.back().value = util::make_unique<RawString>(
- table->stringPool.makeRef(u"one|two"));
+ table->stringPool.makeRef("one|two"));
}
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test" })
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addPublicSymbol(u"@android:style/Theme.Material",
+ .addPublicSymbol("@android:style/Theme.Material",
ResourceId(0x01060000))
- .addPublicSymbol(u"@android:attr/foo", ResourceId(0x01010001),
+ .addPublicSymbol("@android:attr/foo", ResourceId(0x01010001),
test::AttributeBuilder()
.setTypeMask(ResTable_map::TYPE_COLOR)
.build())
- .addPublicSymbol(u"@android:attr/bar", ResourceId(0x01010002),
+ .addPublicSymbol("@android:attr/bar", ResourceId(0x01010002),
test::AttributeBuilder()
.setTypeMask(ResTable_map::TYPE_FLAGS)
- .addItem(u"one", 0x01)
- .addItem(u"two", 0x02)
+ .addItem("one", 0x01)
+ .addItem("two", 0x02)
.build())
.build())
.build();
@@ -105,7 +105,7 @@ TEST(ReferenceLinkerTest, LinkStyleAttributes) {
ReferenceLinker linker;
ASSERT_TRUE(linker.consume(context.get(), table.get()));
- Style* style = test::getValue<Style>(table.get(), u"@com.app.test:style/Theme");
+ Style* style = test::getValue<Style>(table.get(), "@com.app.test:style/Theme");
ASSERT_NE(style, nullptr);
AAPT_ASSERT_TRUE(style->parent);
AAPT_ASSERT_TRUE(style->parent.value().id);
@@ -124,11 +124,11 @@ TEST(ReferenceLinkerTest, LinkStyleAttributes) {
TEST(ReferenceLinkerTest, LinkMangledReferencesAndAttributes) {
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test", { u"com.android.support" } })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test", { "com.android.support" } })
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addPublicSymbol(u"@com.app.test:attr/com.android.support$foo",
+ .addPublicSymbol("@com.app.test:attr/com.android.support$foo",
ResourceId(0x7f010000),
test::AttributeBuilder()
.setTypeMask(ResTable_map::TYPE_COLOR)
@@ -137,17 +137,17 @@ TEST(ReferenceLinkerTest, LinkMangledReferencesAndAttributes) {
.build();
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addValue(u"@com.app.test:style/Theme", ResourceId(0x7f020000),
- test::StyleBuilder().addItem(u"@com.android.support:attr/foo",
- ResourceUtils::tryParseColor(u"#ff0000"))
+ .setPackageId("com.app.test", 0x7f)
+ .addValue("@com.app.test:style/Theme", ResourceId(0x7f020000),
+ test::StyleBuilder().addItem("@com.android.support:attr/foo",
+ ResourceUtils::tryParseColor("#ff0000"))
.build())
.build();
ReferenceLinker linker;
ASSERT_TRUE(linker.consume(context.get(), table.get()));
- Style* style = test::getValue<Style>(table.get(), u"@com.app.test:style/Theme");
+ Style* style = test::getValue<Style>(table.get(), "@com.app.test:style/Theme");
ASSERT_NE(style, nullptr);
ASSERT_EQ(1u, style->entries.size());
AAPT_ASSERT_TRUE(style->entries.front().key.id);
@@ -156,18 +156,18 @@ TEST(ReferenceLinkerTest, LinkMangledReferencesAndAttributes) {
TEST(ReferenceLinkerTest, FailToLinkPrivateSymbols) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addReference(u"@com.app.test:string/foo", ResourceId(0x7f020000),
- u"@android:string/hidden")
+ .setPackageId("com.app.test", 0x7f)
+ .addReference("@com.app.test:string/foo", ResourceId(0x7f020000),
+ "@android:string/hidden")
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test" })
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addSymbol(u"@android:string/hidden", ResourceId(0x01040034))
+ .addSymbol("@android:string/hidden", ResourceId(0x01040034))
.build())
.build();
@@ -177,18 +177,18 @@ TEST(ReferenceLinkerTest, FailToLinkPrivateSymbols) {
TEST(ReferenceLinkerTest, FailToLinkPrivateMangledSymbols) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addReference(u"@com.app.test:string/foo", ResourceId(0x7f020000),
- u"@com.app.lib:string/hidden")
+ .setPackageId("com.app.test", 0x7f)
+ .addReference("@com.app.test:string/foo", ResourceId(0x7f020000),
+ "@com.app.lib:string/hidden")
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test", { u"com.app.lib" } })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test", { "com.app.lib" } })
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addSymbol(u"@com.app.test:string/com.app.lib$hidden",
+ .addSymbol("@com.app.test:string/com.app.lib$hidden",
ResourceId(0x7f040034))
.build())
@@ -200,19 +200,19 @@ TEST(ReferenceLinkerTest, FailToLinkPrivateMangledSymbols) {
TEST(ReferenceLinkerTest, FailToLinkPrivateStyleAttributes) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addValue(u"@com.app.test:style/Theme", test::StyleBuilder()
- .addItem(u"@android:attr/hidden", ResourceUtils::tryParseColor(u"#ff00ff"))
+ .setPackageId("com.app.test", 0x7f)
+ .addValue("@com.app.test:style/Theme", test::StyleBuilder()
+ .addItem("@android:attr/hidden", ResourceUtils::tryParseColor("#ff00ff"))
.build())
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test" })
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addSymbol(u"@android:attr/hidden", ResourceId(0x01010001),
+ .addSymbol("@android:attr/hidden", ResourceId(0x01010001),
test::AttributeBuilder()
.setTypeMask(
android::ResTable_map::TYPE_COLOR)
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 17:51:24 +0000