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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/widget/ToolbarProgressBarTest.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.widget; 5 package org.chromium.chrome.browser.widget;
6 6
7 import android.animation.Animator; 7 import android.animation.Animator;
8 import android.animation.Animator.AnimatorListener; 8 import android.animation.Animator.AnimatorListener;
9 import android.test.suitebuilder.annotation.MediumTest; 9 import android.support.test.filters.MediumTest;
10 import android.view.View; 10 import android.view.View;
11 11
12 import org.chromium.base.ThreadUtils; 12 import org.chromium.base.ThreadUtils;
13 import org.chromium.base.test.util.Feature; 13 import org.chromium.base.test.util.Feature;
14 import org.chromium.base.test.util.Restriction; 14 import org.chromium.base.test.util.Restriction;
15 import org.chromium.base.test.util.RetryOnFailure; 15 import org.chromium.base.test.util.RetryOnFailure;
16 import org.chromium.chrome.R; 16 import org.chromium.chrome.R;
17 import org.chromium.chrome.browser.ChromeTabbedActivity; 17 import org.chromium.chrome.browser.ChromeTabbedActivity;
18 import org.chromium.chrome.test.ChromeActivityTestCaseBase; 18 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
19 import org.chromium.chrome.test.util.ChromeRestriction; 19 import org.chromium.chrome.test.util.ChromeRestriction;
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 188
189 long deadline = System.currentTimeMillis() + TEST_WAIT_TIME_MS; 189 long deadline = System.currentTimeMillis() + TEST_WAIT_TIME_MS;
190 while (!animationEnded.get() && System.currentTimeMillis() < deadlin e) { 190 while (!animationEnded.get() && System.currentTimeMillis() < deadlin e) {
191 onAnimationEnd.wait(deadline - System.currentTimeMillis()); 191 onAnimationEnd.wait(deadline - System.currentTimeMillis());
192 } 192 }
193 assertEquals(0.0f, progressBar.get().getAlpha()); 193 assertEquals(0.0f, progressBar.get().getAlpha());
194 assertNotSame(View.VISIBLE, progressBar.get().getVisibility()); 194 assertNotSame(View.VISIBLE, progressBar.get().getVisibility());
195 } 195 }
196 } 196 }
197 } 197 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698