Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/compositor/overlays/strip/TabStripTest.java

Issue 1582513003: Add a testing restriction for whether Google Play Services is up-to-date. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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
« chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java » ('j') | chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/compositor/overlays/strip/TabStripTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/overlays/strip/TabStripTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/overlays/strip/TabStripTest.java
index 7b15df9f45fb7c47fef747a1a231603a86282a6e..a5bd2f7b5448fa505da8113f7fe87211aaebb75a 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/overlays/strip/TabStripTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/overlays/strip/TabStripTest.java
@@ -4,14 +4,11 @@
package org.chromium.chrome.browser.compositor.overlays.strip;
-import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_TABLET;
-
import android.content.pm.ActivityInfo;
import android.test.suitebuilder.annotation.LargeTest;
import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.browser.compositor.layouts.components.CompositorButton;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver;
@@ -19,6 +16,7 @@ import org.chromium.chrome.browser.tabmodel.TabModel;
import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
import org.chromium.chrome.browser.tabmodel.TabModelUtils;
import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
+import org.chromium.chrome.test.util.ChromeRestriction;
import org.chromium.chrome.test.util.ChromeTabUtils;
import org.chromium.chrome.test.util.TabStripUtils;
import org.chromium.content.browser.test.util.CallbackHelper;
@@ -41,7 +39,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testInitialState() throws InterruptedException {
getInstrumentation().waitForIdleSync();
@@ -54,7 +52,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip", "Main"})
public void testNewTabButtonWithOneTab() throws InterruptedException {
getInstrumentation().waitForIdleSync();
@@ -77,7 +75,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testNewTabButtonWithManyTabs() throws InterruptedException {
ChromeTabUtils.newTabsFromMenu(getInstrumentation(), getActivity(), 3);
@@ -107,7 +105,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testNewTabFromMenu() throws InterruptedException {
getInstrumentation().waitForIdleSync();
@@ -125,7 +123,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testNewIncognitoTabFromMenuAtNormalStrip() throws InterruptedException {
getInstrumentation().waitForIdleSync();
@@ -147,7 +145,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testSelectWithTwoTabs() throws InterruptedException {
ChromeTabUtils.newTabFromMenu(getInstrumentation(), getActivity());
@@ -167,7 +165,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testSelectWithManyTabs() throws InterruptedException {
ChromeTabUtils.newTabsFromMenu(getInstrumentation(), getActivity(), 4);
@@ -190,7 +188,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testCloseTabWithTwoTabs() throws InterruptedException {
ChromeTabUtils.newTabFromMenu(getInstrumentation(), getActivity());
@@ -217,7 +215,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testCloseTabWithManyTabs() throws InterruptedException {
ChromeTabUtils.newTabsFromMenu(getInstrumentation(), getActivity(), 4);
@@ -246,7 +244,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testCloseSelectedTab() throws InterruptedException {
ChromeTabUtils.newTabFromMenu(getInstrumentation(), getActivity());
@@ -273,7 +271,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testCloseAllTabsFromTabMenuClosesAllTabs() throws InterruptedException {
// 1. Create a second tab
@@ -315,7 +313,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testTabMenuDismissedOnOrientationChange() throws InterruptedException {
// 1. Set orientation to portrait
@@ -346,7 +344,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testToggleIncognitoMode() throws InterruptedException {
getInstrumentation().waitForIdleSync();
@@ -375,7 +373,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
*/
@LargeTest
@Feature({"TabStrip"})
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
public void testCloseLastIncognitoTab() throws InterruptedException {
getInstrumentation().waitForIdleSync();
assertFalse("Expected normal strip to be selected",
@@ -400,7 +398,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
*/
@LargeTest
@Feature({"TabStrip"})
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
public void testCloseAllIncognitoTabsFromTabMenu() throws InterruptedException {
//1. Create two incognito tabs
getInstrumentation().waitForIdleSync();
@@ -445,7 +443,7 @@ public class TabStripTest extends ChromeTabbedActivityTestBase {
* @throws InterruptedException
*/
@LargeTest
- @Restriction(RESTRICTION_TYPE_TABLET)
+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)
@Feature({"TabStrip"})
public void testTabSelectionViewDoesNotBreakModelSwitch() throws InterruptedException {
getInstrumentation().waitForIdleSync();
« chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java » ('j') | chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698