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

Commit 65d198ab authored by William Escande's avatar William Escande
Browse files

Use TestLooper in AdapterService*Test 

TestLooper should gave us more reliable and reproducible test

So we can control the loop the loop the loop the the the loop loop can
Oh no... here we are again

Bug: 292141273
Bug: 291815510
Test: atest AdapterServiceFactoryResetTest
Test: atest AdapterServiceTest
Test: atest AdapterServiceRestartTest
Change-Id: I83807df8ab4803cabca8c2dabb91bc9c96528c49
parent fd31da73

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceFactoryResetTest.java

+13 −26
Original line number Diff line number Diff line
@@ -37,15 +37,15 @@ import android.content.pm.PackageManager; 
import android.content.pm.PermissionInfo;

import android.content.res.Resources;

import android.media.AudioManager;

import android.os.AsyncTask;

import android.os.BatteryStatsManager;

import android.os.Binder;

import android.os.Bundle;

import android.os.Looper;

import android.os.Handler;

import android.os.PowerManager;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.test.TestLooper;

import android.permission.PermissionCheckerManager;

import android.permission.PermissionManager;

import android.provider.Settings;
@@ -62,7 +62,6 @@ import com.android.bluetooth.Utils; 
import com.android.internal.app.IBatteryStats;



import org.junit.After;

import org.junit.AfterClass;

import org.junit.Before;

import org.junit.BeforeClass;

import org.junit.Ignore;
@@ -120,6 +119,7 @@ public class AdapterServiceFactoryResetTest { 
    private MockContentResolver mMockContentResolver;

    private HashMap<String, HashMap<String, String>> mAdapterConfig;

    private int mForegroundUserId;

    private TestLooper mLooper;



    @BeforeClass

    public static void setupClass() {
@@ -135,22 +135,15 @@ public class AdapterServiceFactoryResetTest { 
    public void setUp() throws PackageManager.NameNotFoundException {

        Log.e(TAG, "setUp()");

        MockitoAnnotations.initMocks(this);

        if (Looper.myLooper() == null) {

            Looper.prepare();

        }

        assertThat(Looper.myLooper()).isNotNull();



        // Dispatch all async work through instrumentation so we can wait until

        // it's drained below

        AsyncTask.setDefaultExecutor((r) -> {

            androidx.test.platform.app.InstrumentationRegistry.getInstrumentation()

                    .runOnMainSync(r);

        });

        androidx.test.platform.app.InstrumentationRegistry.getInstrumentation().getUiAutomation()

                .adoptShellPermissionIdentity();

        mLooper = new TestLooper();

        Handler handler = new Handler(mLooper.getLooper());



        // Post the creation of AdapterService since it rely on Looper.myLooper()

        handler.post(() -> mAdapterService = new AdapterService(mLooper.getLooper()));

        assertThat(mLooper.dispatchAll()).isEqualTo(1);

        assertThat(mAdapterService).isNotNull();



        androidx.test.platform.app.InstrumentationRegistry.getInstrumentation().runOnMainSync(

                () -> mAdapterService = new AdapterService());

        mMockPackageManager = mock(PackageManager.class);

        when(mMockPackageManager.getPermissionInfo(any(), anyInt()))

                .thenReturn(new PermissionInfo());
@@ -251,8 +244,7 @@ public class AdapterServiceFactoryResetTest { 
        mAdapterService.attach(mMockContext, null, null, null, mApplication, null);

        mAdapterService.onCreate();



        // Wait for any async events to drain

        androidx.test.platform.app.InstrumentationRegistry.getInstrumentation().waitForIdleSync();

        mLooper.dispatchAll();



        mAdapterConfig = TestUtils.readAdapterConfig();

        assertThat(mAdapterConfig).isNotNull();
@@ -271,17 +263,12 @@ public class AdapterServiceFactoryResetTest { 
        mAdapterService.cleanup();

    }



    @AfterClass

    public static void tearDownOnce() {

        AsyncTask.setDefaultExecutor(AsyncTask.SERIAL_EXECUTOR);

    }



    void doEnable() {

        AdapterServiceTest.doEnable(

                mLooper,

                mMockGattService,

                mAdapterService,

                mMockContext,

                1,

                false,

                List.of(mMockService, mMockService2));

    }

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceRestartTest.java

+11 −24
Original line number Diff line number Diff line
@@ -37,15 +37,15 @@ import android.content.pm.PackageManager; 
import android.content.pm.PermissionInfo;

import android.content.res.Resources;

import android.media.AudioManager;

import android.os.AsyncTask;

import android.os.BatteryStatsManager;

import android.os.Binder;

import android.os.Bundle;

import android.os.Looper;

import android.os.Handler;

import android.os.PowerManager;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.test.TestLooper;

import android.permission.PermissionCheckerManager;

import android.permission.PermissionManager;

import android.provider.Settings;
@@ -62,7 +62,6 @@ import com.android.bluetooth.Utils; 
import com.android.internal.app.IBatteryStats;



import org.junit.After;

import org.junit.AfterClass;

import org.junit.Before;

import org.junit.BeforeClass;

import org.junit.Test;
@@ -109,6 +108,7 @@ public class AdapterServiceRestartTest { 
    private MockContentResolver mMockContentResolver;

    private HashMap<String, HashMap<String, String>> mAdapterConfig;

    private int mForegroundUserId;

    private TestLooper mLooper;



    @BeforeClass

    public static void setupClass() {
@@ -124,22 +124,15 @@ public class AdapterServiceRestartTest { 
    public void setUp() throws PackageManager.NameNotFoundException {

        Log.e(TAG, "setUp()");

        MockitoAnnotations.initMocks(this);

        if (Looper.myLooper() == null) {

            Looper.prepare();

        }

        assertThat(Looper.myLooper()).isNotNull();



        // Dispatch all async work through instrumentation so we can wait until

        // it's drained below

        AsyncTask.setDefaultExecutor((r) -> {

            androidx.test.platform.app.InstrumentationRegistry.getInstrumentation()

                    .runOnMainSync(r);

        });

        androidx.test.platform.app.InstrumentationRegistry.getInstrumentation().getUiAutomation()

                .adoptShellPermissionIdentity();

        mLooper = new TestLooper();

        Handler handler = new Handler(mLooper.getLooper());



        // Post the creation of AdapterService since it rely on Looper.myLooper()

        handler.post(() -> mAdapterService = new AdapterService(mLooper.getLooper()));

        assertThat(mLooper.dispatchAll()).isEqualTo(1);

        assertThat(mAdapterService).isNotNull();



        androidx.test.platform.app.InstrumentationRegistry.getInstrumentation().runOnMainSync(

                () -> mAdapterService = new AdapterService());

        mMockPackageManager = mock(PackageManager.class);

        when(mMockPackageManager.getPermissionInfo(any(), anyInt()))

                .thenReturn(new PermissionInfo());
@@ -234,8 +227,7 @@ public class AdapterServiceRestartTest { 
        mAdapterService.attach(mMockContext, null, null, null, mApplication, null);

        mAdapterService.onCreate();



        // Wait for any async events to drain

        androidx.test.platform.app.InstrumentationRegistry.getInstrumentation().waitForIdleSync();

        mLooper.dispatchAll();



        mAdapterService.registerCallback(mIBluetoothCallback);
@@ -254,11 +246,6 @@ public class AdapterServiceRestartTest { 
        mAdapterService.cleanup();

    }



    @AfterClass

    public static void tearDownOnce() {

        AsyncTask.setDefaultExecutor(AsyncTask.SERIAL_EXECUTOR);

    }



    /**

     * Test: Check if obfuscated Bluetooth address stays the same after re-initializing

     *       {@link AdapterService}

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+202 −164

File changed.

Preview size limit exceeded, changes collapsed.