commit 2062ea1d1c5a985b2110c267bb1548d9974c867d
author Jakub Pawlowski <jpawlowski@google.com> Fri Jun 02 10:41:20 2017 -0700
committer tturney <tturney@google.com> Mon Jun 12 07:45:07 2017 -0700
tree bdf8dcd9b088805ab5faa6f5f501c72c2bce2edb
parent 4079f07e5252f35b2cedcc500ddbe3c9b985f73b

Make sure OnAdvertisingSetStopped callback is called

Also fix the test

Bug: 62031687
Test: in file
Change-Id: I5d4b8b077dd8a677fd59f470cd446d92cf4aaba5

acts/tests/google/ble/bt5/AdvertisingSetTest.py

diff --git a/acts/tests/google/ble/bt5/AdvertisingSetTest.py b/acts/tests/google/ble/bt5/AdvertisingSetTest.py
index ccf2bb0..d6ac904 100644
--- a/acts/tests/google/ble/bt5/AdvertisingSetTest.py
+++ b/acts/tests/google/ble/bt5/AdvertisingSetTest.py
@@ -30,6 +30,7 @@
 from acts.test_utils.bt.BleEnum import ScanSettingsPhy
 from acts.test_utils.bt.BleEnum import ScanSettingsScanMode
 from acts.test_utils.bt.bt_test_utils import advertising_set_started
+from acts.test_utils.bt.bt_test_utils import advertising_set_stopped
 from acts.test_utils.bt.bt_test_utils import advertising_set_enabled
 from acts.test_utils.bt.bt_test_utils import advertising_set_data_set
 from acts.test_utils.bt.bt_test_utils import advertising_set_scan_response_set
@@ -101,13 +102,16 @@
         Priority: 1
         """
         adv_callback = self.adv_ad.droid.bleAdvSetGenCallback()
+        duration = 0
+        max_ext_adv_events = 0
         self.adv_ad.droid.bleAdvSetStartAdvertisingSet({
             "connectable": False,
             "legacyMode": False,
             "primaryPhy": "PHY_LE_1M",
             "secondaryPhy": "PHY_LE_1M",
             "interval": 320
-        }, self.big_adv_data, None, None, None, adv_callback)
+        }, self.big_adv_data, None, None, None, duration, max_ext_adv_events,
+                                                       adv_callback)
 
         set_started_evt = self.adv_ad.ed.pop_event(
             advertising_set_started.format(adv_callback), self.default_timeout)
@@ -117,7 +121,8 @@
 
         self.log.info("Successfully started set " + str(set_id))
 
-        self.adv_ad.droid.bleAdvSetEnableAdvertising(set_id, False, 0)
+        self.adv_ad.droid.bleAdvSetEnableAdvertising(set_id, False, duration,
+                                                     max_ext_adv_events)
         enable_evt = self.adv_ad.ed.pop_event(
             advertising_set_enabled.format(adv_callback), self.default_timeout)
         assert_equal(set_id, enable_evt['data']['setId'])
@@ -126,7 +131,9 @@
         self.log.info("Successfully disabled advertising set " + str(set_id))
 
         self.log.info("Enabling advertising for 2 seconds... ")
-        self.adv_ad.droid.bleAdvSetEnableAdvertising(set_id, True, 2000)
+        duration_200 = 200
+        self.adv_ad.droid.bleAdvSetEnableAdvertising(
+            set_id, True, duration_200, max_ext_adv_events)
         enable_evt = self.adv_ad.ed.pop_event(
             advertising_set_enabled.format(adv_callback), self.default_timeout)
         assert_equal(set_id, enable_evt['data']['setId'])
@@ -183,4 +190,11 @@
             self.log.info("Data change failed as expected.")
 
         self.adv_ad.droid.bleAdvSetStopAdvertisingSet(adv_callback)
+        try:
+            self.adv_ad.ed.pop_event(
+                advertising_set_stopped.format(adv_callback),
+                self.default_timeout)
+        except Empty:
+            self.log.error("Failed to find advertising set stopped event.")
+            return False
         return True