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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/UndoTabModelTest.java

Issue 2583933003: Replace deprecated Android java test annotations (Closed)
Patch Set: Rebase again :( Created 4 years 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 unified diff | Download patch
OLDNEW
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.tabmodel; 5 package org.chromium.chrome.browser.tabmodel;
6 6
7 import android.annotation.TargetApi; 7 import android.annotation.TargetApi;
8 import android.os.Build; 8 import android.os.Build;
9 import android.test.suitebuilder.annotation.MediumTest; 9 import android.support.test.filters.MediumTest;
10 10
11 import org.chromium.base.ApplicationStatus; 11 import org.chromium.base.ApplicationStatus;
12 import org.chromium.base.ThreadUtils; 12 import org.chromium.base.ThreadUtils;
13 import org.chromium.base.test.util.CallbackHelper; 13 import org.chromium.base.test.util.CallbackHelper;
14 import org.chromium.base.test.util.DisabledTest; 14 import org.chromium.base.test.util.DisabledTest;
15 import org.chromium.base.test.util.FlakyTest; 15 import org.chromium.base.test.util.FlakyTest;
16 import org.chromium.base.test.util.MinAndroidSdkLevel; 16 import org.chromium.base.test.util.MinAndroidSdkLevel;
17 import org.chromium.base.test.util.Restriction; 17 import org.chromium.base.test.util.Restriction;
18 import org.chromium.base.test.util.RetryOnFailure; 18 import org.chromium.base.test.util.RetryOnFailure;
19 import org.chromium.base.test.util.UrlUtils; 19 import org.chromium.base.test.util.UrlUtils;
(...skipping 1639 matching lines...) Expand 10 before | Expand all | Expand 10 after
1659 openMostRecentlyClosedTabOnUiThread(firstSelector); 1659 openMostRecentlyClosedTabOnUiThread(firstSelector);
1660 assertEquals("Closed tab in second window should be restored in the firs t window.", 2, 1660 assertEquals("Closed tab in second window should be restored in the firs t window.", 2,
1661 firstModel.getCount()); 1661 firstModel.getCount());
1662 Tab tab0 = firstModel.getTabAt(0); 1662 Tab tab0 = firstModel.getTabAt(0);
1663 Tab tab1 = firstModel.getTabAt(1); 1663 Tab tab1 = firstModel.getTabAt(1);
1664 Tab[] firstWindowTabs = new Tab[]{tab0, tab1}; 1664 Tab[] firstWindowTabs = new Tab[]{tab0, tab1};
1665 checkState(firstModel, firstWindowTabs, tab0, EMPTY, firstWindowTabs, ta b0); 1665 checkState(firstModel, firstWindowTabs, tab0, EMPTY, firstWindowTabs, ta b0);
1666 assertEquals(TEST_URL_1, tab1.getUrl()); 1666 assertEquals(TEST_URL_1, tab1.getUrl());
1667 } 1667 }
1668 } 1668 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698