summaryrefslogtreecommitdiffstats
path: root/android_webview/javatests
diff options
context:
space:
mode:
authormichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-30 07:19:24 +0000
committermichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-30 07:19:24 +0000
commitb129c25c713786298edba231d65c3a3280360bd6 (patch)
tree346e2a46237fd423b461769f73075242eda11bee /android_webview/javatests
parent3e6c195097f5670e635aa59ea6ec462157663bfe (diff)
downloadchromium_src-b129c25c713786298edba231d65c3a3280360bd6.zip
chromium_src-b129c25c713786298edba231d65c3a3280360bd6.tar.gz
chromium_src-b129c25c713786298edba231d65c3a3280360bd6.tar.bz2
Add more wait time before inject event.
Since we don't know when the page stop rendering, have to add a long wait time, hope it could work for all bots. NOTRY=true BUG=224923 Review URL: https://chromiumcodereview.appspot.com/13317004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/javatests')
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java8
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java8
2 files changed, 10 insertions, 6 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
index 51e30eb..795a62c 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
@@ -4,7 +4,7 @@
package org.chromium.android_webview.test;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.test.suitebuilder.annotation.LargeTest;
import android.test.TouchUtils;
import android.view.KeyEvent;
@@ -17,7 +17,7 @@ import org.chromium.base.test.util.Feature;
public class AwContentsClientFullScreenVideoTest extends AwTestBase {
@Feature({"AndroidWebView"})
- @SmallTest
+ @LargeTest
public void testOnShowAndHideCustomView() throws Throwable {
FullScreenVideoTestAwContentsClient contentsClient =
new FullScreenVideoTestAwContentsClient(getActivity());
@@ -30,7 +30,9 @@ public class AwContentsClientFullScreenVideoTest extends AwTestBase {
loadUrlSync(testContainerView.getAwContents(),
contentsClient.getOnPageFinishedHelper(),
webServer.getFullScreenVideoTestURL());
- Thread.sleep(5 * 1000);
+ // Temporary code to figure out minimal wait time for page show up.
+ // see crbug/224923.
+ Thread.sleep(10 * 1000);
TouchUtils.clickView(AwContentsClientFullScreenVideoTest.this, testContainerView);
contentsClient.waitForCustomViewShown();
getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
index 312ecb5..6c4b98c 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
@@ -4,7 +4,7 @@
package org.chromium.android_webview.test;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.test.suitebuilder.annotation.LargeTest;
import android.test.TouchUtils;
import android.view.View;
@@ -46,7 +46,7 @@ public class AwContentsClientGetVideoLoadingProgressViewTest extends AwTestBase
@Feature({"AndroidWebView"})
- @SmallTest
+ @LargeTest
public void testGetVideoLoadingProgressView() throws Throwable {
TestAwContentsClient contentsClient =
new FullScreenVideoTestAwContentsClient(getActivity()) {
@@ -67,7 +67,9 @@ public class AwContentsClientGetVideoLoadingProgressViewTest extends AwTestBase
try {
loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(),
webServer.getFullScreenVideoTestURL());
- Thread.sleep(5 * 1000);
+ // Temporary solution to figure out minimal wait time for page show up.
+ // see crbug/224923.
+ Thread.sleep(10 * 1000);
TouchUtils.clickView(AwContentsClientGetVideoLoadingProgressViewTest.this,
testContainerView);
waitForViewAttached();