diff options
18 files changed, 71 insertions, 17 deletions
diff --git a/wifi/1.0/vts/functional/wifi_ap_iface_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_ap_iface_hidl_test.cpp index 8be8a0cb76..3599b94075 100644 --- a/wifi/1.0/vts/functional/wifi_ap_iface_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_ap_iface_hidl_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.0/vts/functional/wifi_chip_hidl_ap_test.cpp b/wifi/1.0/vts/functional/wifi_chip_hidl_ap_test.cpp index 33817d5f95..5a2c6a740e 100644 --- a/wifi/1.0/vts/functional/wifi_chip_hidl_ap_test.cpp +++ b/wifi/1.0/vts/functional/wifi_chip_hidl_ap_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.0/vts/functional/wifi_chip_hidl_nan_test.cpp b/wifi/1.0/vts/functional/wifi_chip_hidl_nan_test.cpp index 95f223d5de..c95f4d2c81 100644 --- a/wifi/1.0/vts/functional/wifi_chip_hidl_nan_test.cpp +++ b/wifi/1.0/vts/functional/wifi_chip_hidl_nan_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp index 62874ef147..f332001711 100644 --- a/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp @@ -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()); } diff --git a/wifi/1.0/vts/functional/wifi_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_hidl_test.cpp index 512701a40c..f3c82da3e9 100644 --- a/wifi/1.0/vts/functional/wifi_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_hidl_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp index 422e3f6bba..47a1938db9 100644 --- a/wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.0/vts/functional/wifi_p2p_iface_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_p2p_iface_hidl_test.cpp index 8f3327150c..fd175f5218 100644 --- a/wifi/1.0/vts/functional/wifi_p2p_iface_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_p2p_iface_hidl_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp index 6c01995307..1eb9c99149 100644 --- a/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp @@ -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()); } diff --git a/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp index 30b6fba38c..7db0526d1c 100644 --- a/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp b/wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp index 08de240252..4b94acb258 100644 --- a/wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp +++ b/wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp b/wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp index 93aa0f3ae9..b04acadef9 100644 --- a/wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp +++ b/wifi/1.2/vts/functional/wifi_chip_hidl_test.cpp @@ -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()); } diff --git a/wifi/1.2/vts/functional/wifi_nan_iface_hidl_test.cpp b/wifi/1.2/vts/functional/wifi_nan_iface_hidl_test.cpp index d5d87ce73e..6e55664d9b 100644 --- a/wifi/1.2/vts/functional/wifi_nan_iface_hidl_test.cpp +++ b/wifi/1.2/vts/functional/wifi_nan_iface_hidl_test.cpp @@ -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, diff --git a/wifi/1.2/vts/functional/wifi_sta_iface_hidl_test.cpp b/wifi/1.2/vts/functional/wifi_sta_iface_hidl_test.cpp index 1b907b272f..066dcaae87 100644 --- a/wifi/1.2/vts/functional/wifi_sta_iface_hidl_test.cpp +++ b/wifi/1.2/vts/functional/wifi_sta_iface_hidl_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.3/vts/functional/wifi_chip_hidl_test.cpp b/wifi/1.3/vts/functional/wifi_chip_hidl_test.cpp index db939679ad..e99b34a7f8 100644 --- a/wifi/1.3/vts/functional/wifi_chip_hidl_test.cpp +++ b/wifi/1.3/vts/functional/wifi_chip_hidl_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.3/vts/functional/wifi_sta_iface_hidl_test.cpp b/wifi/1.3/vts/functional/wifi_sta_iface_hidl_test.cpp index c5acc3c1b2..41d4ebbcb1 100644 --- a/wifi/1.3/vts/functional/wifi_sta_iface_hidl_test.cpp +++ b/wifi/1.3/vts/functional/wifi_sta_iface_hidl_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.4/vts/functional/wifi_ap_iface_hidl_test.cpp b/wifi/1.4/vts/functional/wifi_ap_iface_hidl_test.cpp index 017ecb6b6d..3507d3074a 100644 --- a/wifi/1.4/vts/functional/wifi_ap_iface_hidl_test.cpp +++ b/wifi/1.4/vts/functional/wifi_ap_iface_hidl_test.cpp @@ -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);
\ No newline at end of file + android::hardware::PrintInstanceNameToString); diff --git a/wifi/1.4/vts/functional/wifi_chip_hidl_test.cpp b/wifi/1.4/vts/functional/wifi_chip_hidl_test.cpp index 8ca5214fc5..7896067d3a 100644 --- a/wifi/1.4/vts/functional/wifi_chip_hidl_test.cpp +++ b/wifi/1.4/vts/functional/wifi_chip_hidl_test.cpp @@ -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()); } diff --git a/wifi/1.4/vts/functional/wifi_nan_iface_hidl_test.cpp b/wifi/1.4/vts/functional/wifi_nan_iface_hidl_test.cpp index 245e9063ea..688faf1b2a 100644 --- a/wifi/1.4/vts/functional/wifi_nan_iface_hidl_test.cpp +++ b/wifi/1.4/vts/functional/wifi_nan_iface_hidl_test.cpp @@ -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, |