diff options
| author | Nicholas Lativy <nlativy@google.com> | 2019-01-16 16:19:09 +0000 |
|---|---|---|
| committer | Nicholas Lativy <nlativy@google.com> | 2019-01-16 16:49:31 +0000 |
| commit | 79f039689895f620d8dee5d3a58e63f8cca1ba3e (patch) | |
| tree | b32eea286726171e5cc9bcff40bc9b7355942120 /tools/aapt2/ResourceUtils_test.cpp | |
| parent | f8e7ff917512017baf1fff7b2a9efd533fec78a5 (diff) | |
AAPT2: Add support for parsing codeNames with fingerprints.
In addition to supporting manifest declared codenames of the form
"[codename]", also support codenames of the form "[codename].[fingerprint]".
Matches the behaviour of PackageParser as of ag/6056697.
Test: ResourceUtils_test
Change-Id: I814330eba9d383e4549e35da791fcfa9bd0cdf57
Diffstat (limited to 'tools/aapt2/ResourceUtils_test.cpp')
| -rw-r--r-- | tools/aapt2/ResourceUtils_test.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/aapt2/ResourceUtils_test.cpp b/tools/aapt2/ResourceUtils_test.cpp index 5ce464074335..9018b0fc372a 100644 --- a/tools/aapt2/ResourceUtils_test.cpp +++ b/tools/aapt2/ResourceUtils_test.cpp @@ -16,6 +16,7 @@ #include "ResourceUtils.h" +#include "SdkConstants.h" #include "Resource.h" #include "test/Test.h" @@ -212,6 +213,17 @@ TEST(ResourceUtilsTest, ItemsWithWhitespaceAreParsedCorrectly) { Pointee(ValueEq(BinaryPrimitive(Res_value::TYPE_FLOAT, expected_float_flattened)))); } +TEST(ResourceUtilsTest, ParseSdkVersionWithCodename) { + const android::StringPiece codename = + GetDevelopmentSdkCodeNameAndVersion().first; + const int version = GetDevelopmentSdkCodeNameAndVersion().second; + + EXPECT_THAT(ResourceUtils::ParseSdkVersion(codename), Eq(Maybe<int>(version))); + EXPECT_THAT( + ResourceUtils::ParseSdkVersion(codename.to_string() + ".fingerprint"), + Eq(Maybe<int>(version))); +} + TEST(ResourceUtilsTest, StringBuilderWhitespaceRemoval) { EXPECT_THAT(ResourceUtils::StringBuilder() .AppendText(" hey guys ") |