Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Wifi: Make sure that VTS tests start with a clean state"

Browse Source
This commit is contained in:
Ahmed ElArabawy
2020-01-08 16:23:31 +00:00
committed by Android (Google) Code Review
parent 828f15ebfc dcfab61c9b
commit f08d1e41ee
18 changed files with 71 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wifi/1.0/vts/functional/wifi_ap_iface_hidl_test.cpp
View File

@@ -38,6 +38,9 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode;
class WifiApIfaceHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure test starts with a clean state
stopWifi(GetInstanceName());
wifi_ap_iface_ = getWifiApIface(GetInstanceName());
ASSERT_NE(nullptr, wifi_ap_iface_.get());
}
@@ -95,4 +98,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiApIfaceHidlTest,
testing::ValuesIn(
android::hardware::getAllHalInstanceNames(IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

5
wifi/1.0/vts/functional/wifi_chip_hidl_ap_test.cpp
View File

@@ -41,6 +41,9 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode;
class WifiChipHidlApTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure test starts with a clean state
stopWifi(GetInstanceName());
wifi_chip_ = getWifiChip(GetInstanceName());
ASSERT_NE(nullptr, wifi_chip_.get());
}
@@ -177,4 +180,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiChipHidlApTest,
testing::ValuesIn(
android::hardware::getAllHalInstanceNames(IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

5
wifi/1.0/vts/functional/wifi_chip_hidl_nan_test.cpp
View File

@@ -41,6 +41,9 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode;
class WifiChipHidlNanTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure test starts with a clean state
stopWifi(GetInstanceName());
wifi_chip_ = getWifiChip(GetInstanceName());
ASSERT_NE(nullptr, wifi_chip_.get());
}
@@ -178,4 +181,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiChipHidlNanTest,
testing::ValuesIn(
android::hardware::getAllHalInstanceNames(IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

3
wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp
View File

@@ -73,6 +73,9 @@ bool hasAnyRingBufferCapabilities(uint32_t caps) {
class WifiChipHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure test starts with a clean state
stopWifi(GetInstanceName());
wifi_chip_ = getWifiChip(GetInstanceName());
ASSERT_NE(nullptr, wifi_chip_.get());
}

7
wifi/1.0/vts/functional/wifi_hidl_test.cpp
View File

@@ -32,7 +32,10 @@ using ::android::sp;
*/
class WifiHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {}
virtual void SetUp() override {
// Make sure test starts with a clean state
stopWifi(GetInstanceName());
}
virtual void TearDown() override { stopWifi(GetInstanceName()); }
@@ -53,4 +56,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiHidlTest,
testing::ValuesIn(
android::hardware::getAllHalInstanceNames(IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

5
wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp
View File

@@ -44,6 +44,9 @@ using ::android::hardware::wifi::V1_0::IWifi;
class WifiNanIfaceHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure test starts with a clean state
stopWifi(GetInstanceName());
iwifiNanIface = getWifiNanIface(GetInstanceName());
ASSERT_NE(nullptr, iwifiNanIface.get());
ASSERT_EQ(WifiStatusCode::SUCCESS,
@@ -506,4 +509,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiNanIfaceHidlTest,
testing::ValuesIn(
android::hardware::getAllHalInstanceNames(IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

7
wifi/1.0/vts/functional/wifi_p2p_iface_hidl_test.cpp
View File

@@ -33,7 +33,10 @@ using ::android::hardware::wifi::V1_0::IWifiP2pIface;
*/
class WifiP2pIfaceHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {}
virtual void SetUp() override {
// Make sure test starts with a clean state
stopWifi(GetInstanceName());
}
virtual void TearDown() override { stopWifi(GetInstanceName()); }
@@ -55,4 +58,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiP2pIfaceHidlTest,
testing::ValuesIn(
android::hardware::getAllHalInstanceNames(IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

5
wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp
View File

@@ -37,7 +37,10 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode;
*/
class WifiRttControllerHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {}
virtual void SetUp() override {
// Make sure test starts with a clean state
stopWifi(GetInstanceName());
}
virtual void TearDown() override { stopWifi(GetInstanceName()); }

5
wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp
View File

@@ -47,6 +47,9 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode;
class WifiStaIfaceHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure test starts with a clean state
stopWifi(GetInstanceName());
wifi_sta_iface_ = getWifiStaIface(GetInstanceName());
ASSERT_NE(nullptr, wifi_sta_iface_.get());
}
@@ -299,4 +302,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiStaIfaceHidlTest,
testing::ValuesIn(
android::hardware::getAllHalInstanceNames(IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

5
wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp
View File

@@ -49,6 +49,9 @@ constexpr IWifiChip::TxPowerScenario kFakePowerScenario =
class WifiChipHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure to start with a clean state
stopWifi(GetInstanceName());
wifi_chip_ = IWifiChip::castFrom(getWifiChip(GetInstanceName()));
ASSERT_NE(nullptr, wifi_chip_.get());
}
@@ -115,4 +118,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiChipHidlTest,
testing::ValuesIn(
android::hardware::getAllHalInstanceNames(IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

7
wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp
View File

@@ -55,8 +55,11 @@ constexpr IWifiChip::TxPowerScenario kPowerScenarioVoiceCall =
class WifiChipHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
wifi_chip_ = IWifiChip::castFrom(getWifiChip(GetInstanceName()));
ASSERT_NE(nullptr, wifi_chip_.get());
// Make sure test starts with a clean state
stopWifi(GetInstanceName());
wifi_chip_ = IWifiChip::castFrom(getWifiChip(GetInstanceName()));
ASSERT_NE(nullptr, wifi_chip_.get());
}
virtual void TearDown() override { stopWifi(GetInstanceName()); }

3
wifi/1.2/vts/functional/wifi_nan_iface_hidl_test.cpp
View File

@@ -50,6 +50,9 @@ android::sp<android::hardware::wifi::V1_2::IWifiNanIface> getWifiNanIface_1_2(
class WifiNanIfaceHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure to start with a clean state
stopWifi(GetInstanceName());
iwifiNanIface = getWifiNanIface_1_2(GetInstanceName());
ASSERT_NE(nullptr, iwifiNanIface.get());
ASSERT_EQ(WifiStatusCode::SUCCESS,

5
wifi/1.2/vts/functional/wifi_sta_iface_hidl_test.cpp
View File

@@ -39,6 +39,9 @@ using ::android::hardware::wifi::V1_2::IWifiStaIface;
class WifiStaIfaceHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure to start with a clean state
stopWifi(GetInstanceName());
wifi_sta_iface_ =
IWifiStaIface::castFrom(getWifiStaIface(GetInstanceName()));
ASSERT_NE(nullptr, wifi_sta_iface_.get());
@@ -118,4 +121,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiStaIfaceHidlTest,
testing::ValuesIn(android::hardware::getAllHalInstanceNames(
::android::hardware::wifi::V1_2::IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

5
wifi/1.3/vts/functional/wifi_chip_hidl_test.cpp
View File

@@ -44,6 +44,9 @@ constexpr IWifiChip::LatencyMode kLatencyModeLow = IWifiChip::LatencyMode::LOW;
class WifiChipHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure to start with a clean state
stopWifi(GetInstanceName());
wifi_chip_ = IWifiChip::castFrom(getWifiChip(GetInstanceName()));
ASSERT_NE(nullptr, wifi_chip_.get());
}
@@ -126,4 +129,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiChipHidlTest,
testing::ValuesIn(android::hardware::getAllHalInstanceNames(
::android::hardware::wifi::V1_3::IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

5
wifi/1.3/vts/functional/wifi_sta_iface_hidl_test.cpp
View File

@@ -40,6 +40,9 @@ using ::android::hardware::wifi::V1_3::IWifiStaIface;
class WifiStaIfaceHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure to start with a clean state
stopWifi(GetInstanceName());
wifi_sta_iface_ =
IWifiStaIface::castFrom(getWifiStaIface(GetInstanceName()));
ASSERT_NE(nullptr, wifi_sta_iface_.get());
@@ -105,4 +108,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiStaIfaceHidlTest,
testing::ValuesIn(android::hardware::getAllHalInstanceNames(
::android::hardware::wifi::V1_3::IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

5
wifi/1.4/vts/functional/wifi_ap_iface_hidl_test.cpp
View File

@@ -38,6 +38,9 @@ extern WifiHidlEnvironment* gEnv;
class WifiApIfaceHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure to start with a clean state
stopWifi(GetInstanceName());
wifi_ap_iface_ =
IWifiApIface::castFrom(getWifiApIface(GetInstanceName()));
ASSERT_NE(nullptr, wifi_ap_iface_.get());
@@ -80,4 +83,4 @@ INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiApIfaceHidlTest,
testing::ValuesIn(
android::hardware::getAllHalInstanceNames(IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);

3
wifi/1.4/vts/functional/wifi_chip_hidl_test.cpp
View File

@@ -47,6 +47,9 @@ using ::android::hardware::wifi::V1_4::IWifiChipEventCallback;
class WifiChipHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure to start with a clean state
stopWifi(GetInstanceName());
wifi_chip_ = IWifiChip::castFrom(getWifiChip(GetInstanceName()));
ASSERT_NE(nullptr, wifi_chip_.get());
}

3
wifi/1.4/vts/functional/wifi_nan_iface_hidl_test.cpp
View File

@@ -51,6 +51,9 @@ android::sp<android::hardware::wifi::V1_4::IWifiNanIface> getWifiNanIface_1_4(
class WifiNanIfaceHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
// Make sure to start with a clean state
stopWifi(GetInstanceName());
iwifiNanIface = getWifiNanIface_1_4(GetInstanceName());
ASSERT_NE(nullptr, iwifiNanIface.get());
ASSERT_EQ(WifiStatusCode::SUCCESS,