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

Commit 29bf222f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "AdapterService: Don't check in teardown" into main

parents b93aed61 50fbe743

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

+19 −1
Original line number Original line Diff line number Diff line
@@ -346,7 +346,6 @@ public class AdapterServiceTest { 
        // Restores the foregroundUserId to the ID prior to the test setup

        // Restores the foregroundUserId to the ID prior to the test setup

        Utils.setForegroundUserId(mForegroundUserId);

        Utils.setForegroundUserId(mForegroundUserId);





        assertThat(mLooper.nextMessage()).isNull();

        mAdapterService.cleanup();

        mAdapterService.cleanup();

        mAdapterService.unregisterRemoteCallback(mIBluetoothCallback);

        mAdapterService.unregisterRemoteCallback(mIBluetoothCallback);

        AdapterNativeInterface.setInstance(null);

        AdapterNativeInterface.setInstance(null);
@@ -567,6 +566,7 @@ public class AdapterServiceTest { 
    @Test

    @Test

    public void testEnable() {

    public void testEnable() {

        doEnable(false);

        doEnable(false);

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    @Test

    @Test
@@ -580,6 +580,7 @@ public class AdapterServiceTest { 




        verify(mNativeInterface).setScanMode(eq(halExpectedScanMode));

        verify(mNativeInterface).setScanMode(eq(halExpectedScanMode));

        assertThat(mAdapterService.getScanMode()).isEqualTo(expectedScanMode);

        assertThat(mAdapterService.getScanMode()).isEqualTo(expectedScanMode);

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    /** Test: Turn Bluetooth on/off. Check whether the AdapterService gets started and stopped. */

    /** Test: Turn Bluetooth on/off. Check whether the AdapterService gets started and stopped. */
@@ -587,6 +588,7 @@ public class AdapterServiceTest { 
    public void testEnableDisable() {

    public void testEnableDisable() {

        doEnable(false);

        doEnable(false);

        doDisable(false);

        doDisable(false);

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    /**

    /**
@@ -613,6 +615,7 @@ public class AdapterServiceTest { 
        Config.init(mockContext);

        Config.init(mockContext);

        doEnable(true);

        doEnable(true);

        doDisable(true);

        doDisable(true);

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    /** Test: Don't start GATT Check whether the AdapterService quits gracefully */

    /** Test: Don't start GATT Check whether the AdapterService quits gracefully */
@@ -646,6 +649,7 @@ public class AdapterServiceTest { 




        verifyStateChange(STATE_BLE_TURNING_OFF, STATE_OFF);

        verifyStateChange(STATE_BLE_TURNING_OFF, STATE_OFF);

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

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

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    /** Test: Don't stop GATT Check whether the AdapterService quits gracefully */

    /** Test: Don't stop GATT Check whether the AdapterService quits gracefully */
@@ -679,6 +683,7 @@ public class AdapterServiceTest { 
        verifyStateChange(STATE_BLE_TURNING_OFF, STATE_OFF);

        verifyStateChange(STATE_BLE_TURNING_OFF, STATE_OFF);





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

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

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    @Test

    @Test
@@ -691,6 +696,7 @@ public class AdapterServiceTest { 




        dropNextMessage(MESSAGE_PROFILE_SERVICE_REGISTERED);

        dropNextMessage(MESSAGE_PROFILE_SERVICE_REGISTERED);

        dropNextMessage(MESSAGE_PROFILE_SERVICE_STATE_CHANGED);

        dropNextMessage(MESSAGE_PROFILE_SERVICE_STATE_CHANGED);

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    @Test

    @Test
@@ -700,6 +706,7 @@ public class AdapterServiceTest { 




        assertThat(mAdapterService.getBluetoothGatt()).isNull();

        assertThat(mAdapterService.getBluetoothGatt()).isNull();

        assertThat(mAdapterService.getBluetoothScan()).isNotNull();

        assertThat(mAdapterService.getBluetoothScan()).isNotNull();

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    @Test

    @Test
@@ -741,6 +748,7 @@ public class AdapterServiceTest { 




        assertThat(mAdapterService.getBluetoothScan()).isNull();

        assertThat(mAdapterService.getBluetoothScan()).isNull();

        assertThat(mAdapterService.getBluetoothGatt()).isNull();

        assertThat(mAdapterService.getBluetoothGatt()).isNull();

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    @Test

    @Test
@@ -808,6 +816,7 @@ public class AdapterServiceTest { 
        assertThat(mAdapterService.getState()).isEqualTo(STATE_BLE_ON);

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





        mAdapterService.unregisterRemoteCallback(callback);

        mAdapterService.unregisterRemoteCallback(callback);

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    /** Test: Don't start a classic profile Check whether the AdapterService quits gracefully */

    /** Test: Don't start a classic profile Check whether the AdapterService quits gracefully */
@@ -851,6 +860,7 @@ public class AdapterServiceTest { 




        // Ensure GATT is still running

        // Ensure GATT is still running

        assertThat(mAdapterService.getBluetoothGatt()).isNotNull();

        assertThat(mAdapterService.getBluetoothGatt()).isNotNull();

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    /** Test: Don't stop a classic profile Check whether the AdapterService quits gracefully */

    /** Test: Don't stop a classic profile Check whether the AdapterService quits gracefully */
@@ -885,6 +895,7 @@ public class AdapterServiceTest { 
        verifyStateChange(STATE_BLE_TURNING_OFF, STATE_OFF);

        verifyStateChange(STATE_BLE_TURNING_OFF, STATE_OFF);





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

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

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    /** Test: Toggle snoop logging setting Check whether the AdapterService restarts fully */

    /** Test: Toggle snoop logging setting Check whether the AdapterService restarts fully */
@@ -933,6 +944,7 @@ public class AdapterServiceTest { 




        // Restore earlier setting

        // Restore earlier setting

        BluetoothProperties.snoop_log_mode(snoopSetting);

        BluetoothProperties.snoop_log_mode(snoopSetting);

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    /**

    /**
@@ -943,6 +955,7 @@ public class AdapterServiceTest { 
    @Test

    @Test

    public void testObfuscateBluetoothAddress_NullAddress() {

    public void testObfuscateBluetoothAddress_NullAddress() {

        assertThat(mAdapterService.obfuscateAddress(null)).isEmpty();

        assertThat(mAdapterService.obfuscateAddress(null)).isEmpty();

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    @Test

    @Test
@@ -963,6 +976,7 @@ public class AdapterServiceTest { 
        // Verify we can get correct identity address

        // Verify we can get correct identity address

        identityAddress = mAdapterService.getIdentityAddress(TEST_BT_ADDR_1);

        identityAddress = mAdapterService.getIdentityAddress(TEST_BT_ADDR_1);

        assertThat(identityAddress).isEqualTo(TEST_BT_ADDR_2);

        assertThat(identityAddress).isEqualTo(TEST_BT_ADDR_2);

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    @Test

    @Test
@@ -972,6 +986,7 @@ public class AdapterServiceTest { 




        assertThat(mAdapterService.getByteIdentityAddress(device)).isNull();

        assertThat(mAdapterService.getByteIdentityAddress(device)).isNull();

        assertThat(mAdapterService.getIdentityAddress(device.getAddress())).isNull();

        assertThat(mAdapterService.getIdentityAddress(device.getAddress())).isNull();

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    public static byte[] getMetricsSalt(Map<String, Map<String, String>> adapterConfig) {

    public static byte[] getMetricsSalt(Map<String, Map<String, String>> adapterConfig) {
@@ -1021,6 +1036,7 @@ public class AdapterServiceTest { 
    @Test

    @Test

    public void testGetMetricId_NullAddress() {

    public void testGetMetricId_NullAddress() {

        assertThat(mAdapterService.getMetricId(null)).isEqualTo(0);

        assertThat(mAdapterService.getMetricId(null)).isEqualTo(0);

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    @Test

    @Test
@@ -1033,6 +1049,7 @@ public class AdapterServiceTest { 
        doReturn(new byte[0]).when(mNativeInterface).dumpMetrics();

        doReturn(new byte[0]).when(mNativeInterface).dumpMetrics();

        mAdapterService.dump(fd, writer, new String[] {"--proto-bin"});

        mAdapterService.dump(fd, writer, new String[] {"--proto-bin"});

        mAdapterService.dump(fd, writer, new String[] {"random", "arguments"});

        mAdapterService.dump(fd, writer, new String[] {"random", "arguments"});

        assertThat(mLooper.nextMessage()).isNull();

    }

    }





    @Test

    @Test
@@ -1070,5 +1087,6 @@ public class AdapterServiceTest { 
            Files.deleteIfExists(randomFileUnderBluedroidPath);

            Files.deleteIfExists(randomFileUnderBluedroidPath);

            Files.deleteIfExists(randomFileUnderBluetoothPath);

            Files.deleteIfExists(randomFileUnderBluetoothPath);

        }

        }

        assertThat(mLooper.nextMessage()).isNull();

    }

    }

}
 
}