Skip to content

GitLab

T
tangled
Commit 3103023a authored by donnd's avatar donnd Committed by Commit bot
Browse files
Options

[TTS] Move a test restriction from all tests to the class. 

BUG=

Review-Url: https://chromiumcodereview.appspot.com/2441113002
Cr-Commit-Position: refs/heads/master@{#426911}
parent bcb34061
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 86 deletions
chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
View file @ 3103023a
......@@ -80,6 +80,7 @@ import java.util.concurrent.TimeoutException;
* Tests the Contextual Search Manager using instrumentation tests.
*/
// NOTE: Disable online detection so we we'll default to online on test bots with no network.
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@CommandLineFlags.Add(ContextualSearchFieldTrial.ONLINE_DETECTION_DISABLED)
public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<ChromeActivity> {
private static final String TEST_PAGE =
......@@ -1010,7 +1011,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testHidesWhenOmniboxFocused() throws InterruptedException, TimeoutException {
clickWordNode("intelligence");
......@@ -1030,7 +1030,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testDoesContainAWord() {
assertTrue(mSelectionController.doesContainAWord("word"));
......@@ -1050,7 +1049,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testIsValidSelection() {
StubbedContentViewCore stubbedCvc = new StubbedContentViewCore(
......@@ -1075,7 +1073,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTap() throws InterruptedException, TimeoutException {
clickWordNode("intelligence");
......@@ -1092,7 +1089,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testLongPress() throws InterruptedException, TimeoutException {
longPressNode("states");
......@@ -1108,7 +1104,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
public void testSwipeExpand() throws InterruptedException, TimeoutException {
assertNoSearchesLoaded();
clickWordNode("intelligence");
......@@ -1134,7 +1130,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
public void testLongPressSwipeExpand() throws InterruptedException, TimeoutException {
longPressNode("intelligence");
assertNoContentViewCore();
......@@ -1168,7 +1164,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({RESTRICTION_TYPE_NON_LOW_END_DEVICE})
public void testTapCausesOneLowPriorityRequest() throws InterruptedException, TimeoutException {
mFakeServer.reset();
clickWordNode("states");
......@@ -1197,7 +1192,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@RetryOnFailure
public void testPrefetchFailoverRequestMadeAfterOpen()
throws InterruptedException, TimeoutException {
......@@ -1227,7 +1221,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTapDisablePreload() throws InterruptedException, TimeoutException {
clickWordNode("intelligence");
......@@ -1244,7 +1237,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testLongPressGestureSelects() throws InterruptedException, TimeoutException {
longPressNode("intelligence");
......@@ -1265,7 +1257,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTapGestureSelects() throws InterruptedException, TimeoutException {
clickWordNode("intelligence");
......@@ -1284,7 +1275,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTapGestureOnSpecialCharacterDoesntSelect()
throws InterruptedException, TimeoutException {
......@@ -1300,7 +1290,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTapGestureFollowedByScrollClearsSelection()
throws InterruptedException, TimeoutException {
......@@ -1319,7 +1308,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTapGestureFollowedByInvalidTextTapCloses()
throws InterruptedException, TimeoutException {
......@@ -1336,10 +1324,8 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTapGestureFollowedByNonTextTap()
throws InterruptedException, TimeoutException {
public void testTapGestureFollowedByNonTextTap() throws InterruptedException, TimeoutException {
clickWordNode("states-far");
waitForPanelToPeek();
clickNode("button");
......@@ -1351,7 +1337,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTapGestureFarAwayTogglesSelecting()
throws InterruptedException, TimeoutException {
......@@ -1373,10 +1358,8 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTapGesturesNearbyKeepSelecting()
throws InterruptedException, TimeoutException {
public void testTapGesturesNearbyKeepSelecting() throws InterruptedException, TimeoutException {
clickWordNode("states");
assertEquals("States", getSelectedText());
waitForPanelToPeek();
......@@ -1401,7 +1384,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
public void testLongPressGestureFollowedByScrollMaintainsSelection()
throws InterruptedException, TimeoutException {
longPressNode("intelligence");
......@@ -1417,7 +1399,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
public void testLongPressGestureFollowedByTapDoesntSelect()
throws InterruptedException, TimeoutException {
longPressNode("intelligence");
......@@ -1432,7 +1413,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
public void testContextualSearchDismissedOnForegroundTabCrash()
throws InterruptedException, TimeoutException {
clickWordNode("states");
......@@ -1463,7 +1443,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testContextualSearchNotDismissedOnBackgroundTabCrash()
throws InterruptedException, TimeoutException {
......@@ -1500,7 +1480,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@RetryOnFailure
public void testTapSearchBarPromotesToTab() throws InterruptedException, TimeoutException {
// -------- SET UP ---------
......@@ -1548,7 +1527,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
public void testTapOnRoleIgnored() throws InterruptedException, TimeoutException {
PanelState initialState = mPanel.getPanelState();
clickNode("role");
......@@ -1561,7 +1539,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTapOnARIAIgnored() throws InterruptedException, TimeoutException {
PanelState initialState = mPanel.getPanelState();
......@@ -1574,7 +1551,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTapOnFocusableIgnored() throws InterruptedException, TimeoutException {
PanelState initialState = mPanel.getPanelState();
......@@ -1587,7 +1563,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
@DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
@RetryOnFailure
public void testTapLimitForDecided() throws InterruptedException, TimeoutException {
......@@ -1617,7 +1593,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
@DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
@RetryOnFailure
public void testTapLimitForUndecided() throws InterruptedException, TimeoutException {
......@@ -1650,7 +1626,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@RetryOnFailure
public void testExpandBeforeSearchTermResolution()
throws InterruptedException, TimeoutException {
......@@ -1675,7 +1650,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@RetryOnFailure
public void testSearchTermResolutionError() throws InterruptedException, TimeoutException {
clickWordNode("states");
......@@ -1695,7 +1669,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testHttpsBeforeAcceptForOptOut() throws InterruptedException, TimeoutException {
mPolicy.overrideDecidedStateForTesting(false);
......@@ -1711,7 +1684,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testHttpsAfterAcceptForOptOut() throws InterruptedException, TimeoutException {
mPolicy.overrideDecidedStateForTesting(true);
......@@ -1725,7 +1697,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testHttpBeforeAcceptForOptOut() throws InterruptedException, TimeoutException {
mPolicy.overrideDecidedStateForTesting(false);
......@@ -1738,7 +1709,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testHttpAfterAcceptForOptOut() throws InterruptedException, TimeoutException {
mPolicy.overrideDecidedStateForTesting(true);
......@@ -1775,7 +1745,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
@RetryOnFailure
@DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
public void testAppMenuSuppressedWhenExpanded() throws InterruptedException, TimeoutException {
......@@ -1796,7 +1766,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testAppMenuSuppressedWhenMaximized() throws InterruptedException, TimeoutException {
clickWordNode("states");
......@@ -1824,7 +1793,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@RetryOnFailure
public void testPromoTapCount() throws InterruptedException, TimeoutException {
mPolicy.setPromoTapTriggeredLimitForTesting(2);
......@@ -1870,7 +1838,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
@DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
public void testPromoOpenCountForUndecided() throws InterruptedException, TimeoutException {
mPolicy.overrideDecidedStateForTesting(false);
......@@ -1898,7 +1866,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
@DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
@RetryOnFailure
public void testPromoOpenCountForDecided() throws InterruptedException, TimeoutException {
......@@ -1917,7 +1885,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
* @SmallTest
* @Feature({"ContextualSearch"})
*/
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@FlakyTest
public void testTapCount() throws InterruptedException, TimeoutException {
assertEquals(0, mPolicy.getTapCount());
......@@ -1956,7 +1923,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
@RetryOnFailure
public void testNotifyObserverHideAfterLongPress()
throws InterruptedException, TimeoutException {
......@@ -1975,7 +1942,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
public void testNotifyObserverHideAfterTap() throws InterruptedException, TimeoutException {
TestContextualSearchObserver observer = new TestContextualSearchObserver();
mManager.addObserver(observer);
......@@ -2008,7 +1975,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testNotifyObserverHideOnClearSelectionAfterTap()
throws InterruptedException, TimeoutException {
......@@ -2039,7 +2005,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testPreventHandlingCurrentSelectionModification()
throws InterruptedException, TimeoutException {
......@@ -2068,7 +2033,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@CommandLineFlags.Add(ContextualSearchFieldTrial.SUPPRESSION_TAPS + "=" + PLENTY_OF_TAPS)
@RetryOnFailure
public void testTapALot() throws InterruptedException, TimeoutException {
......@@ -2087,7 +2051,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
public void testExternalNavigationWithUserGesture() {
final ExternalNavigationHandler externalNavHandler =
new ExternalNavigationHandler(getActivity().getActivityTab());
......@@ -2113,7 +2076,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testRedirectedExternalNavigationWithUserGesture() {
final ExternalNavigationHandler externalNavHandler =
......@@ -2148,7 +2110,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testExternalNavigationWithoutUserGesture() {
final ExternalNavigationHandler externalNavHandler =
......@@ -2171,7 +2132,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testSelectionExpansionOnSearchTermResolution()
throws InterruptedException, TimeoutException {
......@@ -2189,11 +2149,13 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@CommandLineFlags.Add(ContextualSearchFieldTrial.PEEK_PROMO_ENABLED + "=true")
@DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
@RetryOnFailure
public void testLongPressShowsPeekPromo() throws InterruptedException, TimeoutException {
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
@CommandLineFlags
.Add(ContextualSearchFieldTrial.PEEK_PROMO_ENABLED + "=true")
@DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
@RetryOnFailure
public void testLongPressShowsPeekPromo()
throws InterruptedException, TimeoutException {
// Must be in undecided state in order to trigger the Peek Promo.
mPolicy.overrideDecidedStateForTesting(false);
// Must have never opened the Panel in order to trigger the Peek Promo.
......@@ -2232,7 +2194,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
@RetryOnFailure
public void testTapContentVisibility() throws InterruptedException, TimeoutException {
// Simulate a tap and make sure Content is not visible.
......@@ -2254,7 +2216,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
public void testLongPressContentVisibility() throws InterruptedException, TimeoutException {
// Simulate a long press and make sure no Content is created.
simulateLongPressSearch("search");
......@@ -2276,7 +2238,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
public void testTapMultipleSwipeOnlyLoadsContentOnce()
throws InterruptedException, TimeoutException {
// Simulate a tap and make sure Content is not visible.
......@@ -2311,7 +2273,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
@RetryOnFailure
public void testLongPressMultipleSwipeOnlyLoadsContentOnce()
throws InterruptedException, TimeoutException {
......@@ -2348,10 +2310,8 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testChainedSearchCreatesNewContent()
throws InterruptedException, TimeoutException {
public void testChainedSearchCreatesNewContent() throws InterruptedException, TimeoutException {
// Simulate a tap and make sure Content is not visible.
simulateTapSearch("search");
assertContentViewCoreCreatedButNeverMadeVisible();
......@@ -2388,7 +2348,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
@DisabledTest(message = "crbug.com/551711")
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
public void testChainedSearchLoadsCorrectSearchTerm()
throws InterruptedException, TimeoutException {
// Simulate a tap and make sure Content is not visible.
......@@ -2433,7 +2393,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@RetryOnFailure
public void testChainedSearchContentVisibility() throws InterruptedException, TimeoutException {
// Simulate a tap and make sure Content is not visible.
......@@ -2468,10 +2427,8 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testTapCloseRemovedFromHistory()
throws InterruptedException, TimeoutException {
public void testTapCloseRemovedFromHistory() throws InterruptedException, TimeoutException {
// Simulate a tap and make sure a URL was loaded.
simulateTapSearch("search");
assertEquals(1, mFakeServer.getLoadedUrlCount());
......@@ -2489,9 +2446,8 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
public void testTapExpandNotRemovedFromHistory()
throws InterruptedException, TimeoutException {
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
public void testTapExpandNotRemovedFromHistory() throws InterruptedException, TimeoutException {
// Simulate a tap and make sure a URL was loaded.
simulateTapSearch("search");
assertEquals(1, mFakeServer.getLoadedUrlCount());
......@@ -2512,10 +2468,8 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@RetryOnFailure
public void testChainedTapsRemovedFromHistory()
throws InterruptedException, TimeoutException {
public void testChainedTapsRemovedFromHistory() throws InterruptedException, TimeoutException {
// Simulate a tap and make sure a URL was loaded.
simulateTapSearch("search");
String url1 = mFakeServer.getLoadedUrl();
......@@ -2554,7 +2508,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@CommandLineFlags.Add(ContextualSearchFieldTrial.ENABLE_TRANSLATION + "=true")
@RetryOnFailure
public void testTapWithLanguage() throws InterruptedException, TimeoutException {
......@@ -2572,7 +2525,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@CommandLineFlags.Add(ContextualSearchFieldTrial.ENABLE_TRANSLATION + "=true")
public void testTapWithoutLanguage() throws InterruptedException, TimeoutException {
// Tapping an English word should NOT trigger translation.
......@@ -2588,7 +2540,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@CommandLineFlags.Add({ContextualSearchFieldTrial.ENABLE_TRANSLATION + "=true",
ContextualSearchFieldTrial.ENABLE_SERVER_CONTROLLED_ONEBOX + "=true"})
@RetryOnFailure
......@@ -2605,7 +2556,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@CommandLineFlags.Add(ContextualSearchFieldTrial.ENABLE_TRANSLATION + "=true")
@RetryOnFailure
public void testLongpressTranslates() throws InterruptedException, TimeoutException {
......@@ -2621,7 +2571,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@CommandLineFlags.Add({ContextualSearchFieldTrial.ENABLE_TRANSLATION + "=true",
ContextualSearchFieldTrial.DISABLE_AUTO_DETECT_TRANSLATION_ONEBOX + "=true"})
@RetryOnFailure
......@@ -2639,7 +2588,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
@CommandLineFlags.Add({ContextualSearchFieldTrial.ENABLE_TRANSLATION + "=true",
ContextualSearchFieldTrial.DISABLE_FORCE_TRANSLATION_ONEBOX + "=true"})
@RetryOnFailure
......@@ -2659,7 +2607,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
public void testTapContentAndExpandPanelInFullscreen()
throws InterruptedException, TimeoutException {
// Toggle tab to fulllscreen.
......@@ -2683,7 +2631,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction({RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@RetryOnFailure
public void testPanelDismissedOnToggleFullscreen()
throws InterruptedException, TimeoutException {
......@@ -2713,7 +2660,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
public void testImageControl() throws InterruptedException, TimeoutException {
simulateTapSearch("search");
......@@ -2755,7 +2701,6 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
*/
@SmallTest
@Feature({"ContextualSearch"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
// NOTE: Remove the flag so we will run just this test with onLine detection enabled.
@CommandLineFlags.Remove(ContextualSearchFieldTrial.ONLINE_DETECTION_DISABLED)
public void testNetworkDisconnectedDeactivatesSearch()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment