commit ab00b7146814e685085dbaae723710b8cfbbcb8b
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Dec 07 16:23:11 2020 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Dec 07 16:23:11 2020 +0100
tree dd2be5b216a8e093a2c7f1ea0ef21667c8c88d2a
parent d204c76b712d983204f3594766fffb35e0dd9101

Fix test expectation after not being able to remove enum for CF

Bug: 174826328
Change-Id: I445d16c177a4b0ee4c602f49db7666a715ae09c9

src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java

diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java b/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java
index acb1e86..3b9c067 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java
@@ -51,13 +51,9 @@
     //   * REQUIRED: annotation for Test.field1
     //   * OPTIONAL: default value of WireField.label
     // When generating class file the field values[] is also present as values() is kept.
-    assertEquals(
-        parameters.isCfRuntime() && defaultEnumValueInAnnotation ? 3 : 2,
-        classSubject.allFields().size());
+    assertEquals(parameters.isCfRuntime() ? 3 : 2, classSubject.allFields().size());
     // Methods <clinit>, <init> always present. values() present if generating class file.
-    assertEquals(
-        parameters.isCfRuntime() && defaultEnumValueInAnnotation ? 3 : 2,
-        classSubject.allMethods().size());
+    assertEquals(parameters.isCfRuntime() ? 3 : 2, classSubject.allMethods().size());
   }
 
   @Test
@@ -254,7 +250,7 @@
     return classWriter.toByteArray();
   }
 
-  public static byte[] classWireFieldLabel() throws Exception {
+  public static byte[] classWireFieldLabel() {
 
     ClassWriter classWriter = new ClassWriter(0);
     FieldVisitor fieldVisitor;