| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.chrome.browser.ntp; | 5 package org.chromium.chrome.browser.ntp; |
| 6 | 6 |
| 7 import android.graphics.Canvas; | 7 import android.graphics.Canvas; |
| 8 import android.support.test.filters.LargeTest; | 8 import android.support.test.filters.LargeTest; |
| 9 import android.support.test.filters.MediumTest; | 9 import android.support.test.filters.MediumTest; |
| 10 import android.support.test.filters.SmallTest; | 10 import android.support.test.filters.SmallTest; |
| 11 import android.test.UiThreadTest; | 11 import android.test.UiThreadTest; |
| 12 import android.view.KeyEvent; | 12 import android.view.KeyEvent; |
| 13 import android.view.View; | 13 import android.view.View; |
| 14 import android.view.ViewGroup; | 14 import android.view.ViewGroup; |
| 15 | 15 |
| 16 import org.chromium.base.ThreadUtils; | 16 import org.chromium.base.ThreadUtils; |
| 17 import org.chromium.base.test.util.CallbackHelper; | 17 import org.chromium.base.test.util.CallbackHelper; |
| 18 import org.chromium.base.test.util.CommandLineFlags; | 18 import org.chromium.base.test.util.CommandLineFlags; |
| 19 import org.chromium.base.test.util.DisableIf; | 19 import org.chromium.base.test.util.DisableIf; |
| 20 import org.chromium.base.test.util.DisabledTest; | 20 import org.chromium.base.test.util.DisabledTest; |
| 21 import org.chromium.base.test.util.Feature; | 21 import org.chromium.base.test.util.Feature; |
| 22 import org.chromium.base.test.util.RetryOnFailure; | 22 import org.chromium.base.test.util.RetryOnFailure; |
| 23 import org.chromium.chrome.R; | 23 import org.chromium.chrome.R; |
| 24 import org.chromium.chrome.browser.UrlConstants; | 24 import org.chromium.chrome.browser.UrlConstants; |
| 25 import org.chromium.chrome.browser.ntp.cards.NewTabPageRecyclerView; | 25 import org.chromium.chrome.browser.ntp.cards.NewTabPageRecyclerView; |
| 26 import org.chromium.chrome.browser.omnibox.LocationBarLayout; | 26 import org.chromium.chrome.browser.omnibox.LocationBarLayout; |
| 27 import org.chromium.chrome.browser.omnibox.UrlBar; | 27 import org.chromium.chrome.browser.omnibox.UrlBar; |
| 28 import org.chromium.chrome.browser.suggestions.FakeMostVisitedSites; | 28 import org.chromium.chrome.browser.suggestions.FakeMostVisitedSites; |
| 29 import org.chromium.chrome.browser.suggestions.TileGroupDelegateImpl; | 29 import org.chromium.chrome.browser.suggestions.TileGroupDelegateImpl; |
| 30 import org.chromium.chrome.browser.suggestions.TileSource; |
| 30 import org.chromium.chrome.browser.tab.EmptyTabObserver; | 31 import org.chromium.chrome.browser.tab.EmptyTabObserver; |
| 31 import org.chromium.chrome.browser.tab.Tab; | 32 import org.chromium.chrome.browser.tab.Tab; |
| 32 import org.chromium.chrome.test.ChromeTabbedActivityTestBase; | 33 import org.chromium.chrome.test.ChromeTabbedActivityTestBase; |
| 33 import org.chromium.chrome.test.util.ChromeTabUtils; | 34 import org.chromium.chrome.test.util.ChromeTabUtils; |
| 34 import org.chromium.chrome.test.util.NewTabPageTestUtils; | 35 import org.chromium.chrome.test.util.NewTabPageTestUtils; |
| 35 import org.chromium.chrome.test.util.OmniboxTestUtils; | 36 import org.chromium.chrome.test.util.OmniboxTestUtils; |
| 36 import org.chromium.chrome.test.util.RenderUtils.ViewRenderer; | 37 import org.chromium.chrome.test.util.RenderUtils.ViewRenderer; |
| 37 import org.chromium.content.browser.test.util.Criteria; | 38 import org.chromium.content.browser.test.util.Criteria; |
| 38 import org.chromium.content.browser.test.util.CriteriaHelper; | 39 import org.chromium.content.browser.test.util.CriteriaHelper; |
| 39 import org.chromium.content.browser.test.util.KeyUtils; | 40 import org.chromium.content.browser.test.util.KeyUtils; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 52 /** | 53 /** |
| 53 * Tests for the native android New Tab Page. | 54 * Tests for the native android New Tab Page. |
| 54 */ | 55 */ |
| 55 @RetryOnFailure | 56 @RetryOnFailure |
| 56 public class NewTabPageTest extends ChromeTabbedActivityTestBase { | 57 public class NewTabPageTest extends ChromeTabbedActivityTestBase { |
| 57 | 58 |
| 58 private static final String TEST_PAGE = "/chrome/test/data/android/navigate/
simple.html"; | 59 private static final String TEST_PAGE = "/chrome/test/data/android/navigate/
simple.html"; |
| 59 | 60 |
| 60 private static final String[] FAKE_MOST_VISITED_TITLES = new String[] { "Sim
ple" }; | 61 private static final String[] FAKE_MOST_VISITED_TITLES = new String[] { "Sim
ple" }; |
| 61 private static final String[] FAKE_MOST_VISITED_WHITELIST_ICON_PATHS = new S
tring[] { "" }; | 62 private static final String[] FAKE_MOST_VISITED_WHITELIST_ICON_PATHS = new S
tring[] { "" }; |
| 62 private static final int[] FAKE_MOST_VISITED_SOURCES = new int[] {NTPTileSou
rce.TOP_SITES}; | 63 private static final int[] FAKE_MOST_VISITED_SOURCES = new int[] {TileSource
.TOP_SITES}; |
| 63 | 64 |
| 64 private Tab mTab; | 65 private Tab mTab; |
| 65 private NewTabPage mNtp; | 66 private NewTabPage mNtp; |
| 66 private View mFakebox; | 67 private View mFakebox; |
| 67 private ViewGroup mTileGridLayout; | 68 private ViewGroup mTileGridLayout; |
| 68 private String[] mSiteSuggestionUrls; | 69 private String[] mSiteSuggestionUrls; |
| 69 private FakeMostVisitedSites mMostVisitedSites; | 70 private FakeMostVisitedSites mMostVisitedSites; |
| 70 private EmbeddedTestServer mTestServer; | 71 private EmbeddedTestServer mTestServer; |
| 71 | 72 |
| 72 @Override | 73 @Override |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 */ | 521 */ |
| 521 private void waitForFakeboxTopPosition(final NewTabPage ntp, int position) { | 522 private void waitForFakeboxTopPosition(final NewTabPage ntp, int position) { |
| 522 CriteriaHelper.pollUiThread(Criteria.equals(position, new Callable<Integ
er>() { | 523 CriteriaHelper.pollUiThread(Criteria.equals(position, new Callable<Integ
er>() { |
| 523 @Override | 524 @Override |
| 524 public Integer call() { | 525 public Integer call() { |
| 525 return getFakeboxTop(ntp); | 526 return getFakeboxTop(ntp); |
| 526 } | 527 } |
| 527 })); | 528 })); |
| 528 } | 529 } |
| 529 } | 530 } |
| OLD | NEW |