Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c7767d7 authored by Junyu Lai's avatar Junyu Lai
Browse files

Add more unit tests for ConnectivityManager S APIs 

Ignore-AOSP-First: Avoid merge conflict
Test: atest android.net.ConnectivityManagerTest
Bug: 188657173
Change-Id: I33612650eb89486a14fcfc440ba0c357f4bb513c
parent 8168766a

packages/Connectivity/tests/unit/java/android/net/ConnectivityManagerTest.java

+28 −20
Original line number Diff line number Diff line
@@ -317,26 +317,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.registerNetworkCallback(null, callback, handler); });

        mustFail(() -> { manager.registerNetworkCallback(request, null, handler); });

        mustFail(() -> { manager.registerNetworkCallback(request, callback, null); });

        mustFail(() -> { manager.registerNetworkCallback(request, nullIntent); });



        mustFail(() -> { manager.registerDefaultNetworkCallback(null, handler); });

        mustFail(() -> { manager.registerDefaultNetworkCallback(callback, null); });



        mustFail(() -> { manager.registerSystemDefaultNetworkCallback(null, handler); });

        mustFail(() -> { manager.registerSystemDefaultNetworkCallback(callback, null); });



        mustFail(() -> { manager.unregisterNetworkCallback(nullCallback); });

        mustFail(() -> { manager.unregisterNetworkCallback(nullIntent); });

        mustFail(() -> { manager.releaseNetworkRequest(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.requestBackgroundNetwork(null, callback, handler));

        mustFail(() -> manager.requestBackgroundNetwork(request, null, handler));

        mustFail(() -> manager.requestBackgroundNetwork(request, 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.registerDefaultNetworkCallback(null, handler));

        mustFail(() -> manager.registerDefaultNetworkCallback(callback, null));



        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) {