chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/MenuTest.java - Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium.

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/MenuTest.java

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: final patch? Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/UrlSchemeTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ManageBookmarkActivityTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/MenuTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/MenuTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/MenuTest.java

new file mode 100644

index 0000000000000000000000000000000000000000..f311ba01375482c148b4fdca5d97360b128f5cf6

--- /dev/null

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/MenuTest.java

@@ -0,0 +1,59 @@

+// Use of this source code is governed by a BSD-style license that can be

+// found in the LICENSE file.

+package org.chromium.chrome.browser.appmenu;

+import android.test.suitebuilder.annotation.SmallTest;

+import android.view.KeyEvent;

+import org.chromium.base.test.util.Feature;

+import org.chromium.base.test.util.UrlUtils;

+import org.chromium.chrome.test.ChromeTabbedActivityTestBase;

+import org.chromium.chrome.test.util.ChromeTabUtils;

+import org.chromium.content.browser.test.util.Criteria;

+import org.chromium.content.browser.test.util.CriteriaHelper;

+/**

+ * Application Menu tests.

+ */

+public class MenuTest extends ChromeTabbedActivityTestBase {

+ private static final String TEST_URL = UrlUtils.encodeHtmlDataUri("<html>poit.</html>");

+ @Override

+ protected void setUp() throws Exception {

+ super.setUp();

+ // Make sure the popup menu gets created, then add our observer to it.

+ assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {

+ @Override

+ public boolean isSatisfied() {

+ if (getActivity().getAppMenuHandler().isAppMenuShowing()) return true;

+ pressKey(KeyEvent.KEYCODE_MENU);

+ return false;

+ }

+ }));

+ }

+ /**

+ * Verify opening a new tab from the menu.

+ */

+ @SmallTest

+ @Feature({"Browser", "Main"})

+ public void testMenuNewTab() throws InterruptedException {

+ final int tabCountBefore = getActivity().getCurrentTabModel().getCount();

+ ChromeTabUtils.newTabFromMenu(getInstrumentation(), getActivity());

+ final int tabCountAfter = getActivity().getCurrentTabModel().getCount();

+ assertTrue("Expected: " + (tabCountBefore + 1) + " Got: " + tabCountAfter,

+ tabCountBefore + 1 == tabCountAfter);

+ }

+ private void pressKey(int keycode) {

+ getInstrumentation().sendKeyDownUpSync(keycode);

+ getInstrumentation().waitForIdleSync();

+ }

+ @Override

+ public void startMainActivity() throws InterruptedException {

+ startMainActivityWithURL(TEST_URL);

+ }