From 92c29c56d7e5d968a1beb2b79a509eba7df4313e Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Tue, 22 Jun 2021 03:03:51 +0000 Subject: [PATCH] Add more unit tests for ConnectivityManager S APIs Test: atest android.net.ConnectivityManagerTest Bug: 188657173 Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f Merged-In: I33612650eb89486a14fcfc440ba0c357f4bb513c Change-Id: I33612650eb89486a14fcfc440ba0c357f4bb513c (cherry-picked from ag/14640282) --- .../android/net/ConnectivityManagerTest.java | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/tests/unit/java/android/net/ConnectivityManagerTest.java b/tests/unit/java/android/net/ConnectivityManagerTest.java index 07f22a2900..b8cd3f68d0 100644 --- a/tests/unit/java/android/net/ConnectivityManagerTest.java +++ b/tests/unit/java/android/net/ConnectivityManagerTest.java @@ -320,26 +320,34 @@ public class ConnectivityManagerTest { NetworkCallback nullCallback = null; PendingIntent nullIntent = null; - mustFail(() -> { manager.requestNetwork(null, callback); }); - mustFail(() -> { manager.requestNetwork(request, nullCallback); }); - mustFail(() -> { manager.requestNetwork(request, callback, null); }); - mustFail(() -> { manager.requestNetwork(request, callback, -1); }); - mustFail(() -> { manager.requestNetwork(request, nullIntent); }); + mustFail(() -> manager.requestNetwork(null, callback)); + mustFail(() -> manager.requestNetwork(request, nullCallback)); + mustFail(() -> manager.requestNetwork(request, callback, null)); + mustFail(() -> manager.requestNetwork(request, callback, -1)); + mustFail(() -> manager.requestNetwork(request, nullIntent)); - mustFail(() -> { manager.registerNetworkCallback(null, callback, handler); }); - mustFail(() -> { manager.registerNetworkCallback(request, null, handler); }); - mustFail(() -> { manager.registerNetworkCallback(request, callback, null); }); - mustFail(() -> { manager.registerNetworkCallback(request, nullIntent); }); + mustFail(() -> manager.requestBackgroundNetwork(null, callback, handler)); + mustFail(() -> manager.requestBackgroundNetwork(request, null, handler)); + mustFail(() -> manager.requestBackgroundNetwork(request, callback, null)); - mustFail(() -> { manager.registerDefaultNetworkCallback(null, handler); }); - mustFail(() -> { manager.registerDefaultNetworkCallback(callback, null); }); + mustFail(() -> manager.registerNetworkCallback(null, callback, handler)); + mustFail(() -> manager.registerNetworkCallback(request, null, handler)); + mustFail(() -> manager.registerNetworkCallback(request, callback, null)); + mustFail(() -> manager.registerNetworkCallback(request, nullIntent)); - mustFail(() -> { manager.registerSystemDefaultNetworkCallback(null, handler); }); - mustFail(() -> { manager.registerSystemDefaultNetworkCallback(callback, null); }); + mustFail(() -> manager.registerDefaultNetworkCallback(null, handler)); + mustFail(() -> manager.registerDefaultNetworkCallback(callback, null)); - mustFail(() -> { manager.unregisterNetworkCallback(nullCallback); }); - mustFail(() -> { manager.unregisterNetworkCallback(nullIntent); }); - mustFail(() -> { manager.releaseNetworkRequest(nullIntent); }); + mustFail(() -> manager.registerSystemDefaultNetworkCallback(null, handler)); + mustFail(() -> manager.registerSystemDefaultNetworkCallback(callback, null)); + + mustFail(() -> manager.registerBestMatchingNetworkCallback(null, callback, handler)); + mustFail(() -> manager.registerBestMatchingNetworkCallback(request, null, handler)); + mustFail(() -> manager.registerBestMatchingNetworkCallback(request, callback, null)); + + mustFail(() -> manager.unregisterNetworkCallback(nullCallback)); + mustFail(() -> manager.unregisterNetworkCallback(nullIntent)); + mustFail(() -> manager.releaseNetworkRequest(nullIntent)); } static void mustFail(Runnable fn) {