summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2017-11-02 23:28:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-11-02 23:28:32 +0000
commit181799bc53c45282ffa50669430a5cb41f5c194d (patch)
tree65018b2a6bffde3a249dd8c797a6861e6d782dd3
parentbd1bb1d9067ec32b3fd0914e7eb1ccd629ef25dc (diff)
parent178e67835a954511a6567064f3081ecd7796f737 (diff)
Merge "AAPT2: Update tests to reflect new development API 'P'"
-rw-r--r--tools/aapt2/configuration/ConfigurationParser_test.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/aapt2/configuration/ConfigurationParser_test.cpp b/tools/aapt2/configuration/ConfigurationParser_test.cpp
index 3654901e3e02..afa155f46eb9 100644
--- a/tools/aapt2/configuration/ConfigurationParser_test.cpp
+++ b/tools/aapt2/configuration/ConfigurationParser_test.cpp
@@ -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);
}