tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "wifi: Call terminate in VTS teardown" am: 226727ca88 am: 188a7b6bbf am: 6718df8902

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427815

Change-Id: I613fa8aac4d502bdd4247153e24a4c77a69f0896
This commit is contained in:
Treehugger Robot 2020-09-17 10:34:06 +00:00 committed by Automerger Merge Worker
commit e9089d18ef
4 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wifi/hostapd/1.0/vts/functional/hostapd_hidl_call_util.h
View file

@ -95,6 +95,14 @@ typename functionArgSaver<CallbackT>::StorageT invokeMethod(
EXPECT_TRUE(res.isOk());
return result_buffer.saved_values;
}
// Invokes |void method| on |object| without arguments.
template <typename MethodT, typename ObjectT>
void invokeVoidMethodWithoutArguments(MethodT method, ObjectT object) {
const auto& res = ((*object).*method)();
EXPECT_TRUE(res.isOk());
}
} // namespace detail
} // namespace
@ -123,3 +131,9 @@ typename functionArgSaver<CallbackT>::StorageT invokeMethod(
std::remove_reference<decltype(*strong_pointer)>::type::method##_cb>( \
&std::remove_reference<decltype(*strong_pointer)>::type::method, \
strong_pointer, ##__VA_ARGS__))
// Invokes |void method| on |strong_pointer| without arguments.
#define HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(strong_pointer, method) \
(detail::invokeVoidMethodWithoutArguments( \
&std::remove_reference<decltype(*strong_pointer)>::type::method, \
strong_pointer))

5
wifi/hostapd/1.0/vts/functional/hostapd_hidl_test.cpp
View file

@ -55,7 +55,10 @@ class HostapdHidlTest
ASSERT_NE(hostapd_.get(), nullptr);
}
virtual void TearDown() override { stopHostapd(wifi_instance_name_); }
virtual void TearDown() override {
HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(hostapd_, terminate);
stopHostapd(wifi_instance_name_);
}
protected:
std::string getPrimaryWlanIfaceName() {

5
wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp
View file

@ -58,7 +58,10 @@ class HostapdHidlTest
ASSERT_NE(hostapd_.get(), nullptr);
}
virtual void TearDown() override { stopHostapd(wifi_instance_name_); }
virtual void TearDown() override {
HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(hostapd_, terminate);
stopHostapd(wifi_instance_name_);
}
protected:
std::string getPrimaryWlanIfaceName() {

5
wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp
View file

@ -72,7 +72,10 @@ class HostapdHidlTest
"wifi_softap_wpa3_sae_supported");
}
virtual void TearDown() override { stopHostapd(wifi_instance_name_); }
virtual void TearDown() override {
HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(hostapd_, terminate);
stopHostapd(wifi_instance_name_);
}
protected:
bool isWpa3SaeSupport_ = false;