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

Use Google3 style guide with .clang-format

Browse Source 
Test: style change only, builds ok
Change-Id: I885180e24cb2e7b58cfb4967c3bcb40058ce4078
This commit is contained in:
Adam Lesinski
2016-10-19 12:18:14 -07:00
parent 733f0bc08e
commit cacb28f2d6
140 changed files with 20900 additions and 19802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
tools/aapt2/link/VersionCollapser_test.cpp
View File

@ -22,82 +22,96 @@ namespace aapt {
template <typename T>
using uptr = std::unique_ptr<T>;
static uptr<ResourceTable> buildTableWithConfigs(const StringPiece& name,
std::initializer_list<std::string> list) {
test::ResourceTableBuilder builder;
for (const std::string& item : list) {
builder.addSimple(name, test::parseConfigOrDie(item));
}
return builder.build();
static uptr<ResourceTable> buildTableWithConfigs(
const StringPiece& name, std::initializer_list<std::string> list) {
test::ResourceTableBuilder builder;
for (const std::string& item : list) {
builder.addSimple(name, test::parseConfigOrDie(item));
}
return builder.build();
}
TEST(VersionCollapserTest, CollapseVersions) {
uptr<IAaptContext> context = test::ContextBuilder().setMinSdkVersion(7).build();
uptr<IAaptContext> context =
test::ContextBuilder().setMinSdkVersion(7).build();
const StringPiece resName = "@android:string/foo";
const StringPiece resName = "@android:string/foo";
uptr<ResourceTable> table =
buildTableWithConfigs(resName,
{ "land-v4", "land-v5", "sw600dp", "land-v6",
"land-v14", "land-v21" });
uptr<ResourceTable> table = buildTableWithConfigs(
resName,
{"land-v4", "land-v5", "sw600dp", "land-v6", "land-v14", "land-v21"});
VersionCollapser collapser;
ASSERT_TRUE(collapser.consume(context.get(), table.get()));
VersionCollapser collapser;
ASSERT_TRUE(collapser.consume(context.get(), table.get()));
// These should be removed.
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v4")));
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v5")));
// This one should be removed because it was renamed to 'land', with the version dropped.
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v6")));
// These should be removed.
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v4")));
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v5")));
// This one should be removed because it was renamed to 'land', with the
// version dropped.
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v6")));
// These should remain.
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("sw600dp")));
// These should remain.
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("sw600dp")));
// 'land' should be present because it was renamed from 'land-v6'.
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land")));
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v14")));
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v21")));
// 'land' should be present because it was renamed from 'land-v6'.
EXPECT_NE(nullptr, test::getValueForConfig<Id>(
table.get(), resName, test::parseConfigOrDie("land")));
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v14")));
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v21")));
}
TEST(VersionCollapserTest, CollapseVersionsWhenMinSdkIsHighest) {
uptr<IAaptContext> context = test::ContextBuilder().setMinSdkVersion(21).build();
uptr<IAaptContext> context =
test::ContextBuilder().setMinSdkVersion(21).build();
const StringPiece resName = "@android:string/foo";
const StringPiece resName = "@android:string/foo";
uptr<ResourceTable> table =
buildTableWithConfigs(resName,
{ "land-v4", "land-v5", "sw600dp", "land-v6",
"land-v14", "land-v21", "land-v22" });
VersionCollapser collapser;
ASSERT_TRUE(collapser.consume(context.get(), table.get()));
uptr<ResourceTable> table = buildTableWithConfigs(
resName, {"land-v4", "land-v5", "sw600dp", "land-v6", "land-v14",
"land-v21", "land-v22"});
VersionCollapser collapser;
ASSERT_TRUE(collapser.consume(context.get(), table.get()));
// These should all be removed.
EXPECT_EQ(nullptr, test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v4")));
EXPECT_EQ(nullptr, test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v5")));
EXPECT_EQ(nullptr, test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v6")));
EXPECT_EQ(nullptr, test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v14")));
// These should all be removed.
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v4")));
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v5")));
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v6")));
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v14")));
// These should remain.
EXPECT_NE(nullptr, test::getValueForConfig<Id>(
table.get(), resName, test::parseConfigOrDie("sw600dp").copyWithoutSdkVersion()));
// These should remain.
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(
table.get(), resName,
test::parseConfigOrDie("sw600dp").copyWithoutSdkVersion()));
// land-v21 should have been converted to land.
EXPECT_NE(nullptr, test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land")));
// land-v22 should remain as-is.
EXPECT_NE(nullptr, test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v22")));
// land-v21 should have been converted to land.
EXPECT_NE(nullptr, test::getValueForConfig<Id>(
table.get(), resName, test::parseConfigOrDie("land")));
// land-v22 should remain as-is.
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName,
test::parseConfigOrDie("land-v22")));
}
} // namespace aapt
} // namespace aapt