commit f699c8b8a846d45288cb93ea4743106a0aadf671
author Md Haque <haque@google.com> Mon Jul 13 05:11:13 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 13 05:11:14 2015 +0000
tree e002990a94a9aa4c739dd89d03c9101052956e89
parent e57a86dd39f9bef710431213717b177cbb7c9d73
parent 1415ed10c6fdea665ba749d442745ac5d5de3671

Merge "Adding jank tests for dialer" into mnc-dev

tests/jank/jankmicrobenchmark/src/com/android/jankmicrobenchmark/janktests/ApiDemoJankTests.java

diff --git a/tests/jank/jankmicrobenchmark/src/com/android/jankmicrobenchmark/janktests/ApiDemoJankTests.java b/tests/jank/jankmicrobenchmark/src/com/android/jankmicrobenchmark/janktests/ApiDemoJankTests.java
index 6f357e0..ec2bca5 100644
--- a/tests/jank/jankmicrobenchmark/src/com/android/jankmicrobenchmark/janktests/ApiDemoJankTests.java
+++ b/tests/jank/jankmicrobenchmark/src/com/android/jankmicrobenchmark/janktests/ApiDemoJankTests.java
@@ -244,10 +244,12 @@
         UiObject2 views = null;
         short maxAttempt = 4;
         while (views == null && maxAttempt > 0) {
-            mDevice.wait(Until.findObject(By.res(RES_PACKAGE_NAME, "content")), LONG_TIMEOUT)
-                    .scroll(Direction.DOWN, 1.0f);
             views = mDevice.wait(Until.findObject(By.res(RES_PACKAGE_NAME, "text1")
                     .text("Views")), LONG_TIMEOUT);
+            if (views == null) {
+                mDevice.wait(Until.findObject(By.res(RES_PACKAGE_NAME, "content")), LONG_TIMEOUT)
+                        .scroll(Direction.DOWN, 1.0f);
+            }
             --maxAttempt;
         }
         Assert.assertNotNull("Views item can't be found", views);
@@ -256,10 +258,12 @@
         UiObject2 option = null;
         maxAttempt = 4;
         while (option == null && maxAttempt > 0) {
-            mDevice.wait(Until.findObject(By.res(RES_PACKAGE_NAME, "content")), LONG_TIMEOUT)
-                    .scroll(Direction.DOWN, 1.0f);
             option = mDevice.wait(Until.findObject(By.res(RES_PACKAGE_NAME, "text1")
                     .text(optionName)), LONG_TIMEOUT);
+            if (option == null) {
+                mDevice.wait(Until.findObject(By.res(RES_PACKAGE_NAME, "content")), LONG_TIMEOUT)
+                .scroll(Direction.DOWN, 1.0f);
+            }
             --maxAttempt;
         }
         Assert.assertNotNull("Target option to be tested in ApiDemos Views can't be found", option);
@@ -276,7 +280,7 @@
     }
 
     // Measures jank for simple listview fling
-    @JankTest(beforeTest="selectLists_Array", afterTest="goBackHome",
+    @JankTest(beforeTest="selectListsArray", afterTest="goBackHome",
               expectedFrames=EXPECTED_FRAMES)
     @GfxMonitor(processName=PACKAGE_NAME)
     public void testListViewJank() {
@@ -292,7 +296,7 @@
     }
 
     // Loads simple expandable list view
-    public void selectExpandableLists_SimpleAdapter() throws UiObjectNotFoundException {
+    public void selectExpandableListsSimpleAdapter() throws UiObjectNotFoundException {
         selectViews("Expandable Lists");
         UiObject2 simpleAdapter = mDevice.wait(Until.findObject(
                 By.res(RES_PACKAGE_NAME, "text1").text("3. Simple Adapter")), LONG_TIMEOUT);
@@ -302,7 +306,7 @@
 
     // Measures jank for simple expandable list view expansion
     // Expansion group1, group3 and group4 arbitrarily selected
-    @JankTest(beforeTest="selectExpandableLists_SimpleAdapter", afterTest="goBackHome",
+    @JankTest(beforeTest="selectExpandableListsSimpleAdapter", afterTest="goBackHome",
               expectedFrames=EXPECTED_FRAMES)
     @GfxMonitor(processName=PACKAGE_NAME)
     public void testExapandableListViewJank() {