commit b209938ba1be00636c77ac1acaab5e736fa7e9fd
author root <root@pawlowski-linux.mtv.corp.google.com> Mon Oct 31 13:37:33 2016 -0700
committer Jakub Pawlowski <jpawlowski@google.com> Mon Oct 31 13:51:44 2016 -0700
tree 9ea1ebb0801ac272790ba0d7fad12e6b292d0a4f
parent 98397944b8ed1ccfe808c9442e5258dd30e086c6

Fix AdvertiseDataParsing test

Test: run LowEnergyAdvertiserPostRegisterTest.AdvertiseDataParsing
Change-Id: Ib9f4dbc1079ae289cc5eeaee9ca7050d308a4ab0

service/test/low_energy_advertiser_unittest.cc

diff --git a/service/test/low_energy_advertiser_unittest.cc b/service/test/low_energy_advertiser_unittest.cc
index 339c8c9..4befebc 100644
--- a/service/test/low_energy_advertiser_unittest.cc
+++ b/service/test/low_energy_advertiser_unittest.cc
@@ -624,35 +624,22 @@
     callback_count++;
   };
 
-  status_cb set_params_cb;
-  EXPECT_CALL(*mock_handler_, MultiAdvSetParameters(_, _, _, _, _, _, _))
-      .WillOnce(SaveArg<6>(&set_params_cb))
-      .WillOnce(SaveArg<6>(&set_params_cb));
-
-  // Make sure no call to set data .
-  EXPECT_CALL(*mock_handler_, MultiAdvSetInstData(_, _, _, _))
-      .Times(Exactly(0));
-
-  // Multiple UUID test, should fail due to only one UUID allowed
-  EXPECT_TRUE(le_advertiser_->StartAdvertising(settings, multi_uuid_adv,
-                                               AdvertiseData(), callback));
-  set_params_cb.Run(BT_STATUS_SUCCESS);
-  EXPECT_EQ(1, callback_count);
-  EXPECT_EQ(BLE_STATUS_FAILURE, last_status);
-
-  // Make sure no call to set data .
-  EXPECT_CALL(*mock_handler_, MultiAdvSetInstData(_, _, _, _))
-      .Times(Exactly(0));
-
-  // Multiple Service Data test, should fail due to only one service data
-  // allowed
-  EXPECT_TRUE(le_advertiser_->StartAdvertising(settings, multi_uuid_adv,
-                                               AdvertiseData(), callback));
-  set_params_cb.Run(BT_STATUS_SUCCESS);
-  EXPECT_EQ(2, callback_count);
-  EXPECT_EQ(BLE_STATUS_FAILURE, last_status);
-
   status_cb set_data_cb;
+  // Multiple UUID test
+  EXPECT_CALL(*mock_handler_, MultiAdvSetInstData(_, _, _, _))
+            .Times(1)
+      .WillOnce(SaveArg<3>(&set_data_cb));
+  AdvertiseDataTestHelper(multi_uuid_adv, callback, &set_data_cb);
+  EXPECT_EQ(1, callback_count);
+  ::testing::Mock::VerifyAndClearExpectations(mock_handler_.get());
+
+  // Multiple Service Data test
+  EXPECT_CALL(*mock_handler_, MultiAdvSetInstData(_, _, _, _))
+            .Times(1)
+      .WillOnce(SaveArg<3>(&set_data_cb));
+  AdvertiseDataTestHelper(multi_service_adv, callback, &set_data_cb);
+  EXPECT_EQ(2, callback_count);
+  ::testing::Mock::VerifyAndClearExpectations(mock_handler_.get());
 
   // 16bit uuid test, should succeed with correctly parsed uuid in little-endian
   // 128-bit format.
@@ -732,16 +719,13 @@
   EXPECT_EQ(9, callback_count);
   ::testing::Mock::VerifyAndClearExpectations(mock_handler_.get());
 
-  EXPECT_CALL(*mock_handler_, MultiAdvSetParameters(_, _, _, _, _, _, _))
-      .Times(1)
-      .WillOnce(SaveArg<6>(&set_params_cb));
-
   // Service data and UUID where the UUID for dont match, should fail
-  EXPECT_TRUE(le_advertiser_->StartAdvertising(settings, service_uuid_mismatch,
-                                               AdvertiseData(), callback));
-  set_params_cb.Run(BT_STATUS_SUCCESS);
+  EXPECT_CALL(*mock_handler_, MultiAdvSetInstData(_, _, _, _))
+      .Times(1)
+      .WillOnce(SaveArg<3>(&set_data_cb));
+  AdvertiseDataTestHelper(service_uuid_match, callback, &set_data_cb);
   EXPECT_EQ(10, callback_count);
-  EXPECT_EQ(BLE_STATUS_FAILURE, last_status);
+  ::testing::Mock::VerifyAndClearExpectations(mock_handler_.get());
 }
 
 MATCHER_P(BitEq, x, std::string(negation ? "isn't" : "is") +