LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Improve TestConnectivityManager readability" am: 883df67f3f am: 265ec28e25 am: 59be04dcca

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733779

Change-Id: I515de6f92e63fdf97ed6239c879f60afebf9e390
This commit is contained in:
Remi NGUYEN VAN
2021-06-28 00:24:39 +00:00
committed by Automerger Merge Worker
parent becf5725f4 59be04dcca
commit aedc6bec44
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Tethering/tests/unit/src/com/android/networkstack/tethering/TestConnectivityManager.java
View File

@@ -20,6 +20,8 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN;
import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static com.android.networkstack.apishim.common.ShimUtils.isAtLeastS;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
@@ -68,10 +70,10 @@ public class TestConnectivityManager extends ConnectivityManager {
public static final boolean BROADCAST_FIRST = false;
public static final boolean CALLBACKS_FIRST = true;
final Map<NetworkCallback, NetworkCallbackInfo> mAllCallbacks = new ArrayMap<>();
final Map<NetworkCallback, Handler> mAllCallbacks = new ArrayMap<>();
// This contains the callbacks tracking the system default network, whether it's registered
// with registerSystemDefaultNetworkCallback (S+) or with a custom request (R-).
final Map<NetworkCallback, NetworkCallbackInfo> mTrackingDefault = new ArrayMap<>();
final Map<NetworkCallback, Handler> mTrackingDefault = new ArrayMap<>();
final Map<NetworkCallback, NetworkRequestInfo> mListening = new ArrayMap<>();
final Map<NetworkCallback, NetworkRequestInfo> mRequested = new ArrayMap<>();
final Map<NetworkCallback, Integer> mLegacyTypeMap = new ArrayMap<>();
@@ -92,18 +94,12 @@ public class TestConnectivityManager extends ConnectivityManager {
mContext = ctx;
}
static class NetworkCallbackInfo {
public final Handler handler;
NetworkCallbackInfo(Handler h) {
handler = h;
}
}
static class NetworkRequestInfo extends NetworkCallbackInfo {
static class NetworkRequestInfo {
public final NetworkRequest request;
public final Handler handler;
NetworkRequestInfo(NetworkRequest r, Handler h) {
super(h);
request = r;
handler = h;
}
}
@@ -152,15 +148,15 @@ public class TestConnectivityManager extends ConnectivityManager {
private void sendDefaultNetworkCallbacks(TestNetworkAgent formerDefault,
TestNetworkAgent defaultNetwork) {
for (NetworkCallback cb : mTrackingDefault.keySet()) {
final NetworkCallbackInfo nri = mTrackingDefault.get(cb);
final Handler handler = mTrackingDefault.get(cb);
if (defaultNetwork != null) {
nri.handler.post(() -> cb.onAvailable(defaultNetwork.networkId));
nri.handler.post(() -> cb.onCapabilitiesChanged(
handler.post(() -> cb.onAvailable(defaultNetwork.networkId));
handler.post(() -> cb.onCapabilitiesChanged(
defaultNetwork.networkId, defaultNetwork.networkCapabilities));
nri.handler.post(() -> cb.onLinkPropertiesChanged(
handler.post(() -> cb.onLinkPropertiesChanged(
defaultNetwork.networkId, defaultNetwork.linkProperties));
} else if (formerDefault != null) {
nri.handler.post(() -> cb.onLost(formerDefault.networkId));
handler.post(() -> cb.onLost(formerDefault.networkId));
}
}
}
@@ -201,10 +197,11 @@ public class TestConnectivityManager extends ConnectivityManager {
// For R- devices, Tethering will invoke this function in 2 cases, one is to request mobile
// network, the other is to track system default network.
if (looksLikeDefaultRequest(req)) {
registerSystemDefaultNetworkCallback(cb, h);
assertFalse(isAtLeastS());
addTrackDefaultCallback(cb, h);
} else {
assertFalse(mAllCallbacks.containsKey(cb));
mAllCallbacks.put(cb, new NetworkRequestInfo(req, h));
mAllCallbacks.put(cb, h);
assertFalse(mRequested.containsKey(cb));
mRequested.put(cb, new NetworkRequestInfo(req, h));
}
@@ -213,10 +210,14 @@ public class TestConnectivityManager extends ConnectivityManager {
@Override
public void registerSystemDefaultNetworkCallback(
@NonNull NetworkCallback cb, @NonNull Handler h) {
addTrackDefaultCallback(cb, h);
}
private void addTrackDefaultCallback(@NonNull NetworkCallback cb, @NonNull Handler h) {
assertFalse(mAllCallbacks.containsKey(cb));
mAllCallbacks.put(cb, new NetworkCallbackInfo(h));
mAllCallbacks.put(cb, h);
assertFalse(mTrackingDefault.containsKey(cb));
mTrackingDefault.put(cb, new NetworkCallbackInfo(h));
mTrackingDefault.put(cb, h);
}
@Override
@@ -230,7 +231,7 @@ public class TestConnectivityManager extends ConnectivityManager {
assertFalse(mAllCallbacks.containsKey(cb));
NetworkRequest newReq = new NetworkRequest(req.networkCapabilities, legacyType,
-1 /** testId */, req.type);
mAllCallbacks.put(cb, new NetworkRequestInfo(newReq, h));
mAllCallbacks.put(cb, h);
assertFalse(mRequested.containsKey(cb));
mRequested.put(cb, new NetworkRequestInfo(newReq, h));
assertFalse(mLegacyTypeMap.containsKey(cb));
@@ -242,7 +243,7 @@ public class TestConnectivityManager extends ConnectivityManager {
@Override
public void registerNetworkCallback(NetworkRequest req, NetworkCallback cb, Handler h) {
assertFalse(mAllCallbacks.containsKey(cb));
mAllCallbacks.put(cb, new NetworkRequestInfo(req, h));
mAllCallbacks.put(cb, h);
assertFalse(mListening.containsKey(cb));
mListening.put(cb, new NetworkRequestInfo(req, h));
}