Merge "Improve error message when testing network factory"

tests/net/java/com/android/server/ConnectivityServiceTest.java

@@ -3624,6 +3624,8 @@ public class ConnectivityServiceTest {
         // 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());
 
@@ -3650,7 +3652,8 @@ public class ConnectivityServiceTest {
             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();
@@ -3665,11 +3668,12 @@ public class ConnectivityServiceTest {
             // ...  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 {