diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-28 04:17:27 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-28 04:17:27 +0000 |
commit | 1a49eb5c125ee06c3f73b79e6634c838e3444d97 (patch) | |
tree | 43e828e9d95be02a49bbc70faf10b121108c5367 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c44ba6b889b8579978372ca3d9161dabe7823fe1 (diff) | |
parent | 8b5662b5f7d282a66837ca1e7fe2fab2a07500cc (diff) |
Snap for 6038280 from 8b5662b5f7d282a66837ca1e7fe2fab2a07500cc to rvc-release
Change-Id: Id168372da97560648b6d1375c97e066e1a545a5e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
-rw-r--r-- | tools/aapt2/java/JavaClassGenerator_test.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/aapt2/java/JavaClassGenerator_test.cpp b/tools/aapt2/java/JavaClassGenerator_test.cpp index 4f51fc48c80e..1e1fe4740c6b 100644 --- a/tools/aapt2/java/JavaClassGenerator_test.cpp +++ b/tools/aapt2/java/JavaClassGenerator_test.cpp @@ -522,9 +522,15 @@ TEST(JavaClassGeneratorTest, GenerateOnResourcesLoadedCallbackForSharedLibrary) ASSERT_TRUE(generator.Generate("android", &out)); out.Flush(); - EXPECT_THAT(output, HasSubstr("void onResourcesLoaded")); - EXPECT_THAT(output, HasSubstr("com.foo.R.onResourcesLoaded")); - EXPECT_THAT(output, HasSubstr("com.boo.R.onResourcesLoaded")); + EXPECT_THAT(output, HasSubstr( + R"( public static void onResourcesLoaded(int p) { + com.foo.R.onResourcesLoaded(p); + com.boo.R.onResourcesLoaded(p); + final int packageIdBits = p << 24; + attr.foo = (attr.foo & 0x00ffffff) | packageIdBits; + id.foo = (id.foo & 0x00ffffff) | packageIdBits; + style.foo = (style.foo & 0x00ffffff) | packageIdBits; + })")); } TEST(JavaClassGeneratorTest, OnlyGenerateRText) { |