Merge "Convert wifi hal test to use VtsHalHidlTargetTestEnvBase" (3690d19e) · Commits · e / os / android_hardware_interfaces

wifi/1.0/vts/functional/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,8 @@ cc_library_static {
		srcs: [
		"wifi_hidl_call_util_selftest.cpp",
		"wifi_hidl_test.cpp",
		"wifi_hidl_test_utils.cpp"],
		"wifi_hidl_test_utils.cpp",
		],
		export_include_dirs: [
		"."
		],

+19 −4

Original line number	Diff line number	Diff line
		@@ -16,16 +16,31 @@

		#include <android-base/logging.h>

		#include <VtsHalHidlTargetTestBase.h>

		#include "wifi_hidl_test_utils.h"

		WifiHidlEnvironment* gEnv;
		class WifiVtsHidlEnvironment_1_0 : public WifiHidlEnvironment {
		public:
		// get the test environment singleton
		static WifiVtsHidlEnvironment_1_0* Instance() {
		static WifiVtsHidlEnvironment_1_0* instance =
		new WifiVtsHidlEnvironment_1_0;
		return instance;
		}

		virtual void registerTestServices() override {
		registerTestService<android::hardware::wifi::V1_0::IWifi>();
		}

		private:
		WifiVtsHidlEnvironment_1_0() {}
		};

		WifiHidlEnvironment* gEnv = WifiVtsHidlEnvironment_1_0::Instance();

		int main(int argc, char** argv) {
		gEnv = new WifiHidlEnvironment();
		::testing::AddGlobalTestEnvironment(gEnv);
		::testing::InitGoogleTest(&argc, argv);
		gEnv->init(&argc, argv);
		int status = gEnv->initFromOptions(argc, argv);
		if (status == 0) {
		status = RUN_ALL_TESTS();

+4 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,8 @@ using ::android::sp;
		using ::android::hardware::hidl_string;
		using ::android::hardware::hidl_vec;

		extern WifiHidlEnvironment* gEnv;

		namespace {
		constexpr uint32_t kHalStartRetryMaxCount = 5;
		constexpr uint32_t kHalStartRetryIntervalInMs = 2;
		@@ -86,7 +88,8 @@ bool configureChipToSupportIfaceTypeInternal(const sp<IWifiChip>& wifi_chip,
		} // namespace

		sp<IWifi> getWifi() {
		sp<IWifi> wifi = ::testing::VtsHalHidlTargetTestBase::getService<IWifi>();
		sp<IWifi> wifi = ::testing::VtsHalHidlTargetTestBase::getService<IWifi>(
		gEnv->getServiceName<IWifi>());
		return wifi;
		}

+3 −2

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

		#include <getopt.h>

		#include <VtsHalHidlTargetTestEnvBase.h>
		// Helper functions to obtain references to the various HIDL interface objects.
		// Note: We only have a single instance of each of these objects currently.
		// These helper functions should be modified to return vectors if we support
		@@ -47,9 +48,9 @@ bool configureChipToSupportIfaceType(
		// Used to trigger IWifi.stop() at the end of every test.
		void stopWifi();

		class WifiHidlEnvironment : public ::testing::Environment {
		class WifiHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
		protected:
		virtual void SetUp() override {
		virtual void HidlSetUp() override {
		stopWifi();
		sleep(5);
		}

+19 −4

Original line number	Diff line number	Diff line
		@@ -15,17 +15,32 @@
		*/

		#include <android-base/logging.h>

		#include <VtsHalHidlTargetTestBase.h>
		#include <android/hardware/wifi/1.1/IWifi.h>

		#include "wifi_hidl_test_utils.h"

		WifiHidlEnvironment* gEnv;
		class WifiHidlEnvironment_1_1 : public WifiHidlEnvironment {
		public:
		// get the test environment singleton
		static WifiHidlEnvironment_1_1* Instance() {
		static WifiHidlEnvironment_1_1* instance = new WifiHidlEnvironment_1_1;
		return instance;
		}

		virtual void registerTestServices() override {
		registerTestService<android::hardware::wifi::V1_1::IWifi>();
		}

		private:
		WifiHidlEnvironment_1_1() {}
		};

		WifiHidlEnvironment* gEnv = WifiHidlEnvironment_1_1::Instance();

		int main(int argc, char** argv) {
		gEnv = new WifiHidlEnvironment();
		::testing::AddGlobalTestEnvironment(gEnv);
		::testing::InitGoogleTest(&argc, argv);
		gEnv->init(&argc, argv);
		int status = gEnv->initFromOptions(argc, argv);
		if (status == 0) {
		int status = RUN_ALL_TESTS();