commit 617b17f1384e07fbb8c4e028fc1ad19919f93433
author Christoffer Adamsen <christofferqa@google.com> Tue Apr 08 12:35:59 2025 +0000
committer Christoffer Adamsen <christofferqa@google.com> Tue Apr 08 12:35:59 2025 +0000
tree b123828e5e690a9b055984daecf84dc430409d34
parent 9b16105ac0e546bc4bc1b7df57b3b52249a0ee4d

Fix incorrect assume in SynchronizedBlockTest

Change-Id: I19ea32f9d0c2f44647bb303871ec979ada231175

src/test/java/com/android/tools/r8/debug/SynchronizedBlockTest.java

diff --git a/src/test/java/com/android/tools/r8/debug/SynchronizedBlockTest.java b/src/test/java/com/android/tools/r8/debug/SynchronizedBlockTest.java
index c7ee7f1..1bddd04 100644
--- a/src/test/java/com/android/tools/r8/debug/SynchronizedBlockTest.java
+++ b/src/test/java/com/android/tools/r8/debug/SynchronizedBlockTest.java
@@ -3,16 +3,14 @@
 // BSD-style license that can be found in the LICENSE file.
 package com.android.tools.r8.debug;
 
-import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assume.assumeTrue;
 
 import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.ToolHelper;
-import com.android.tools.r8.ToolHelper.DexVm;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.debug.classes.SynchronizedBlock;
 import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.BooleanUtils;
 import java.util.List;
-import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -116,10 +114,9 @@
 
   @Test
   public void testThrowingBlock() throws Throwable {
-    Assume.assumeThat(
+    assumeTrue(
         "Connection timeout on 6.0.1 runtime. b/67671771",
-        ToolHelper.getDexVm().getVersion(),
-        not(DexVm.ART_6_0_1_TARGET.getVersion()));
+        parameters.isCfRuntime() || parameters.getDexRuntimeVersion() != Version.V6_0_1);
     final String method = "throwingBlock";
     runDebugTest(
         getConfig(),