diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-09-13 05:20:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-13 05:20:04 +0000 |
| commit | a8d92744b480b55fd53854160f98fb728df0c657 (patch) | |
| tree | e008dad5e1d152235e7417d38bdb877c553f9283 | |
| parent | 0f6107f456186f0948a9eb4e25529ce5df0e82fb (diff) | |
| parent | 5a1adca72d07bec6497e997a41b9cb800fa91f6f (diff) | |
| download | platform_testing-a8d92744b480b55fd53854160f98fb728df0c657.tar.gz | |
Merge "Adjust the expected frames in leaback jank tests." into oc-mr1-dev
| -rw-r--r-- | tests/jank/uibench/src/com/android/uibench/janktests/UiBenchLeanbackJankTests.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/jank/uibench/src/com/android/uibench/janktests/UiBenchLeanbackJankTests.java b/tests/jank/uibench/src/com/android/uibench/janktests/UiBenchLeanbackJankTests.java index c6717305c..d03f1b217 100644 --- a/tests/jank/uibench/src/com/android/uibench/janktests/UiBenchLeanbackJankTests.java +++ b/tests/jank/uibench/src/com/android/uibench/janktests/UiBenchLeanbackJankTests.java @@ -25,7 +25,7 @@ import android.support.test.uiautomator.UiDevice; import android.text.TextUtils; import android.view.KeyEvent; -import static com.android.uibench.janktests.UiBenchJankTestsHelper.EXPECTED_FRAMES; +import static com.android.uibench.janktests.UiBenchJankTestsHelper.SHORT_EXPECTED_FRAMES; import static com.android.uibench.janktests.UiBenchJankTestsHelper.PACKAGE_NAME; import java.lang.annotation.ElementType; @@ -125,7 +125,7 @@ public class UiBenchLeanbackJankTests extends JankTestBase { /** * Vertically scroll BrowseFragment in the fast lane */ - @JankTest(expectedFrames = EXPECTED_FRAMES) + @JankTest(expectedFrames = SHORT_EXPECTED_FRAMES) @Option(activity = "leanback.BrowseActivity") @GfxMonitor(processName = PACKAGE_NAME) @GfxFrameStatsMonitor(processName = PACKAGE_NAME) @@ -136,7 +136,7 @@ public class UiBenchLeanbackJankTests extends JankTestBase { /** * Vertically scroll BrowseFragment in the content (fast lane closed) */ - @JankTest(expectedFrames = EXPECTED_FRAMES) + @JankTest(expectedFrames = SHORT_EXPECTED_FRAMES) @Option(activity = "leanback.BrowseActivity", postLaunch = "focusToBrowseContent") @GfxMonitor(processName = PACKAGE_NAME) @GfxFrameStatsMonitor(processName = PACKAGE_NAME) @@ -148,7 +148,7 @@ public class UiBenchLeanbackJankTests extends JankTestBase { * Vertically scroll BrowseFragment in the fast lane * option: no bitmap upload */ - @JankTest(expectedFrames = EXPECTED_FRAMES) + @JankTest(expectedFrames = SHORT_EXPECTED_FRAMES) @Option(activity = "leanback.BrowseActivity", extras = "noBitmapUpload") @GfxMonitor(processName = PACKAGE_NAME) @GfxFrameStatsMonitor(processName = PACKAGE_NAME) @@ -160,7 +160,7 @@ public class UiBenchLeanbackJankTests extends JankTestBase { * Vertically scroll BrowseFragment in the content (fast lane closed) * option: no bitmap upload */ - @JankTest(expectedFrames = EXPECTED_FRAMES) + @JankTest(expectedFrames = SHORT_EXPECTED_FRAMES) @Option(activity = "leanback.BrowseActivity", extras = "noBitmapUpload", postLaunch = "focusToBrowseContent") @GfxMonitor(processName = PACKAGE_NAME) |