commit 4dc52bbe3125a5ad9b359211da9979436909c090
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Dec 23 17:50:47 2021 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Dec 23 16:51:09 2021 +0000
tree 00f081322efa80e1b76a21169915f8845260b072
parent 97fbc61627b6ca44bfee28920e40eaddb8b6e03b

[ApiModel] Update test expectations after changes

Change-Id: I8e89f800d1070fbbb02013f4dbff0b1ded0135f4

src/test/java/com/android/tools/r8/apimodel/ApiModelNoMockForOutlineTest.java

diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoMockForOutlineTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoMockForOutlineTest.java
index df5f9a0..a4cbd4b 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoMockForOutlineTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoMockForOutlineTest.java
@@ -46,8 +46,9 @@
   public void testR8() throws Exception {
     assumeFalse(
         parameters.isDexRuntime() && parameters.getDexRuntimeVersion().isEqualTo(Version.V12_0_0));
-    boolean isClassLibraryLevel =
-        parameters.isDexRuntime() && parameters.getApiLevel().isGreaterThanOrEqualTo(classApiLevel);
+    boolean isMethodApiLevel =
+        parameters.isDexRuntime()
+            && parameters.getApiLevel().isGreaterThanOrEqualTo(methodApiLevel);
     Method methodOn23 = LibraryClass.class.getDeclaredMethod("methodOn23");
     Method mainMethod = Main.class.getDeclaredMethod("main", String[].class);
     testForR8(parameters.getBackend())
@@ -72,16 +73,15 @@
                     .isGreaterThanOrEqualTo(classApiLevel),
             b -> b.addBootClasspathClasses(LibraryClass.class))
         .run(parameters.getRuntime(), Main.class)
-        .assertSuccessWithOutputLinesIf(!isClassLibraryLevel, "Hello World")
-        .assertSuccessWithOutputLinesIf(
-            isClassLibraryLevel, "LibraryClass::methodOn23", "Hello World")
+        .assertSuccessWithOutputLinesIf(!isMethodApiLevel, "Hello World")
+        .assertSuccessWithOutputLinesIf(isMethodApiLevel, "LibraryClass::methodOn23", "Hello World")
         .inspect(
             inspector -> {
               assertThat(inspector.method(mainMethod), isPresent());
               verifyThat(inspector, parameters, methodOn23)
                   .isOutlinedFromUntil(mainMethod, methodApiLevel);
               verifyThat(inspector, parameters, LibraryClass.class).stubbedUntil(classApiLevel);
-              if (parameters.isDexRuntime() && !isClassLibraryLevel) {
+              if (parameters.isDexRuntime() && parameters.getApiLevel().isLessThan(classApiLevel)) {
                 // We never trace outlined method for stubs so this holds by default.
                 ClassSubject mockedLibraryClass = inspector.clazz(LibraryClass.class);
                 assertThat(mockedLibraryClass, isPresent());