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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTest.java

Issue 2583933003: Replace deprecated Android java test annotations (Closed)
Patch Set: Rebase again :( Created 3 years, 12 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 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.feedback; 5 package org.chromium.chrome.browser.feedback;
6 6
7 import android.test.suitebuilder.annotation.MediumTest; 7 import android.support.test.filters.MediumTest;
8 8
9 import org.chromium.base.ThreadUtils; 9 import org.chromium.base.ThreadUtils;
10 import org.chromium.base.test.util.Feature; 10 import org.chromium.base.test.util.Feature;
11 import org.chromium.chrome.browser.profiles.Profile; 11 import org.chromium.chrome.browser.profiles.Profile;
12 12
13 import java.util.concurrent.Semaphore; 13 import java.util.concurrent.Semaphore;
14 import java.util.concurrent.TimeUnit; 14 import java.util.concurrent.TimeUnit;
15 import java.util.concurrent.atomic.AtomicInteger; 15 import java.util.concurrent.atomic.AtomicInteger;
16 16
17 /** 17 /**
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 Profile.getLastUsedProfile(), url, timeoutMs, callba ck); 126 Profile.getLastUsedProfile(), url, timeoutMs, callba ck);
127 } 127 }
128 } 128 }
129 }); 129 });
130 130
131 assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS)); 131 assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
132 assertEquals("URL: " + url + ", got " + callback.getResult() + ", want " + expectedResult, 132 assertEquals("URL: " + url + ", got " + callback.getResult() + ", want " + expectedResult,
133 expectedResult, callback.getResult()); 133 expectedResult, callback.getResult());
134 } 134 }
135 } 135 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698