diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2019-04-11 14:29:25 -0700 |
|---|---|---|
| committer | Ryan Mitchell <rtmitchell@google.com> | 2019-04-11 14:29:25 -0700 |
| commit | 48002f631334833231b2c9e5b8e54de8c58fc9b1 (patch) | |
| tree | e22403a14ed230772e87e5434a432f5e5fd60563 /tools/aapt2/ResourceUtils_test.cpp | |
| parent | d81cd2629666b0ed852142607852232094e04d11 (diff) | |
qt-dev-plus-aosp designated for R. Update MAX_PLATFORM_VERSION, etc.
Test: aapt2_tests
Bug: 128934651
Change-Id: I179f7b92dcf65e77f039e6cd42d91bf5b1461e35
Diffstat (limited to 'tools/aapt2/ResourceUtils_test.cpp')
| -rw-r--r-- | tools/aapt2/ResourceUtils_test.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/aapt2/ResourceUtils_test.cpp b/tools/aapt2/ResourceUtils_test.cpp index 3b77135a09eb..c016cb44af00 100644 --- a/tools/aapt2/ResourceUtils_test.cpp +++ b/tools/aapt2/ResourceUtils_test.cpp @@ -214,14 +214,15 @@ TEST(ResourceUtilsTest, ItemsWithWhitespaceAreParsedCorrectly) { } TEST(ResourceUtilsTest, ParseSdkVersionWithCodename) { - const android::StringPiece codename = - GetDevelopmentSdkCodeNameAndVersion().first; - const int version = GetDevelopmentSdkCodeNameAndVersion().second; + EXPECT_THAT(ResourceUtils::ParseSdkVersion("Q"), Eq(Maybe<int>(10000))); + EXPECT_THAT( + ResourceUtils::ParseSdkVersion("Q.fingerprint"), + Eq(Maybe<int>(10000))); - EXPECT_THAT(ResourceUtils::ParseSdkVersion(codename), Eq(Maybe<int>(version))); + EXPECT_THAT(ResourceUtils::ParseSdkVersion("R"), Eq(Maybe<int>(10000))); EXPECT_THAT( - ResourceUtils::ParseSdkVersion(codename.to_string() + ".fingerprint"), - Eq(Maybe<int>(version))); + ResourceUtils::ParseSdkVersion("R.fingerprint"), + Eq(Maybe<int>(10000))); } TEST(ResourceUtilsTest, StringBuilderWhitespaceRemoval) { |