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

Side by Side Diff: components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.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.net; 5 package org.chromium.net;
6 6
7 import android.os.ConditionVariable; 7 import android.os.ConditionVariable;
8 import android.test.suitebuilder.annotation.LargeTest; 8 import android.support.test.filters.LargeTest;
9 import android.test.suitebuilder.annotation.SmallTest; 9 import android.support.test.filters.SmallTest;
10 10
11 import org.json.JSONObject; 11 import org.json.JSONObject;
12 12
13 import org.chromium.base.Log; 13 import org.chromium.base.Log;
14 import org.chromium.base.annotations.SuppressFBWarnings; 14 import org.chromium.base.annotations.SuppressFBWarnings;
15 import org.chromium.base.test.util.Feature; 15 import org.chromium.base.test.util.Feature;
16 import org.chromium.net.CronetTestBase.OnlyRunNativeCronet; 16 import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;
17 import org.chromium.net.MetricsTestUtil.TestRequestFinishedListener; 17 import org.chromium.net.MetricsTestUtil.TestRequestFinishedListener;
18 18
19 import java.io.File; 19 import java.io.File;
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 MetricsTestUtil.checkNoConnectTiming(requestInfo.getMetrics()); 257 MetricsTestUtil.checkNoConnectTiming(requestInfo.getMetrics());
258 258
259 mTestFramework.mCronetEngine.shutdown(); 259 mTestFramework.mCronetEngine.shutdown();
260 } 260 }
261 261
262 // Helper method to assert that the request is negotiated over QUIC. 262 // Helper method to assert that the request is negotiated over QUIC.
263 private void assertIsQuic(UrlResponseInfo responseInfo) { 263 private void assertIsQuic(UrlResponseInfo responseInfo) {
264 assertTrue(responseInfo.getNegotiatedProtocol().startsWith(QUIC_PROTOCOL _STRING_PREFIX)); 264 assertTrue(responseInfo.getNegotiatedProtocol().startsWith(QUIC_PROTOCOL _STRING_PREFIX));
265 } 265 }
266 } 266 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698