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

Commit 13ef4f90 authored by Jizheng Chu's avatar Jizheng Chu Committed by Automerger Merge Worker
Browse files

Merge "Add Mobly test runner per GD_SL4A test script" am: 73578cc9 am:... 

Merge "Add Mobly test runner per GD_SL4A test script" am: 73578cc9 am: 46816305 am: f3e46b7e am: a1a0abe7 am: 80d7a880

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



Change-Id: Ib3fc609e0df74472f3ac688e26032315d966f423
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 284132eb 80d7a880

system/blueberry/tests/gd_sl4a/hci/le_advanced_scanning_test.py

+8 −2
Original line number Diff line number Diff line
@@ -26,12 +26,14 @@ from blueberry.facade.hci import le_advertising_manager_facade_pb2 as le_adverti 
from blueberry.facade.hci import le_initiator_address_facade_pb2 as le_initiator_address_facade

from blueberry.facade import common_pb2 as common

from blueberry.tests.gd.cert.truth import assertThat

from blueberry.tests.gd_sl4a.lib import gd_sl4a_base_test

from blueberry.tests.gd_sl4a.lib.bt_constants import ble_scan_settings_modes, ble_address_types, scan_result, ble_scan_settings_phys, ble_scan_settings_callback_types

from blueberry.tests.gd_sl4a.lib.ble_lib import generate_ble_scan_objects

from blueberry.tests.gd_sl4a.lib.gd_sl4a_base_test import GdSl4aBaseTestClass



from mobly import test_runner



class LeAdvancedScanningTest(GdSl4aBaseTestClass):



class LeAdvancedScanningTest(gd_sl4a_base_test.GdSl4aBaseTestClass):



    def setup_class(self):

        super().setup_class(cert_module='HCI_INTERFACES')
@@ -720,3 +722,7 @@ class LeAdvancedScanningTest(GdSl4aBaseTestClass): 


        # Test over

        self._stop_scanning(scan_callback)





if __name__ == '__main__':

    test_runner.main()

system/blueberry/tests/gd_sl4a/security/oob_pairing_sl4a_test.py

+8 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ from google.protobuf import empty_pb2 as empty_proto 


from bluetooth_packets_python3 import hci_packets



from blueberry.tests.gd_sl4a.lib import gd_sl4a_base_test

from blueberry.tests.gd_sl4a.lib.bt_constants import ble_scan_settings_phys

from blueberry.tests.gd_sl4a.lib.gd_sl4a_base_test import GdSl4aBaseTestClass

from blueberry.tests.gd.cert.matchers import SecurityMatchers

from blueberry.tests.gd.cert.py_le_security import PyLeSecurity

from blueberry.tests.gd.cert.truth import assertThat
@@ -39,6 +39,8 @@ from blueberry.facade.security.facade_pb2 import UiCallbackMsg 
from blueberry.facade.security.facade_pb2 import UiCallbackType

from blueberry.facade.security.facade_pb2 import UiMsgType



from mobly import test_runner



LeIoCapabilities = LeIoCapabilityMessage.LeIoCapabilities

LeOobDataFlag = LeOobDataPresentMessage.LeOobDataFlag
@@ -59,7 +61,7 @@ class OobData: 
        self.randomizer = randomizer





class OobPairingSl4aTest(GdSl4aBaseTestClass):

class OobPairingSl4aTest(gd_sl4a_base_test.GdSl4aBaseTestClass):

    # Events sent from SL4A

    SL4A_EVENT_GENERATED = "GeneratedOobData"

    SL4A_EVENT_ERROR = "ErrorOobData"
@@ -283,3 +285,7 @@ class OobPairingSl4aTest(GdSl4aBaseTestClass): 


        assertThat(bond_state).isNotNone()

        assertThat(bond_state["data"]["bonded_state"]).isEqualTo(False)





if __name__ == '__main__':

    test_runner.main()