android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java - Issue 2047113002: [Android] Make @DisableIf.Build work on classes.

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java

Issue 2047113002: [Android] Make @DisableIf.Build work on classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java

index b9ab2fe0e01a45251afee6a491dd5c262d67ce81..ad632bfe40bd1eeb3633f85b7f5d4a518e8bcddf 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java

@@ -32,6 +32,7 @@ import java.util.concurrent.TimeoutException;

* we pick a div containing a video and custom html controls since this is a

* very common use case.

+@DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public class AwContentsClientFullScreenTest extends AwTestBase {

private static final String VIDEO_TEST_URL =

"file:///android_asset/full_screen_video_test.html";

@@ -65,7 +66,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

@DisableHardwareAccelerationForTest

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testFullscreenVideoInSoftwareModeDoesNotDeadlock() throws Throwable {

// Although fullscreen video is not supported without hardware acceleration

// we should not deadlock if apps try to use it.

@@ -83,7 +83,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

@DisableHardwareAccelerationForTest

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testFullscreenForNonVideoElementIsSupportedInSoftwareMode() throws Throwable {

// Fullscreen for non-video elements is supported and works as expected. Note that

// this test is the same as testOnShowAndHideCustomViewWithCallback_videoInsideDiv below.

@@ -92,14 +91,12 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testOnShowAndHideCustomViewWithCallback_video() throws Throwable {

doTestOnShowAndHideCustomViewWithCallback(VIDEO_TEST_URL);

}

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testOnShowAndHideCustomViewWithCallback_videoInsideDiv() throws Throwable {

doTestOnShowAndHideCustomViewWithCallback(VIDEO_INSIDE_DIV_TEST_URL);

}

@@ -115,14 +112,12 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testOnShowAndHideCustomViewWithJavascript_video() throws Throwable {

doTestOnShowAndHideCustomViewWithJavascript(VIDEO_TEST_URL);

}

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testOnShowAndHideCustomViewWithJavascript_videoInsideDiv()

throws Throwable {

doTestOnShowAndHideCustomViewWithJavascript(VIDEO_INSIDE_DIV_TEST_URL);

@@ -140,14 +135,12 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

@ParameterizedTest.Set // crbug.com/616501

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testOnShowAndHideCustomViewWithBackKey_video() throws Throwable {

doTestOnShowAndHideCustomViewWithBackKey(VIDEO_TEST_URL);

}

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testOnShowAndHideCustomViewWithBackKey_videoInsideDiv()

throws Throwable {

doTestOnShowAndHideCustomViewWithBackKey(VIDEO_INSIDE_DIV_TEST_URL);

@@ -174,7 +167,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testExitFullscreenEndsIfAppInvokesCallbackFromOnHideCustomView() throws Throwable {

mContentsClient.setOnHideCustomViewRunnable(new Runnable() {

@Override

@@ -187,14 +179,12 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testOnShowCustomViewAndPlayWithHtmlControl_video() throws Throwable {

doTestOnShowCustomViewAndPlayWithHtmlControl(VIDEO_TEST_URL);

}

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testOnShowCustomViewAndPlayWithHtmlControl_videoInsideDiv() throws Throwable {

doTestOnShowCustomViewAndPlayWithHtmlControl(VIDEO_INSIDE_DIV_TEST_URL);

}

@@ -209,7 +199,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testHolePunchingSurfaceNotCreatedForClearVideo()

throws Throwable {

loadTestPage(VIDEO_TEST_URL);

@@ -226,7 +215,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testOnShowCustomViewTransfersHolePunchingSurfaceForVideoInsideDiv()

throws Throwable {

getInstrumentation().runOnMainSync(new Runnable() {

@@ -261,7 +249,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testOnShowCustomViewRemovesHolePunchingSurfaceForVideo()

throws Throwable {

getInstrumentation().runOnMainSync(new Runnable() {

@@ -300,14 +287,12 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testFullscreenNotSupported_video() throws Throwable {

doTestFullscreenNotSupported(VIDEO_TEST_URL);

}

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testFullscreenNotSupported_videoInsideDiv() throws Throwable {

doTestFullscreenNotSupported(VIDEO_INSIDE_DIV_TEST_URL);

}

@@ -325,7 +310,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testPowerSaveBlockerIsEnabledDuringFullscreenPlayback_video()

throws Throwable {

doTestPowerSaveBlockerIsEnabledDuringFullscreenPlayback(VIDEO_TEST_URL);

@@ -333,7 +317,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testPowerSaveBlockerIsEnabledDuringFullscreenPlayback_videoInsideDiv()

throws Throwable {

doTestPowerSaveBlockerIsEnabledDuringFullscreenPlayback(VIDEO_INSIDE_DIV_TEST_URL);

@@ -359,7 +342,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testPowerSaveBlockerIsEnabledDuringEmbeddedPlayback()

throws Throwable {

assertFalse(DOMUtils.isFullscreen(getWebContentsOnUiThread()));

@@ -379,7 +361,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testPowerSaveBlockerIsTransferredToFullscreen()

throws Throwable {

assertFalse(DOMUtils.isFullscreen(getWebContentsOnUiThread()));

@@ -408,7 +389,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {

@MediumTest

@Feature({"AndroidWebView"})

- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/615483,615184")

public void testPowerSaveBlockerIsTransferredToEmbedded()

throws Throwable {

// Enter fullscreen.

« no previous file with comments | « no previous file | base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java » ('j') | no next file with comments »