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

Commit fd31da73 authored by William Escande's avatar William Escande
Browse files

static import of BluetoothAdapter State 

Bug: 292141273
Bug: 291815510
Test: atest AdapterServiceFactoryResetTest
Test: atest AdapterServiceTest
Test: atest AdapterServiceRestartTest
Change-Id: I0a66239e2722d84a989bec4a5edfbffe5394a381
parent dd4301e1

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

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.bluetooth.btservice;



import static android.bluetooth.BluetoothAdapter.STATE_OFF;



import static com.google.common.truth.Truth.assertThat;
@@ -304,7 +305,7 @@ public class AdapterServiceFactoryResetTest { 
            + " after factory reset")

    @Test

    public void testObfuscateBluetoothAddress_FactoryReset() {

        assertThat(mAdapterService.getState()).isNotEqualTo(BluetoothAdapter.STATE_ON);

        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        BluetoothDevice device = TestUtils.getTestDevice(BluetoothAdapter.getDefaultAdapter(), 0);

        byte[] obfuscatedAddress1 = mAdapterService.obfuscateAddress(device);

        assertThat(obfuscatedAddress1).isNotEmpty();
@@ -335,7 +336,7 @@ public class AdapterServiceFactoryResetTest { 
            throws PackageManager.NameNotFoundException {

        byte[] metricsSalt1 = AdapterServiceTest.getMetricsSalt(mAdapterConfig);

        assertThat(metricsSalt1).isNotNull();

        assertThat(mAdapterService.getState()).isNotEqualTo(BluetoothAdapter.STATE_ON);

        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        BluetoothDevice device = TestUtils.getTestDevice(BluetoothAdapter.getDefaultAdapter(), 0);

        byte[] obfuscatedAddress1 = mAdapterService.obfuscateAddress(device);

        assertThat(obfuscatedAddress1).isNotEmpty();

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

+6 −4
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.bluetooth.btservice;



import static android.bluetooth.BluetoothAdapter.STATE_OFF;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;
@@ -272,7 +274,7 @@ public class AdapterServiceRestartTest { 
        }

        byte[] metricsSalt = AdapterServiceTest.getMetricsSalt(mAdapterConfig);

        assertThat(metricsSalt).isNotNull();

        assertThat(mAdapterService.getState()).isEqualTo(BluetoothAdapter.STATE_OFF);

        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        BluetoothDevice device = TestUtils.getTestDevice(BluetoothAdapter.getDefaultAdapter(), 0);

        byte[] obfuscatedAddress1 = mAdapterService.obfuscateAddress(device);

        assertThat(obfuscatedAddress1).isNotEmpty();
@@ -286,7 +288,7 @@ public class AdapterServiceRestartTest { 
        assertThat(metricsSalt2).isNotNull();

        assertThat(metricsSalt).isEqualTo(metricsSalt2);



        assertThat(mAdapterService.getState()).isEqualTo(BluetoothAdapter.STATE_OFF);

        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        byte[] obfuscatedAddress2 = mAdapterService.obfuscateAddress(device);

        assertThat(obfuscatedAddress2).isNotEmpty();

        assertThat(AdapterServiceTest.isByteArrayAllZero(obfuscatedAddress2)).isFalse();
@@ -300,13 +302,13 @@ public class AdapterServiceRestartTest { 
    @Test

    public void testgetMetricId_PersistentBetweenAdapterServiceInitialization() throws

            PackageManager.NameNotFoundException {

        assertThat(mAdapterService.getState()).isEqualTo(BluetoothAdapter.STATE_OFF);

        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        BluetoothDevice device = TestUtils.getTestDevice(BluetoothAdapter.getDefaultAdapter(), 0);

        int initialMetricId = mAdapterService.getMetricId(device);

        assertThat(initialMetricId).isGreaterThan(0);

        tearDown();

        setUp();

        assertThat(mAdapterService.getState()).isEqualTo(BluetoothAdapter.STATE_OFF);

        assertThat(mAdapterService.getState()).isEqualTo(STATE_OFF);

        assertThat(mAdapterService.getMetricId(device)).isEqualTo(initialMetricId);

    }

}

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

+88 −116

File changed.

Preview size limit exceeded, changes collapsed.