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

wifi(vts): Precondition AP tests on existence of hostapd HAL

Browse Source 
cp: aosp/1428863 to sc-v2-dev branch as b/202788915 mentioned

This used to be present on the old host side VTS tests, port the feature to
target side since host side VTS tests are deprecated.

Also,
i) Added a separate test: VtsHalWifiV1_4TargetTest to test the wifi
chip methods. Putting them in VtsHalWifiApV1_4TargetTest will prevent
these from running on devices without AP feature.
ii) Ensured all the non-NAN, non-RTT tests disable framework for
testing. NAN/RTT tests uses framework to check if the corresponding
package manager feature exists.

Bug: 166529516
Bug: 202788915
Test: atest \
VtsHalWifiApV1_0TargetTest \
VtsHalWifiApV1_4TargetTest \
VtsHalWifiV1_0TargetTest \
VtsHalWifiV1_4TargetTest

Change-Id: I05aab6992277601633a0f926a8262c4c27402e93
Merged-In: I05aab6992277601633a0f926a8262c4c27402e93
This commit is contained in:
Roshan Pius
2020-09-16 13:51:11 -07:00
committed by Les Lee
parent 146739937f
commit 82b41e6af9
6 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/1.0/vts/functional/Android.bp
View File

@@ -107,8 +107,10 @@ cc_test {
static_libs: [
"VtsHalWifiV1_0TargetTestUtil",
"android.hardware.wifi@1.0",
"android.hardware.wifi.hostapd@1.0",
"libwifi-system-iface",
],
disable_framework: true,
test_suites: [
"general-tests",
"vts",

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

@@ -15,9 +15,9 @@
*/
#include <android-base/logging.h>
#include <android/hardware/wifi/1.0/IWifi.h>
#include <android/hardware/wifi/1.0/IWifiApIface.h>
#include <android/hardware/wifi/hostapd/1.0/IHostapd.h>
#include <gtest/gtest.h>
#include <hidl/GtestPrinter.h>
#include <hidl/ServiceManagement.h>
@@ -26,6 +26,7 @@
#include "wifi_hidl_test_utils.h"
using ::android::sp;
using ::android::hardware::wifi::hostapd::V1_0::IHostapd;
using ::android::hardware::wifi::V1_0::IfaceType;
using ::android::hardware::wifi::V1_0::IWifi;
using ::android::hardware::wifi::V1_0::IWifiApIface;
@@ -38,6 +39,10 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode;
class WifiApIfaceHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
if (android::hardware::getAllHalInstanceNames(IHostapd::descriptor)
.empty()) {
GTEST_SKIP() << "Device does not support AP";
}
// Make sure test starts with a clean state
stopWifi(GetInstanceName());

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

@@ -15,9 +15,9 @@
*/
#include <android-base/logging.h>
#include <android/hardware/wifi/1.0/IWifi.h>
#include <android/hardware/wifi/1.0/IWifiChip.h>
#include <android/hardware/wifi/hostapd/1.0/IHostapd.h>
#include <gtest/gtest.h>
#include <hidl/GtestPrinter.h>
#include <hidl/ServiceManagement.h>
@@ -26,6 +26,7 @@
#include "wifi_hidl_test_utils.h"
using ::android::sp;
using ::android::hardware::wifi::hostapd::V1_0::IHostapd;
using ::android::hardware::wifi::V1_0::ChipModeId;
using ::android::hardware::wifi::V1_0::IfaceType;
using ::android::hardware::wifi::V1_0::IWifi;
@@ -41,6 +42,10 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode;
class WifiChipHidlApTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
if (android::hardware::getAllHalInstanceNames(IHostapd::descriptor)
.empty()) {
GTEST_SKIP() << "Device does not support AP";
}
// Make sure test starts with a clean state
stopWifi(GetInstanceName());

1
wifi/1.1/vts/functional/Android.bp
View File

@@ -39,6 +39,7 @@ cc_test {
"android.hardware.wifi@1.5",
"libwifi-system-iface",
],
disable_framework: true,
test_suites: [
"general-tests",
"vts",

28
wifi/1.4/vts/functional/Android.bp
View File

@@ -14,7 +14,6 @@
// limitations under the License.
//
// SoftAP-specific tests, similar to VtsHalWifiApV1_0TargetTest.
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
@@ -25,10 +24,9 @@ package {
}
cc_test {
name: "VtsHalWifiApV1_4TargetTest",
name: "VtsHalWifiV1_4TargetTest",
defaults: ["VtsHalTargetTestDefaults"],
srcs: [
"wifi_ap_iface_hidl_test.cpp",
"wifi_chip_hidl_test.cpp",
],
static_libs: [
@@ -46,6 +44,30 @@ cc_test {
],
}
// SoftAP-specific tests, similar to VtsHalWifiApV1_0TargetTest.
cc_test {
name: "VtsHalWifiApV1_4TargetTest",
defaults: ["VtsHalTargetTestDefaults"],
srcs: [
"wifi_ap_iface_hidl_test.cpp",
],
static_libs: [
"VtsHalWifiV1_0TargetTestUtil",
"android.hardware.wifi@1.0",
"android.hardware.wifi@1.1",
"android.hardware.wifi@1.2",
"android.hardware.wifi@1.3",
"android.hardware.wifi@1.4",
"android.hardware.wifi.hostapd@1.0",
"libwifi-system-iface",
],
disable_framework: true,
test_suites: [
"general-tests",
"vts",
],
}
// These tests are split out so that they can be conditioned on presence of the
// "android.hardware.wifi.aware" feature.
cc_test {

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

@@ -16,6 +16,7 @@
#include <android/hardware/wifi/1.4/IWifi.h>
#include <android/hardware/wifi/1.4/IWifiApIface.h>
#include <android/hardware/wifi/hostapd/1.0/IHostapd.h>
#include <gtest/gtest.h>
#include <hidl/GtestPrinter.h>
#include <hidl/ServiceManagement.h>
@@ -25,6 +26,7 @@
using ::android::sp;
using ::android::hardware::hidl_array;
using ::android::hardware::wifi::hostapd::V1_0::IHostapd;
using ::android::hardware::wifi::V1_0::WifiStatus;
using ::android::hardware::wifi::V1_0::WifiStatusCode;
using ::android::hardware::wifi::V1_4::IWifi;
@@ -36,6 +38,10 @@ using ::android::hardware::wifi::V1_4::IWifiApIface;
class WifiApIfaceHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
if (android::hardware::getAllHalInstanceNames(IHostapd::descriptor)
.empty()) {
GTEST_SKIP() << "Device does not support AP";
}
// Make sure to start with a clean state
stopWifi(GetInstanceName());