summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Saff <saff@google.com> 2024-10-22 16:54:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-22 16:54:48 +0000
commit599e4263fc373b3744bd18daaddfc1870a0b6c6b (patch)
tree8fe3515cb0495facd8eaafd993912e16f0c60908
parent12910ec3866903f56b6d1fb0590fe0573499e2c4 (diff)
parent9de2b9d7f6ad450712e41a2d9c30688bc3cc3f2f (diff)
Merge "Skip ScrollCaptureControllerTest on robolectric" into main
-rw-r--r--packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/scroll/ScrollCaptureControllerTest.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/scroll/ScrollCaptureControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/scroll/ScrollCaptureControllerTest.java
index f8de714c6021..a831e6344a66 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/scroll/ScrollCaptureControllerTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/scroll/ScrollCaptureControllerTest.java
@@ -38,6 +38,8 @@ import com.android.internal.logging.testing.UiEventLoggerFake;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.screenshot.scroll.ScrollCaptureClient.Session;
+import org.junit.Assume;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -49,6 +51,12 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
public class ScrollCaptureControllerTest extends SysuiTestCase {
+ @Before
+ public void assumeOnDevice() {
+ // TODO(b/373930957) this class hangs under robolectric
+ Assume.assumeFalse(isRobolectricTest());
+ }
+
private static final ScrollCaptureResponse EMPTY_RESPONSE =
new ScrollCaptureResponse.Builder().build();