Merge heads

2012-08-28 10:41:34 +08:00
parent 6a9fa7c488 34889bc460
commit 14ea38da8b
4 changed files with 57 additions and 95 deletions
@@ -607,7 +607,7 @@ public class EndToEndTestUtils {
        return findResult;
      }
      showMenuItem();
-      findResult = SOLO.getText(menuName) != null;
+      findResult = SOLO.searchText(menuName);
    } else {
      // Non-ICS phone.
      SOLO.sendKey(KeyEvent.KEYCODE_MENU);
@@ -615,7 +615,7 @@ public class EndToEndTestUtils {
        findResult = true;
      } else if (SOLO.searchText(MENU_MORE)) {
        SOLO.clickOnText(MENU_MORE);
-        findResult = SOLO.getText(menuName) != null;
+        findResult = SOLO.searchText(menuName);
        isMoreMenuOpened = true;
      }
    }