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

Commit cf04847d authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge "Remove service.isEnabled() checks from unit tests" am: 1acbe5a8 am: e0a92ba4 

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



Change-Id: Ic6a2524b6e12b57a752e4fede17cffa458cec83a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e684cf92 e0a92ba4

android/app/tests/unit/AndroidTest.xml

+0 −17
Original line number Diff line number Diff line
@@ -30,26 +30,9 @@ 
        <option name="run-command" value="settings put global ble_scan_always_enabled 0" />

        <option name="run-command" value="cmd bluetooth_manager disable" />

        <option name="run-command" value="cmd bluetooth_manager wait-for-state:STATE_OFF" />

        <option name="run-command" value="setprop bluetooth.profile.hfp.hf.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.pbap.client.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.map.client.enabled true" />

        <option name="run-command"

                value="setprop bluetooth.profile.avrcp.controller.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.a2dp.sink.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.sap.server.enabled true" />

        <option name="teardown-command" value="cmd bluetooth_manager enable" />

        <option name="teardown-command" value="cmd bluetooth_manager wait-for-state:STATE_ON" />

        <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />

        <option name="teardown-command" value="setprop bluetooth.profile.hfp.hf.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.pbap.client.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.map.client.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.avrcp.controller.enabled false" />

        <option name="teardown-command" value="setprop bluetooth.profile.a2dp.sink.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.sap.server.enabled false" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.FolderSaver">

        <option name="device-path" value="/data/vendor/ssrdump" />

android/app/tests/unit/GoogleAndroidTest.xml

+0 −17
Original line number Diff line number Diff line
@@ -30,26 +30,9 @@ 
        <option name="run-command" value="settings put global ble_scan_always_enabled 0" />

        <option name="run-command" value="cmd bluetooth_manager disable" />

        <option name="run-command" value="cmd bluetooth_manager wait-for-state:STATE_OFF" />

        <option name="run-command" value="setprop bluetooth.profile.hfp.hf.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.pbap.client.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.map.client.enabled true" />

        <option name="run-command"

                value="setprop bluetooth.profile.avrcp.controller.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.a2dp.sink.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.sap.server.enabled true" />

        <option name="teardown-command" value="cmd bluetooth_manager enable" />

        <option name="teardown-command" value="cmd bluetooth_manager wait-for-state:STATE_ON" />

        <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.pbap.client.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.map.client.enabled false" />

        <option name="teardown-command" value="setprop bluetooth.profile.hfp.hf.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.avrcp.controller.enabled false" />

        <option name="teardown-command" value="setprop bluetooth.profile.a2dp.sink.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.sap.server.enabled false" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.FolderSaver">

        <option name="device-path" value="/data/vendor/ssrdump" />

android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerServiceTest.java

+0 −5
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ public class AvrcpControllerServiceTest { 


    @Before

    public void setUp() throws Exception {

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

                AvrcpControllerService.isEnabled());

        MockitoAnnotations.initMocks(this);

        TestUtils.setAdapterService(mAdapterService);

        doReturn(true, false).when(mAdapterService).isStartedProfile(anyString());
@@ -85,9 +83,6 @@ public class AvrcpControllerServiceTest { 


    @After

    public void tearDown() throws Exception {

        if (!AvrcpControllerService.isEnabled()) {

            return;

        }

        TestUtils.stopService(mServiceRule, AvrcpControllerService.class);

        mService = AvrcpControllerService.getAvrcpControllerService();

        assertThat(mService).isNull();

android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java

+0 −5
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ public class AvrcpControllerStateMachineTest { 


    @Before

    public void setUp() throws Exception {

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

                AvrcpControllerService.isEnabled());

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

            Looper.prepare();

        }
@@ -142,9 +140,6 @@ public class AvrcpControllerStateMachineTest { 


    @After

    public void tearDown() throws Exception {

        if (!AvrcpControllerService.isEnabled()) {

            return;

        }

        destroyStateMachine(mAvrcpStateMachine);

        TestUtils.clearAdapterService(mAvrcpAdapterService);

    }

android/app/tests/unit/src/com/android/bluetooth/bas/BatteryServiceTest.java

+0 −6
Original line number Diff line number Diff line
@@ -72,9 +72,6 @@ public class BatteryServiceTest { 
    @Before

    public void setUp() throws Exception {

        mTargetContext = InstrumentationRegistry.getTargetContext();

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

                BatteryService.isEnabled());



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

            Looper.prepare();

        }
@@ -98,9 +95,6 @@ public class BatteryServiceTest { 


    @After

    public void tearDown() throws Exception {

        if (!BatteryService.isEnabled()) {

            return;

        }

        stopService();

        TestUtils.clearAdapterService(mAdapterService);

    }