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

Commit 695cea59 authored by Rebecca Silberstein's avatar Rebecca Silberstein
Browse files

WifiManagerTest: alt way to check callback 

We are seeing failures on automated tests.  This is occuring when the
thread id is retrieved from the TestLooper.  Since we do not have
control over exactly which thread is used in the TestLooper for these
environments, this CL changes the checks to make sure the the callback
is called, and also that we never attempt to get the main looper (the
behavior when the provided handler is null).

Bug: 37828843
Test:  frameworks/base/wifi/tests/runtests.sh
Change-Id: I853c423b5f383225c250357d638c4cfd2c098edc
parent 23d79bf1

wifi/tests/src/android/net/wifi/WifiManagerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -336,14 +336,13 @@ public class WifiManagerTest { 
     */

    @Test

    public void testCorrectLooperIsUsedForHandler() throws Exception {

        // record thread from looper.getThread and check ids.

        TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback();

        when(mWifiService.startLocalOnlyHotspot(any(Messenger.class), any(IBinder.class)))

                .thenReturn(ERROR_INCOMPATIBLE_MODE);

        mWifiManager.startLocalOnlyHotspot(callback, mHandler);

        mLooper.dispatchAll();

        assertEquals(ERROR_INCOMPATIBLE_MODE, callback.mFailureReason);

        assertEquals(mLooper.getLooper().getThread().getId(), callback.mCallingThreadId);

        verify(mContext, never()).getMainLooper();

    }



    /**
@@ -362,6 +361,7 @@ public class WifiManagerTest { 
        altLooper.dispatchAll();

        assertEquals(ERROR_INCOMPATIBLE_MODE, callback.mFailureReason);

        assertEquals(altLooper.getLooper().getThread().getId(), callback.mCallingThreadId);

        verify(mContext).getMainLooper();

    }



    /**
@@ -632,12 +632,11 @@ public class WifiManagerTest { 
     */

    @Test

    public void testCorrectLooperIsUsedForObserverHandler() throws Exception {

        // record thread from looper.getThread and check ids.

        TestLocalOnlyHotspotObserver observer = new TestLocalOnlyHotspotObserver();

        mWifiManager.watchLocalOnlyHotspot(observer, mHandler);

        mLooper.dispatchAll();

        assertTrue(observer.mOnRegistered);

        assertEquals(mLooper.getLooper().getThread().getId(), observer.mCallingThreadId);

        verify(mContext, never()).getMainLooper();

    }



    /**
@@ -654,6 +653,7 @@ public class WifiManagerTest { 
        altLooper.dispatchAll();

        assertTrue(observer.mOnRegistered);

        assertEquals(altLooper.getLooper().getThread().getId(), observer.mCallingThreadId);

        verify(mContext).getMainLooper();

    }



    /**