summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-08 20:17:54 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-08 20:17:54 +0000
commit487d4379d18410e45ac51f9662433bcc3ba02124 (patch)
tree113e5daa78cf154af9261181f6dae67adc747ddc
parent5419df72bbe75dfe9931c912b4e20fab47e5a877 (diff)
downloadchromium_src-487d4379d18410e45ac51f9662433bcc3ba02124.zip
chromium_src-487d4379d18410e45ac51f9662433bcc3ba02124.tar.gz
chromium_src-487d4379d18410e45ac51f9662433bcc3ba02124.tar.bz2
Delete ContentViewMiscTest.testFlingScroll
This test was upstreamed in Android WebView without modification and afterwards an almost idential ContentViewScrollingTest.testFling is added in content and is fixed and passing after r186875. BUG=162967 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/12520004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187024 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java35
1 files changed, 0 insertions, 35 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
index 5db8501..41a5661 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
@@ -47,41 +47,6 @@ public class ContentViewMiscTest extends AndroidWebViewTestBase {
mContentViewCore = testContainerView.getContentViewCore();
}
- /*
- * @SmallTest
- * @Feature({"Android-WebView"})
- * BUG 162967
- */
- @FlakyTest
- public void testFlingScroll() throws Throwable {
- final String testPage = UrlUtils.encodeHtmlDataUri(
- "<html><head><style>body { width: 5000px; height: 5000px; }</head>" +
- "<body></body></html>");
-
- // Test flinging in the y axis
- loadUrlSync(mAwContents , mContentsClient.getOnPageFinishedHelper(), testPage);
- assertEquals(0, mContentViewCore.getNativeScrollYForTest());
- ThreadUtils.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- mContentViewCore.flingScroll(0, 2000);
- }
- });
- Thread.sleep(1000);
- assertNotSame(0, mContentViewCore.getNativeScrollYForTest());
-
- // Test flinging in the x axis
- assertEquals(0, mContentViewCore.getNativeScrollXForTest());
- ThreadUtils.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- mContentViewCore.flingScroll(2000, 0);
- }
- });
- Thread.sleep(1000);
- assertNotSame(0, mContentViewCore.getNativeScrollXForTest());
- }
-
@SmallTest
@Feature({"AndroidWebView"})
public void testFindAddress() {