From dacd31f5e8e6df529a4af64fcae7054f9a8ac60c Mon Sep 17 00:00:00 2001 From: Xavier Lepaul Date: Wed, 23 Mar 2022 12:14:19 +0100 Subject: [PATCH] =?UTF-8?q?Use=20the=20default=20Junit=20runner=20and=20An?= =?UTF-8?q?droid=E2=80=99s=20UI=20thread=20rule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:13662 Change-Id: Ifc8a81905345093c096066b7a659b943464d38b8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256464 Auto-Submit: Xavier Lepaul‎ Reviewed-by: Linus Nilsson Commit-Queue: Linus Nilsson Cr-Commit-Position: refs/heads/main@{#36317} --- sdk/android/BUILD.gn | 1 + .../src/org/webrtc/SurfaceViewRendererOnMeasureTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index e17fb33dac..f73144729d 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -1514,6 +1514,7 @@ if (is_android) { "//base:base_java_test_support", "//rtc_base:base_java", "//third_party/android_deps:guava_android_java", + "//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:runner_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_test_runner_java", diff --git a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java index 6c30610de8..4d499789e6 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java @@ -16,19 +16,19 @@ import static org.junit.Assert.fail; import android.annotation.SuppressLint; import android.graphics.Point; import android.support.test.InstrumentationRegistry; +import android.support.test.annotation.UiThreadTest; +import android.support.test.rule.UiThreadTestRule; import android.view.View.MeasureSpec; import androidx.test.filters.MediumTest; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; -import org.chromium.base.test.BaseJUnit4ClassRunner; -import org.chromium.base.test.UiThreadTest; import org.junit.Rule; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(BaseJUnit4ClassRunner.class) public class SurfaceViewRendererOnMeasureTest { + @Rule public final UiThreadTestRule uiThreadRule = new UiThreadTestRule(); + /** * List with all possible scaling types. */