diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-20 17:14:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-20 17:14:35 +0000 |
| commit | 24a464a9be413dfef1476fd1919e2008609de93a (patch) | |
| tree | a4b6f646ae8088ccdb39023dd0b3058b307d3dac /tools/aapt2/java/ProguardRules_test.cpp | |
| parent | 2fea10559beacb6f47f0e6c7ad343153f86de8f0 (diff) | |
| parent | cc65b8dba6cc18faf7a47584ef3a3557ed8ce77b (diff) | |
Merge "Only keep necessary constructor for custom view nodes"
Diffstat (limited to 'tools/aapt2/java/ProguardRules_test.cpp')
| -rw-r--r-- | tools/aapt2/java/ProguardRules_test.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/aapt2/java/ProguardRules_test.cpp b/tools/aapt2/java/ProguardRules_test.cpp index a41a8ca3394a..83c72d89bb62 100644 --- a/tools/aapt2/java/ProguardRules_test.cpp +++ b/tools/aapt2/java/ProguardRules_test.cpp @@ -152,7 +152,8 @@ TEST(ProguardRulesTest, CustomViewRulesAreEmitted) { std::string actual = GetKeepSetString(set); - EXPECT_THAT(actual, HasSubstr("-keep class com.foo.Bar { <init>(...); }")); + EXPECT_THAT(actual, HasSubstr( + "-keep class com.foo.Bar { <init>(android.content.Context, android.util.AttributeSet); }")); } TEST(ProguardRulesTest, IncludedLayoutRulesAreConditional) { @@ -190,7 +191,8 @@ TEST(ProguardRulesTest, IncludedLayoutRulesAreConditional) { std::string actual = GetKeepSetString(set); EXPECT_THAT(actual, HasSubstr("-if class **.R$layout")); - EXPECT_THAT(actual, HasSubstr("-keep class com.foo.Bar { <init>(...); }")); + EXPECT_THAT(actual, HasSubstr( + "-keep class com.foo.Bar { <init>(android.content.Context, android.util.AttributeSet); }")); EXPECT_THAT(actual, HasSubstr("int foo")); EXPECT_THAT(actual, HasSubstr("int bar")); } @@ -209,7 +211,8 @@ TEST(ProguardRulesTest, AliasedLayoutRulesAreConditional) { std::string actual = GetKeepSetString(set); - EXPECT_THAT(actual, HasSubstr("-keep class com.foo.Bar { <init>(...); }")); + EXPECT_THAT(actual, HasSubstr( + "-keep class com.foo.Bar { <init>(android.content.Context, android.util.AttributeSet); }")); EXPECT_THAT(actual, HasSubstr("-if class **.R$layout")); EXPECT_THAT(actual, HasSubstr("int foo")); EXPECT_THAT(actual, HasSubstr("int bar")); @@ -230,7 +233,8 @@ TEST(ProguardRulesTest, NonLayoutReferencesAreUnconditional) { std::string actual = GetKeepSetString(set); EXPECT_THAT(actual, Not(HasSubstr("-if"))); - EXPECT_THAT(actual, HasSubstr("-keep class com.foo.Bar { <init>(...); }")); + EXPECT_THAT(actual, HasSubstr( + "-keep class com.foo.Bar { <init>(android.content.Context, android.util.AttributeSet); }")); } TEST(ProguardRulesTest, ViewOnClickRuleIsEmitted) { |