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

Side by Side Diff: net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; 7 import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
8 import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; 8 import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
9 import static android.net.NetworkCapabilities.TRANSPORT_VPN; 9 import static android.net.NetworkCapabilities.TRANSPORT_VPN;
10 import static android.net.NetworkCapabilities.TRANSPORT_WIFI; 10 import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
11 11
12 import android.annotation.SuppressLint; 12 import android.annotation.SuppressLint;
13 import android.content.BroadcastReceiver; 13 import android.content.BroadcastReceiver;
14 import android.content.Context; 14 import android.content.Context;
15 import android.content.ContextWrapper; 15 import android.content.ContextWrapper;
16 import android.content.Intent; 16 import android.content.Intent;
17 import android.content.IntentFilter; 17 import android.content.IntentFilter;
18 import android.net.ConnectivityManager; 18 import android.net.ConnectivityManager;
19 import android.net.ConnectivityManager.NetworkCallback; 19 import android.net.ConnectivityManager.NetworkCallback;
20 import android.net.Network; 20 import android.net.Network;
21 import android.net.NetworkCapabilities; 21 import android.net.NetworkCapabilities;
22 import android.net.NetworkRequest; 22 import android.net.NetworkRequest;
23 import android.os.Build; 23 import android.os.Build;
24 import android.support.test.filters.MediumTest;
24 import android.telephony.TelephonyManager; 25 import android.telephony.TelephonyManager;
25 import android.test.InstrumentationTestCase; 26 import android.test.InstrumentationTestCase;
26 import android.test.UiThreadTest; 27 import android.test.UiThreadTest;
27 import android.test.suitebuilder.annotation.MediumTest;
28 28
29 import org.chromium.base.ApplicationState; 29 import org.chromium.base.ApplicationState;
30 import org.chromium.base.ThreadUtils; 30 import org.chromium.base.ThreadUtils;
31 import org.chromium.base.library_loader.LibraryLoader; 31 import org.chromium.base.library_loader.LibraryLoader;
32 import org.chromium.base.library_loader.LibraryProcessType; 32 import org.chromium.base.library_loader.LibraryProcessType;
33 import org.chromium.base.test.util.Feature; 33 import org.chromium.base.test.util.Feature;
34 import org.chromium.net.NetworkChangeNotifierAutoDetect.ConnectivityManagerDeleg ate; 34 import org.chromium.net.NetworkChangeNotifierAutoDetect.ConnectivityManagerDeleg ate;
35 import org.chromium.net.NetworkChangeNotifierAutoDetect.NetworkState; 35 import org.chromium.net.NetworkChangeNotifierAutoDetect.NetworkState;
36 import org.chromium.net.NetworkChangeNotifierAutoDetect.WifiManagerDelegate; 36 import org.chromium.net.NetworkChangeNotifierAutoDetect.WifiManagerDelegate;
37 import org.chromium.net.test.util.NetworkChangeNotifierTestUtil; 37 import org.chromium.net.test.util.NetworkChangeNotifierTestUtil;
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 mConnectivityDelegate.setActiveNetworkExists(true); 916 mConnectivityDelegate.setActiveNetworkExists(true);
917 mConnectivityDelegate.setNetworkType(i); 917 mConnectivityDelegate.setNetworkType(i);
918 mReceiver.onReceive(getInstrumentation().getTargetContext(), intent) ; 918 mReceiver.onReceive(getInstrumentation().getTargetContext(), intent) ;
919 assertTrue(NetworkChangeNotifier.isOnline()); 919 assertTrue(NetworkChangeNotifier.isOnline());
920 } 920 }
921 mConnectivityDelegate.setActiveNetworkExists(false); 921 mConnectivityDelegate.setActiveNetworkExists(false);
922 mReceiver.onReceive(getInstrumentation().getTargetContext(), intent); 922 mReceiver.onReceive(getInstrumentation().getTargetContext(), intent);
923 assertFalse(NetworkChangeNotifier.isOnline()); 923 assertFalse(NetworkChangeNotifier.isOnline());
924 } 924 }
925 } 925 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698