drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 347040cf: am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev

Browse Source 
* commit '347040cf84401601b0d5cbb1d76e4648d1c8a461':
  Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
This commit is contained in:
Adam Lesinski
2014-12-11 01:38:33 +00:00
committed by Android Git Automerger
parent 227ce43d43 347040cf84
commit a76db13fb0
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/androidfw/tests/AttributeFinder_test.cpp
View File

@ -50,6 +50,10 @@ static const uint32_t packageUnsortedAttributes[] = {
0x01010002, 0x01010004, 0x7f010001
};
static const uint32_t singlePackageAttributes[] = {
0x7f010007, 0x7f01000a, 0x7f01000d, 0x00000000
};
TEST(AttributeFinderTest, IteratesSequentially) {
const int end = sizeof(sortedAttributes) / sizeof(*sortedAttributes);
MockAttributeFinder finder(sortedAttributes, end);
@ -109,3 +113,16 @@ TEST(AttributeFinderTest, FindAttributesInPackageUnsortedAttributeList) {
EXPECT_EQ(1, finder.find(0x02010010));
EXPECT_EQ(6, finder.find(0x7f010001));
}
TEST(AttributeFinderTest, FindAttributesInSinglePackageAttributeList) {
const int end = sizeof(singlePackageAttributes) / sizeof(*singlePackageAttributes);
MockAttributeFinder finder(singlePackageAttributes, end);
EXPECT_EQ(end, finder.find(0x010100f4));
EXPECT_EQ(end, finder.find(0x010100f5));
EXPECT_EQ(end, finder.find(0x010100f6));
EXPECT_EQ(end, finder.find(0x010100f7));
EXPECT_EQ(end, finder.find(0x010100f8));
EXPECT_EQ(end, finder.find(0x010100fa));
EXPECT_EQ(0, finder.find(0x7f010007));
}