Merge "Improve error message when testing network factory"

        // Register the factory and expect it to start looking for a network.

        testFactory.expectAddRequestsWithScores(0);  // Score 0 as the request is not served yet.

        testFactory.register();

        try {

            testFactory.waitForNetworkRequests(1);

            assertTrue(testFactory.getMyStartRequested());

            mCellNetworkAgent.connect(true);

            cellNetworkCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent);

            testFactory.waitForNetworkRequests(2);

        assertFalse(testFactory.getMyStartRequested());  // Because the cell network outscores us.

            assertFalse(

                    testFactory.getMyStartRequested());  // Because the cell network outscores us.

            // Check that cell data stays up.

            waitForIdle();

            // ...  and cell data to be torn down.

            cellNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);

            assertLength(1, mCm.getAllNetworks());

        } finally {

            testFactory.terminate();

            mCm.unregisterNetworkCallback(cellNetworkCallback);

            handlerThread.quit();

        }

    }

    @Test

    public void testAvoidBadWifiSetting() throws Exception {