summaryrefslogtreecommitdiff
path: root/chromium
diff options
context:
space:
mode:
authorAllen Hair <allenhair@google.com>2015-03-09 12:18:05 -0700
committerAllen Hair <allenhair@google.com>2015-03-09 12:18:05 -0700
commitf12c9f599e2e9e6ef8b4eb5341441caac62addf1 (patch)
treeecce092a741e169f06d695b71e1f235bf057550c /chromium
parente03cc3e943e34a4469c7b2e966cd42832eeda70c (diff)
downloadwebview-f12c9f599e2e9e6ef8b4eb5341441caac62addf1.tar.gz
Update WebViewFlingTest to use new janktesthelper annotation format.
Change-Id: Ia957e3e74821cefd8ba39500b70e0b254431ca52
Diffstat (limited to 'chromium')
-rw-r--r--chromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java b/chromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java
index 16eee7f..a007e27 100644
--- a/chromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java
+++ b/chromium/tests/UbWebViewJankTests/src/com/android/webview/chromium/tests/jank/WebViewFlingTest.java
@@ -21,7 +21,7 @@ import android.net.Uri;
import android.os.SystemClock;
import android.support.test.jank.JankTest;
import android.support.test.jank.JankTestBase;
-import android.support.test.jank.JankType;
+import android.support.test.jank.WindowContentFrameStatsMonitor;
import android.support.test.uiautomator.By;
import android.support.test.uiautomator.Direction;
import android.support.test.uiautomator.UiDevice;
@@ -93,7 +93,8 @@ public class WebViewFlingTest extends JankTestBase {
SystemClock.sleep(TEST_DELAY_TIME_MS);
}
- @JankTest(type=JankType.CONTENT_FRAMES, expectedFrames=MIN_DATA_SIZE)
+ @JankTest(expectedFrames=MIN_DATA_SIZE)
+ @WindowContentFrameStatsMonitor
public void testBrowserPageFling() throws IOException {
mDevice.findObject(By.res(RES_PACKAGE, "container")).fling(Direction.DOWN);
SystemClock.sleep(DEFAULT_ANIMATION_TIME);