commit db4bc0307eb029dd356dfffea99c74a10b35b93d
author Jakub Pawlowski <jpawlowski@google.com> Mon Jun 06 11:28:23 2016 -0700
committer Jakub Pawlowski <jpawlowski@google.com> Mon Jun 06 11:31:54 2016 -0700
tree 4fb37947fc085b6b0fd57d3da54c800b4a0e72e0
parent 79ef5427a796622201060cf562bccd08cc38eb59

Use  _setup_multiple_services helper in test_gatt_connect_mitm_attack

Instead of creating service/characteristics by hand, use helper that
already does that for other tests.

Change-Id: Ic1fc158d4d352618009129ec2b85f9ef6119e21f

acts/tests/google/ble/gatt/GattConnectTest.py

diff --git a/acts/tests/google/ble/gatt/GattConnectTest.py b/acts/tests/google/ble/gatt/GattConnectTest.py
index 33043d1..d160788 100644
--- a/acts/tests/google/ble/gatt/GattConnectTest.py
+++ b/acts/tests/google/ble/gatt/GattConnectTest.py
@@ -1037,25 +1037,11 @@
         TAGS: LE, Advertising, Filtering, Scanning, GATT, Characteristic, MITM
         Priority: 1
         """
-        gatt_server_callback = (
-            self.per_ad.droid.gattServerCreateGattServerCallback())
-        gatt_server = self.per_ad.droid.gattServerOpenGattServer(
-            gatt_server_callback)
-        service_uuid = "3846D7A0-69C8-11E4-BA00-0002A5D5C51B"
-        test_uuid = "aa7edd5a-4d1d-4f0e-883a-d145616a1630"
-        bonded = False
-        characteristic = self.per_ad.droid.gattServerCreateBluetoothGattCharacteristic(
-            test_uuid, GattCharacteristic.PROPERTY_WRITE.value,
-            GattCharacteristic.PERMISSION_WRITE_ENCRYPTED_MITM.value)
-        gatt_service = self.per_ad.droid.gattServerCreateService(
-            service_uuid, GattService.SERVICE_TYPE_PRIMARY.value)
-        self.per_ad.droid.gattServerAddCharacteristicToService(gatt_service,
-                                                               characteristic)
-        self.per_ad.droid.gattServerAddService(gatt_server, gatt_service)
-        result = self._find_service_added_event(gatt_server_callback,
-                                                service_uuid)
-        if not result:
+        gatt_server_callback, gatt_server = self._setup_multiple_services()
+        if not gatt_server_callback or not gatt_server:
             return False
+        bonded = False
+        test_uuid = "aa7edd5a-4d1d-4f0e-883a-d145616a1630"
         bluetooth_gatt, gatt_callback, adv_callback = (
             orchestrate_gatt_connection(self.cen_ad, self.per_ad))
         self.adv_instances.append(adv_callback)