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

Side by Side Diff: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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.Build; 7 import android.os.Build;
8 import android.os.ConditionVariable; 8 import android.os.ConditionVariable;
9 import android.os.StrictMode; 9 import android.os.StrictMode;
10 import android.support.test.filters.SmallTest;
10 import android.test.MoreAsserts; 11 import android.test.MoreAsserts;
11 import android.test.suitebuilder.annotation.SmallTest;
12 import android.util.Log; 12 import android.util.Log;
13 13
14 import org.chromium.base.test.util.Feature; 14 import org.chromium.base.test.util.Feature;
15 import org.chromium.net.TestUrlRequestCallback.FailureType; 15 import org.chromium.net.TestUrlRequestCallback.FailureType;
16 import org.chromium.net.TestUrlRequestCallback.ResponseStep; 16 import org.chromium.net.TestUrlRequestCallback.ResponseStep;
17 import org.chromium.net.impl.CronetUrlRequest; 17 import org.chromium.net.impl.CronetUrlRequest;
18 import org.chromium.net.impl.UrlResponseInfoImpl; 18 import org.chromium.net.impl.UrlResponseInfoImpl;
19 import org.chromium.net.test.FailurePhase; 19 import org.chromium.net.test.FailurePhase;
20 20
21 import java.io.IOException; 21 import java.io.IOException;
(...skipping 2086 matching lines...) Expand 10 before | Expand all | Expand 10 after
2108 // cleartext. 2108 // cleartext.
2109 final String url = "http://example.com/simple.txt"; 2109 final String url = "http://example.com/simple.txt";
2110 TestUrlRequestCallback callback = startAndWaitForComplete(url); 2110 TestUrlRequestCallback callback = startAndWaitForComplete(url);
2111 assertNull(callback.mResponseInfo); 2111 assertNull(callback.mResponseInfo);
2112 assertNotNull(callback.mError); 2112 assertNotNull(callback.mError);
2113 assertEquals(cleartextNotPermitted, 2113 assertEquals(cleartextNotPermitted,
2114 ((NetworkException) callback.mError).getCronetInternalErrorC ode()); 2114 ((NetworkException) callback.mError).getCronetInternalErrorC ode());
2115 } 2115 }
2116 } 2116 }
2117 } 2117 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698