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

Commit 38089d65 authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify cert test setup 

Pass the dut_module and cert_module as arguments to setting up
the class. Use named arguments for clarity.

Test: cert/run --host
Change-Id: Ica71783bee2fac28fdc60b8e6e48d84890821384
parent e1e95be6

system/gd/cert/cert_self_test.py

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ import time 


from mobly import asserts

from datetime import datetime, timedelta

from cert.gd_base_test_facade_only import GdFacadeOnlyBaseTestClass

from acts.base_test import BaseTestClass

from cert.event_callback_stream import EventCallbackStream

from cert.event_asserts import EventAsserts
@@ -86,7 +86,7 @@ class FetchEvents: 
        return None





class CertSelfTest(GdFacadeOnlyBaseTestClass):

class CertSelfTest(BaseTestClass):



    def setup_test(self):

        return True

system/gd/cert/gd_base_test_facade_only.py

+23 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#   limitations under the License.



from acts.base_test import BaseTestClass

from facade import rootservice_pb2 as facade_rootservice



import importlib

import logging
@@ -27,7 +28,9 @@ ANDROID_BUILD_TOP = os.environ.get('ANDROID_BUILD_TOP') 


class GdFacadeOnlyBaseTestClass(BaseTestClass):



    def setup_class(self):

    def setup_class(self, dut_module, cert_module):

        self.dut_module = dut_module

        self.cert_module = cert_module



        gd_devices = self.controller_configs.get("GdDevice")
@@ -71,3 +74,22 @@ class GdFacadeOnlyBaseTestClass(BaseTestClass): 
                logging.error(

                    "rootcanal stopped with code: %d" % rootcanal_return_code)

                return False



    def setup_test(self):

        self.device_under_test.rootservice.StartStack(

            facade_rootservice.StartStackRequest(

                module_under_test=facade_rootservice.BluetoothModule.Value(

                    self.dut_module),))

        self.cert_device.rootservice.StartStack(

            facade_rootservice.StartStackRequest(

                module_under_test=facade_rootservice.BluetoothModule.Value(

                    self.cert_module),))



        self.device_under_test.wait_channel_ready()

        self.cert_device.wait_channel_ready()



    def teardown_test(self):

        self.device_under_test.rootservice.StopStack(

            facade_rootservice.StopStackRequest())

        self.cert_device.rootservice.StopStack(

            facade_rootservice.StopStackRequest())

system/gd/hal/cert/simple_hal_test.py

+9 −22
Original line number Diff line number Diff line
@@ -28,6 +28,15 @@ import bluetooth_packets_python3 as bt_packets 


class SimpleHalTest(GdFacadeOnlyBaseTestClass):



    def setup_class(self):

        super().setup_class(dut_module='HAL', cert_module='HAL')



    def setup_test(self):

        super().setup_test()



        self.send_dut_hci_command(hci_packets.ResetBuilder())

        self.send_cert_hci_command(hci_packets.ResetBuilder())



    def send_cert_hci_command(self, command):

        self.cert_device.hal.SendHciCommand(

            hal_facade_pb2.HciCommandPacket(payload=bytes(command.Serialize())))
@@ -60,28 +69,6 @@ class SimpleHalTest(GdFacadeOnlyBaseTestClass): 
        self.device_under_test.hal.SendHciAcl(

            hal_facade_pb2.HciAclPacket(payload=concatenated))



    def setup_test(self):

        self.device_under_test.rootservice.StartStack(

            facade_rootservice_pb2.StartStackRequest(

                module_under_test=facade_rootservice_pb2.BluetoothModule.Value(

                    'HAL'),))

        self.cert_device.rootservice.StartStack(

            facade_rootservice_pb2.StartStackRequest(

                module_under_test=facade_rootservice_pb2.BluetoothModule.Value(

                    'HAL'),))



        self.device_under_test.wait_channel_ready()

        self.cert_device.wait_channel_ready()



        self.send_dut_hci_command(hci_packets.ResetBuilder())

        self.send_cert_hci_command(hci_packets.ResetBuilder())



    def teardown_test(self):

        self.device_under_test.rootservice.StopStack(

            facade_rootservice_pb2.StopStackRequest())

        self.cert_device.rootservice.StopStack(

            facade_rootservice_pb2.StopStackRequest())



    def test_none_event(self):

        with EventCallbackStream(

                self.device_under_test.hal.FetchHciEvent(

system/gd/hci/cert/acl_manager_test.py

+2 −19
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ from cert.gd_base_test_facade_only import GdFacadeOnlyBaseTestClass 
from cert.event_callback_stream import EventCallbackStream

from cert.event_asserts import EventAsserts

from google.protobuf import empty_pb2 as empty_proto

from facade import rootservice_pb2 as facade_rootservice

from hci.facade import acl_manager_facade_pb2 as acl_manager_facade

from neighbor.facade import facade_pb2 as neighbor_facade

from hci.facade import controller_facade_pb2 as controller_facade
@@ -33,24 +32,8 @@ from bluetooth_packets_python3 import hci_packets 


class AclManagerTest(GdFacadeOnlyBaseTestClass):



    def setup_test(self):

        self.device_under_test.rootservice.StartStack(

            facade_rootservice.StartStackRequest(

                module_under_test=facade_rootservice.BluetoothModule.Value(

                    'HCI_INTERFACES'),))

        self.cert_device.rootservice.StartStack(

            facade_rootservice.StartStackRequest(

                module_under_test=facade_rootservice.BluetoothModule.Value(

                    'HCI'),))



        self.device_under_test.wait_channel_ready()

        self.cert_device.wait_channel_ready()



    def teardown_test(self):

        self.device_under_test.rootservice.StopStack(

            facade_rootservice.StopStackRequest())

        self.cert_device.rootservice.StopStack(

            facade_rootservice.StopStackRequest())

    def setup_class(self):

        super().setup_class(dut_module='HCI_INTERFACES', cert_module='HCI')



    def register_for_event(self, event_code):

        msg = hci_facade.EventCodeMsg(code=int(event_code))

system/gd/hci/cert/controller_test.py

+3 −18
Original line number Diff line number Diff line
@@ -25,24 +25,9 @@ from hci.facade import controller_facade_pb2 as controller_facade 


class ControllerTest(GdFacadeOnlyBaseTestClass):



    def setup_test(self):

        self.device_under_test.rootservice.StartStack(

            facade_rootservice.StartStackRequest(

                module_under_test=facade_rootservice.BluetoothModule.Value(

                    'HCI_INTERFACES'),))

        self.cert_device.rootservice.StartStack(

            facade_rootservice.StartStackRequest(

                module_under_test=facade_rootservice.BluetoothModule.Value(

                    'HCI_INTERFACES'),))



        self.device_under_test.wait_channel_ready()

        self.cert_device.wait_channel_ready()



    def teardown_test(self):

        self.device_under_test.rootservice.StopStack(

            facade_rootservice.StopStackRequest())

        self.cert_device.rootservice.StopStack(

            facade_rootservice.StopStackRequest())

    def setup_class(self):

        super().setup_class(

            dut_module='HCI_INTERFACES', cert_module='HCI_INTERFACES')



    def test_get_addresses(self):

        cert_address_response = self.cert_device.hci_controller.GetMacAddress(