commit 9fdac7fc2a522ac8f49416c688227087bb383dc7
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Feb 09 20:35:13 2023 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Feb 09 20:35:13 2023 +0100
tree cce44dc436e71eeea0123a416c07ef670361fe9f
parent cfacf1e9f428d6853195cfb041ef5fda997662eb

Update enum unboxing profile rewriting test expectation

Change-Id: Ic6bce0a3115f58696fd0bb2a952e196bd2e1c8b8

src/test/java/com/android/tools/r8/profile/art/completeness/EnumUnboxingUtilityMethodProfileRewritingTest.java

diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/EnumUnboxingUtilityMethodProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/EnumUnboxingUtilityMethodProfileRewritingTest.java
index 13a8c9d..e9058d4 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/EnumUnboxingUtilityMethodProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/EnumUnboxingUtilityMethodProfileRewritingTest.java
@@ -88,18 +88,25 @@
             SyntheticItemsTestUtils.syntheticEnumUnboxingSharedUtilityClass(MyEnum.class));
     assertThat(enumUnboxingSharedUtilityClassSubject, isPresent());
     assertThat(enumUnboxingSharedUtilityClassSubject.clinit(), isPresent());
-    assertThat(
-        enumUnboxingSharedUtilityClassSubject.uniqueMethodWithOriginalName("ordinal"), isPresent());
-    assertThat(
-        enumUnboxingSharedUtilityClassSubject.uniqueMethodWithOriginalName("values"), isPresent());
 
-    // TODO(b/265729283): Should also include the above methods from enum unboxing.
+    MethodSubject sharedOrdinalMethodSubject =
+        enumUnboxingSharedUtilityClassSubject.uniqueMethodWithOriginalName("ordinal");
+    assertThat(sharedOrdinalMethodSubject, isPresent());
+
+    MethodSubject sharedValuesMethodSubject =
+        enumUnboxingSharedUtilityClassSubject.uniqueMethodWithOriginalName("values");
+    assertThat(sharedValuesMethodSubject, isPresent());
+
     profileInspector
+        .assertContainsClassRule(enumUnboxingSharedUtilityClassSubject)
         .assertContainsMethodRules(
             mainClassSubject.mainMethod(),
             localGreetMethodSubject,
             localOtherMethodSubject,
-            localValuesMethodSubject)
+            localValuesMethodSubject,
+            enumUnboxingSharedUtilityClassSubject.clinit(),
+            sharedOrdinalMethodSubject,
+            sharedValuesMethodSubject)
         .assertContainsNoOtherRules();
   }