Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAPT2: Emit proper doclava comments in R.java

Browse Source 
Bug:25958912
Change-Id: I663f2eb5bd54e3c3288ce9bc186c928f0a014f93
This commit is contained in:
Adam Lesinski
2016-03-03 15:39:50 -08:00
parent 626a69f345
commit 74605cd402
4 changed files with 155 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/aapt2/java/JavaClassGenerator_test.cpp
View File

@@ -227,7 +227,32 @@ TEST(JavaClassGeneratorTest, CommentsForEnumAndFlagAttributesArePresent) {
}
TEST(JavaClassGeneratorTest, CommentsForStyleablesAndNestedAttributesArePresent) {
Attribute attr(false);
attr.setComment(StringPiece16(u"This is an attribute"));
Styleable styleable;
styleable.entries.push_back(Reference(test::parseNameOrDie(u"@android:attr/one")));
styleable.setComment(StringPiece16(u"This is a styleable"));
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
.setPackageId(u"android", 0x01)
.addValue(u"@android:attr/one", util::make_unique<Attribute>(attr))
.addValue(u"@android:styleable/Container",
std::unique_ptr<Styleable>(styleable.clone(nullptr)))
.build();
JavaClassGeneratorOptions options;
options.useFinal = false;
JavaClassGenerator generator(table.get(), options);
std::stringstream out;
ASSERT_TRUE(generator.generate(u"android", &out));
std::string actual = out.str();
EXPECT_NE(std::string::npos, actual.find("@attr name android:one"));
EXPECT_NE(std::string::npos, actual.find("@attr description"));
EXPECT_NE(std::string::npos, actual.find(util::utf16ToUtf8(attr.getComment())));
EXPECT_NE(std::string::npos, actual.find(util::utf16ToUtf8(styleable.getComment())));
}
} // namespace aapt