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

Commit 7389a178 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BT: Include all Java tests without native dependency" am: 7e4dd2d6... 

Merge "BT: Include all Java tests without native dependency" am: 7e4dd2d6 am: 57b0fd5d am: bca71bb5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2076462



Change-Id: I88c57e00f857a62970defc3b57c46d8bf0dfa588
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94f6d0c2 bca71bb5

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpServiceTest.java

+0 −4
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ public class A2dpServiceTest { 
    @Before

    public void setUp() throws Exception {

        mTargetContext = InstrumentationRegistry.getTargetContext();

        Assume.assumeTrue("Ignore test when A2dpService is not enabled", A2dpService.isEnabled());

        // Set up mocks and test assets

        MockitoAnnotations.initMocks(this);
@@ -123,9 +122,6 @@ public class A2dpServiceTest { 


    @After

    public void tearDown() throws Exception {

        if (!A2dpService.isEnabled()) {

            return;

        }

        stopService();

        mTargetContext.unregisterReceiver(mA2dpIntentReceiver);

        mConnectionStateChangedQueue.clear();

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpStateMachineTest.java

+0 −4
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ public class A2dpStateMachineTest { 
    @Before

    public void setUp() throws Exception {

        mTargetContext = InstrumentationRegistry.getTargetContext();

        Assume.assumeTrue("Ignore test when A2dpService is not enabled", A2dpService.isEnabled());

        // Set up mocks and test assets

        MockitoAnnotations.initMocks(this);

        TestUtils.setAdapterService(mAdapterService);
@@ -116,9 +115,6 @@ public class A2dpStateMachineTest { 


    @After

    public void tearDown() throws Exception {

        if (!A2dpService.isEnabled()) {

            return;

        }

        mA2dpStateMachine.doQuit();

        mHandlerThread.quit();

        mHandlerThread.join(TIMEOUT_MS);

android/app/tests/unit/src/com/android/bluetooth/a2dpsink/A2dpSinkServiceTest.java

+0 −5
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ public class A2dpSinkServiceTest { 
    @Before

    public void setUp() throws Exception {

        mTargetContext = InstrumentationRegistry.getTargetContext();

        Assume.assumeTrue("Ignore test when A2dpSinkService is not enabled",

                A2dpSinkService.isEnabled());

        MockitoAnnotations.initMocks(this);



        mAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -110,9 +108,6 @@ public class A2dpSinkServiceTest { 


    @After

    public void tearDown() throws Exception {

        if (!A2dpSinkService.isEnabled()) {

            return;

        }

        TestUtils.stopService(mServiceRule, A2dpSinkService.class);

        mService = A2dpSinkService.getA2dpSinkService();

        assertThat(mService).isNull();

android/app/tests/unit/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachineTest.java

+0 −5
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ public class A2dpSinkStateMachineTest { 
    @Before

    public void setUp() throws Exception {

        mTargetContext = InstrumentationRegistry.getTargetContext();

        Assume.assumeTrue("Ignore test when A2dpSinkService is not enabled",

                A2dpSinkService.isEnabled());

        MockitoAnnotations.initMocks(this);



        mAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -82,9 +80,6 @@ public class A2dpSinkStateMachineTest { 


    @After

    public void tearDown() throws Exception {

        if (!A2dpSinkService.isEnabled()) {

            return;

        }

        mStateMachine = null;

        mDevice = null;

        mAdapter = null;

android/app/tests/unit/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandlerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ public class A2dpSinkStreamHandlerTest { 
    @Before

    public void setUp() {

        mTargetContext = InstrumentationRegistry.getTargetContext();

        Assume.assumeTrue("Ignore test when A2dpSinkService is not enabled",

                A2dpSinkService.isEnabled());

        MockitoAnnotations.initMocks(this);

        // Mock the looper

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