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

Merge "AAPT2: Update tests to reflect new development API 'P'"

Browse Source
This commit is contained in:
Adam Lesinski
2017-11-02 23:28:32 +00:00
committed by Android (Google) Code Review
parent bd1bb1d906 178e67835a
commit 181799bc53
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/aapt2/configuration/ConfigurationParser_test.cpp
View File

@@ -423,11 +423,11 @@ TEST_F(ConfigurationParserTest, AndroidSdkGroupAction) {
TEST_F(ConfigurationParserTest, AndroidSdkGroupAction_NonNumeric) {
static constexpr const char* xml = R"xml(
<android-sdk-group label="O">
<android-sdk-group label="P">
<android-sdk
minSdkVersion="M"
targetSdkVersion="O"
maxSdkVersion="O">
targetSdkVersion="P"
maxSdkVersion="P">
</android-sdk>
</android-sdk-group>)xml";
@@ -438,14 +438,14 @@ TEST_F(ConfigurationParserTest, AndroidSdkGroupAction_NonNumeric) {
ASSERT_TRUE(ok);
ASSERT_EQ(1ul, config.android_sdk_groups.size());
ASSERT_EQ(1u, config.android_sdk_groups.count("O"));
ASSERT_EQ(1u, config.android_sdk_groups.count("P"));
auto& out = config.android_sdk_groups["O"];
auto& out = config.android_sdk_groups["P"];
AndroidSdk sdk;
sdk.min_sdk_version = {}; // Only the latest development version is supported.
sdk.target_sdk_version = 26;
sdk.max_sdk_version = 26;
sdk.target_sdk_version = 28;
sdk.max_sdk_version = 28;
ASSERT_EQ(sdk, out);
}