zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the default Junit runner and Android’s UI thread rule

Browse Source 
Bug: webrtc:13662
Change-Id: Ifc8a81905345093c096066b7a659b943464d38b8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256464
Auto-Submit: Xavier Lepaul‎ <xalep@webrtc.org>
Reviewed-by: Linus Nilsson <lnilsson@webrtc.org>
Commit-Queue: Linus Nilsson <lnilsson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36317}
This commit is contained in:
Xavier Lepaul
2022-03-23 12:14:19 +01:00
committed by WebRTC LUCI CQ
parent 568bc23208
commit dacd31f5e8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/android/BUILD.gn
View File

@ -1514,6 +1514,7 @@ if (is_android) {
"//base:base_java_test_support", "//base:base_java_test_support",
"//rtc_base:base_java", "//rtc_base:base_java",
"//third_party/android_deps:guava_android_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/android_support_test_runner:runner_java",
"//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/androidx:androidx_test_runner_java", "//third_party/androidx:androidx_test_runner_java",

8
sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
View File

@ -16,19 +16,19 @@ import static org.junit.Assert.fail;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.graphics.Point; import android.graphics.Point;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.rule.UiThreadTestRule;
import android.view.View.MeasureSpec; import android.view.View.MeasureSpec;
import androidx.test.filters.MediumTest; import androidx.test.filters.MediumTest;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.UiThreadTest;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(BaseJUnit4ClassRunner.class)
public class SurfaceViewRendererOnMeasureTest { public class SurfaceViewRendererOnMeasureTest {
@Rule public final UiThreadTestRule uiThreadRule = new UiThreadTestRule();
/** /**
* List with all possible scaling types. * List with all possible scaling types.
*/ */