Merge "wifi(vts): Precondition AP tests on existence of hostapd HAL" into android11-tests-dev (0cd6bffb) · Commits · e / os / android_hardware_interfaces

wifi/1.0/vts/functional/Android.bp

+2 −0

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

wifi/1.0/vts/functional/wifi_ap_iface_hidl_test.cpp

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@

	#include <android/hardware/wifi/1.0/IWifi.h>		#include <android/hardware/wifi/1.0/IWifi.h>
	#include <android/hardware/wifi/1.0/IWifiApIface.h>		#include <android/hardware/wifi/1.0/IWifiApIface.h>
			#include <android/hardware/wifi/hostapd/1.0/IHostapd.h>
	#include <gtest/gtest.h>		#include <gtest/gtest.h>
	#include <hidl/GtestPrinter.h>		#include <hidl/GtestPrinter.h>
	#include <hidl/ServiceManagement.h>		#include <hidl/ServiceManagement.h>
	@@ -26,6 +27,7 @@
	#include "wifi_hidl_test_utils.h"		#include "wifi_hidl_test_utils.h"

	using ::android::sp;		using ::android::sp;
			using ::android::hardware::wifi::hostapd::V1_0::IHostapd;
	using ::android::hardware::wifi::V1_0::IfaceType;		using ::android::hardware::wifi::V1_0::IfaceType;
	using ::android::hardware::wifi::V1_0::IWifi;		using ::android::hardware::wifi::V1_0::IWifi;
	using ::android::hardware::wifi::V1_0::IWifiApIface;		using ::android::hardware::wifi::V1_0::IWifiApIface;
	@@ -38,6 +40,10 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode;
	class WifiApIfaceHidlTest : public ::testing::TestWithParam<std::string> {		class WifiApIfaceHidlTest : public ::testing::TestWithParam<std::string> {
	public:		public:
	virtual void SetUp() override {		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		// Make sure test starts with a clean state
	stopWifi(GetInstanceName());		stopWifi(GetInstanceName());

wifi/1.0/vts/functional/wifi_chip_hidl_ap_test.cpp

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@

	#include <android/hardware/wifi/1.0/IWifi.h>		#include <android/hardware/wifi/1.0/IWifi.h>
	#include <android/hardware/wifi/1.0/IWifiChip.h>		#include <android/hardware/wifi/1.0/IWifiChip.h>
			#include <android/hardware/wifi/hostapd/1.0/IHostapd.h>
	#include <gtest/gtest.h>		#include <gtest/gtest.h>
	#include <hidl/GtestPrinter.h>		#include <hidl/GtestPrinter.h>
	#include <hidl/ServiceManagement.h>		#include <hidl/ServiceManagement.h>
	@@ -26,6 +27,7 @@
	#include "wifi_hidl_test_utils.h"		#include "wifi_hidl_test_utils.h"

	using ::android::sp;		using ::android::sp;
			using ::android::hardware::wifi::hostapd::V1_0::IHostapd;
	using ::android::hardware::wifi::V1_0::ChipModeId;		using ::android::hardware::wifi::V1_0::ChipModeId;
	using ::android::hardware::wifi::V1_0::IfaceType;		using ::android::hardware::wifi::V1_0::IfaceType;
	using ::android::hardware::wifi::V1_0::IWifi;		using ::android::hardware::wifi::V1_0::IWifi;
	@@ -41,6 +43,10 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode;
	class WifiChipHidlApTest : public ::testing::TestWithParam<std::string> {		class WifiChipHidlApTest : public ::testing::TestWithParam<std::string> {
	public:		public:
	virtual void SetUp() override {		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		// Make sure test starts with a clean state
	stopWifi(GetInstanceName());		stopWifi(GetInstanceName());

wifi/1.1/vts/functional/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ cc_test {
	"android.hardware.wifi@1.3",		"android.hardware.wifi@1.3",
	"libwifi-system-iface",		"libwifi-system-iface",
	],		],
			disable_framework: true,
	test_suites: [		test_suites: [
	"general-tests",		"general-tests",
	"vts",		"vts",

wifi/1.4/vts/functional/Android.bp

+23 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,13 +14,33 @@
	// limitations under the License.		// limitations under the License.
	//		//

			cc_test {
			name: "VtsHalWifiV1_4TargetTest",
			defaults: ["VtsHalTargetTestDefaults"],
			srcs: [
			"wifi_chip_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",
			"libwifi-system-iface",
			],
			test_suites: [
			"general-tests",
			"vts",
			],
			}

	// SoftAP-specific tests, similar to VtsHalWifiApV1_0TargetTest.		// SoftAP-specific tests, similar to VtsHalWifiApV1_0TargetTest.
	cc_test {		cc_test {
	name: "VtsHalWifiApV1_4TargetTest",		name: "VtsHalWifiApV1_4TargetTest",
	defaults: ["VtsHalTargetTestDefaults"],		defaults: ["VtsHalTargetTestDefaults"],
	srcs: [		srcs: [
	"wifi_ap_iface_hidl_test.cpp",		"wifi_ap_iface_hidl_test.cpp",
	"wifi_chip_hidl_test.cpp",
	],		],
	static_libs: [		static_libs: [
	"VtsHalWifiV1_0TargetTestUtil",		"VtsHalWifiV1_0TargetTestUtil",
	@@ -29,8 +49,10 @@ cc_test {
	"android.hardware.wifi@1.2",		"android.hardware.wifi@1.2",
	"android.hardware.wifi@1.3",		"android.hardware.wifi@1.3",
	"android.hardware.wifi@1.4",		"android.hardware.wifi@1.4",
			"android.hardware.wifi.hostapd@1.0",
	"libwifi-system-iface",		"libwifi-system-iface",
	],		],
			disable_framework: true,
	test_suites: [		test_suites: [
	"general-tests",		"general-tests",
	"vts",		"vts",