Snap for 5490587 from 2684365a73705d7582374620db80f89ae5ea3eb6 to qt-release (d2988564) · Commits · e / os / android_hardware_interfaces

vibrator/1.0/vts/functional/VtsHalVibratorV1_0TargetTest.cpp

+48 −3

Original line number	Original line	Diff line number	Diff line
	@@ -24,13 +24,16 @@
	#include <VtsHalHidlTargetTestBase.h>		#include <VtsHalHidlTargetTestBase.h>
	#include <VtsHalHidlTargetTestEnvBase.h>		#include <VtsHalHidlTargetTestEnvBase.h>

			using ::android::sp;
			using ::android::hardware::hidl_enum_range;
			using ::android::hardware::Return;
			using ::android::hardware::Void;
	using ::android::hardware::vibrator::V1_0::Effect;		using ::android::hardware::vibrator::V1_0::Effect;
	using ::android::hardware::vibrator::V1_0::EffectStrength;		using ::android::hardware::vibrator::V1_0::EffectStrength;
	using ::android::hardware::vibrator::V1_0::IVibrator;		using ::android::hardware::vibrator::V1_0::IVibrator;
	using ::android::hardware::vibrator::V1_0::Status;		using ::android::hardware::vibrator::V1_0::Status;
	using ::android::hardware::Return;
	using ::android::hardware::Void;		#define EXPECT_OK(ret) EXPECT_TRUE((ret).isOk())
	using ::android::sp;

	// Test environment for Vibrator HIDL HAL.		// Test environment for Vibrator HIDL HAL.
	class VibratorHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {		class VibratorHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
	@@ -70,6 +73,12 @@ static void validatePerformEffect(Status status, uint32_t lengthMs) {
	}		}
	}		}

			static void validatePerformEffectBadInput(Status status, uint32_t lengthMs) {
			ASSERT_EQ(Status::UNSUPPORTED_OPERATION, status);
			ASSERT_EQ(static_cast<uint32_t>(0), lengthMs)
			<< "Effects that return UNSUPPORTED_OPERATION must have a duration of zero";
			}

	TEST_F(VibratorHidlTest, OnThenOffBeforeTimeout) {		TEST_F(VibratorHidlTest, OnThenOffBeforeTimeout) {
	EXPECT_EQ(Status::OK, vibrator->on(2000));		EXPECT_EQ(Status::OK, vibrator->on(2000));
	sleep(1);		sleep(1);
	@@ -81,6 +90,42 @@ TEST_F(VibratorHidlTest, PerformEffect) {
	vibrator->perform(Effect::DOUBLE_CLICK, EffectStrength::LIGHT, validatePerformEffect);		vibrator->perform(Effect::DOUBLE_CLICK, EffectStrength::LIGHT, validatePerformEffect);
	}		}

			/*
			* Test to make sure effect values above the valid range are rejected.
			*/
			TEST_F(VibratorHidlTest, PerformEffect_BadEffects_AboveValidRange) {
			Effect effect = *std::prev(hidl_enum_range<Effect>().end());
			Effect badEffect = static_cast<Effect>(static_cast<int32_t>(effect) + 1);
			EXPECT_OK(vibrator->perform(badEffect, EffectStrength::LIGHT, validatePerformEffectBadInput));
			}

			/*
			* Test to make sure effect values below the valid range are rejected.
			*/
			TEST_F(VibratorHidlTest, PerformEffect_BadEffects_BelowValidRange) {
			Effect effect = *hidl_enum_range<Effect>().begin();
			Effect badEffect = static_cast<Effect>(static_cast<int32_t>(effect) - 1);
			EXPECT_OK(vibrator->perform(badEffect, EffectStrength::LIGHT, validatePerformEffectBadInput));
			}

			/*
			* Test to make sure strength values above the valid range are rejected.
			*/
			TEST_F(VibratorHidlTest, PerformEffect_BadStrength_AboveValidRange) {
			EffectStrength strength = *std::prev(hidl_enum_range<EffectStrength>().end());
			EffectStrength badStrength = static_cast<EffectStrength>(static_cast<int32_t>(strength) + 1);
			EXPECT_OK(vibrator->perform(Effect::CLICK, badStrength, validatePerformEffectBadInput));
			}

			/*
			* Test to make sure strength values below the valid range are rejected.
			*/
			TEST_F(VibratorHidlTest, PerformEffect_BadStrength_BelowValidRange) {
			EffectStrength strength = *hidl_enum_range<EffectStrength>().begin();
			EffectStrength badStrength = static_cast<EffectStrength>(static_cast<int32_t>(strength) - 1);
			EXPECT_OK(vibrator->perform(Effect::CLICK, badStrength, validatePerformEffectBadInput));
			}

	TEST_F(VibratorHidlTest, ChangeVibrationalAmplitude) {		TEST_F(VibratorHidlTest, ChangeVibrationalAmplitude) {
	if (vibrator->supportsAmplitudeControl()) {		if (vibrator->supportsAmplitudeControl()) {
	EXPECT_EQ(Status::OK, vibrator->setAmplitude(1));		EXPECT_EQ(Status::OK, vibrator->setAmplitude(1));

vibrator/1.1/vts/functional/VtsHalVibratorV1_1TargetTest.cpp

+50 −4

Original line number	Original line	Diff line number	Diff line
	@@ -23,14 +23,16 @@
	#include <android/hardware/vibrator/1.1/types.h>		#include <android/hardware/vibrator/1.1/types.h>
	#include <unistd.h>		#include <unistd.h>

	using ::android::hardware::vibrator::V1_0::Effect;		using ::android::sp;
			using ::android::hardware::hidl_enum_range;
			using ::android::hardware::Return;
			using ::android::hardware::Void;
	using ::android::hardware::vibrator::V1_0::EffectStrength;		using ::android::hardware::vibrator::V1_0::EffectStrength;
	using ::android::hardware::vibrator::V1_0::Status;		using ::android::hardware::vibrator::V1_0::Status;
	using ::android::hardware::vibrator::V1_1::Effect_1_1;		using ::android::hardware::vibrator::V1_1::Effect_1_1;
	using ::android::hardware::vibrator::V1_1::IVibrator;		using ::android::hardware::vibrator::V1_1::IVibrator;
	using ::android::hardware::Return;
	using ::android::hardware::Void;		#define EXPECT_OK(ret) EXPECT_TRUE((ret).isOk())
	using ::android::sp;

	// Test environment for Vibrator HIDL HAL.		// Test environment for Vibrator HIDL HAL.
	class VibratorHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {		class VibratorHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
	@@ -72,11 +74,55 @@ static void validatePerformEffect(Status status, uint32_t lengthMs) {
	}		}
	}		}

			static void validatePerformEffectBadInput(Status status, uint32_t lengthMs) {
			ASSERT_EQ(Status::UNSUPPORTED_OPERATION, status);
			ASSERT_EQ(static_cast<uint32_t>(0), lengthMs)
			<< "Effects that return UNSUPPORTED_OPERATION must have a duration of zero";
			}

	TEST_F(VibratorHidlTest_1_1, PerformEffect_1_1) {		TEST_F(VibratorHidlTest_1_1, PerformEffect_1_1) {
	vibrator->perform_1_1(Effect_1_1::CLICK, EffectStrength::MEDIUM, validatePerformEffect);		vibrator->perform_1_1(Effect_1_1::CLICK, EffectStrength::MEDIUM, validatePerformEffect);
	vibrator->perform_1_1(Effect_1_1::TICK, EffectStrength::STRONG, validatePerformEffect);		vibrator->perform_1_1(Effect_1_1::TICK, EffectStrength::STRONG, validatePerformEffect);
	}		}

			/*
			* Test to make sure effect values above the valid range are rejected.
			*/
			TEST_F(VibratorHidlTest_1_1, PerformEffect_1_1_BadEffects_AboveValidRange) {
			Effect_1_1 effect = *std::prev(hidl_enum_range<Effect_1_1>().end());
			Effect_1_1 badEffect = static_cast<Effect_1_1>(static_cast<int32_t>(effect) + 1);
			EXPECT_OK(
			vibrator->perform_1_1(badEffect, EffectStrength::LIGHT, validatePerformEffectBadInput));
			}

			/*
			* Test to make sure effect values below the valid range are rejected.
			*/
			TEST_F(VibratorHidlTest_1_1, PerformEffect_1_1_BadEffects_BelowValidRange) {
			Effect_1_1 effect = *hidl_enum_range<Effect_1_1>().begin();
			Effect_1_1 badEffect = static_cast<Effect_1_1>(static_cast<int32_t>(effect) - 1);
			EXPECT_OK(
			vibrator->perform_1_1(badEffect, EffectStrength::LIGHT, validatePerformEffectBadInput));
			}

			/*
			* Test to make sure strength values above the valid range are rejected.
			*/
			TEST_F(VibratorHidlTest_1_1, PerformEffect_1_1_BadStrength_AboveValidRange) {
			EffectStrength strength = *std::prev(hidl_enum_range<EffectStrength>().end());
			EffectStrength badStrength = static_cast<EffectStrength>(static_cast<int32_t>(strength) + 1);
			EXPECT_OK(vibrator->perform_1_1(Effect_1_1::CLICK, badStrength, validatePerformEffectBadInput));
			}

			/*
			* Test to make sure strength values below the valid range are rejected.
			*/
			TEST_F(VibratorHidlTest_1_1, PerformEffect_1_1_BadStrength_BelowValidRange) {
			EffectStrength strength = *hidl_enum_range<EffectStrength>().begin();
			EffectStrength badStrength = static_cast<EffectStrength>(static_cast<int32_t>(strength) - 1);
			EXPECT_OK(vibrator->perform_1_1(Effect_1_1::CLICK, badStrength, validatePerformEffectBadInput));
			}

	int main(int argc, char** argv) {		int main(int argc, char** argv) {
	::testing::AddGlobalTestEnvironment(VibratorHidlEnvironment::Instance());		::testing::AddGlobalTestEnvironment(VibratorHidlEnvironment::Instance());
	::testing::InitGoogleTest(&argc, argv);		::testing::InitGoogleTest(&argc, argv);

wifi/hostapd/1.0/vts/functional/hostapd_hidl_test.cpp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,7 @@ constexpr int kIfaceInvalidChannel = 567;
	class HostapdHidlTest : public ::testing::VtsHalHidlTargetTestBase {		class HostapdHidlTest : public ::testing::VtsHalHidlTargetTestBase {
	public:		public:
	virtual void SetUp() override {		virtual void SetUp() override {
			stopSupplicantIfNeeded();
	startHostapdAndWaitForHidlService();		startHostapdAndWaitForHidlService();
	hostapd_ = getHostapd();		hostapd_ = getHostapd();
	ASSERT_NE(hostapd_.get(), nullptr);		ASSERT_NE(hostapd_.get(), nullptr);

wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp

+16 −4

Original line number	Original line	Diff line number	Diff line
	@@ -23,24 +23,26 @@

	#include <wifi_system/hostapd_manager.h>		#include <wifi_system/hostapd_manager.h>
	#include <wifi_system/interface_tool.h>		#include <wifi_system/interface_tool.h>
			#include <wifi_system/supplicant_manager.h>

	#include "hostapd_hidl_test_utils.h"		#include "hostapd_hidl_test_utils.h"
	#include "wifi_hidl_test_utils.h"		#include "wifi_hidl_test_utils.h"

	using ::android::sp;		using ::android::sp;
	using ::android::hardware::configureRpcThreadpool;		using ::android::hardware::configureRpcThreadpool;
	using ::android::hardware::joinRpcThreadpool;
	using ::android::hardware::hidl_string;		using ::android::hardware::hidl_string;
	using ::android::hardware::hidl_vec;		using ::android::hardware::hidl_vec;
			using ::android::hardware::joinRpcThreadpool;
	using ::android::hardware::Return;		using ::android::hardware::Return;
	using ::android::hardware::Void;		using ::android::hardware::Void;
	using ::android::hardware::wifi::V1_0::ChipModeId;
	using ::android::hardware::wifi::V1_0::IWifiChip;
	using ::android::hardware::wifi::hostapd::V1_0::IHostapd;
	using ::android::hardware::wifi::hostapd::V1_0::HostapdStatus;		using ::android::hardware::wifi::hostapd::V1_0::HostapdStatus;
	using ::android::hardware::wifi::hostapd::V1_0::HostapdStatusCode;		using ::android::hardware::wifi::hostapd::V1_0::HostapdStatusCode;
			using ::android::hardware::wifi::hostapd::V1_0::IHostapd;
			using ::android::hardware::wifi::V1_0::ChipModeId;
			using ::android::hardware::wifi::V1_0::IWifiChip;
	using ::android::hidl::manager::V1_0::IServiceNotification;		using ::android::hidl::manager::V1_0::IServiceNotification;
	using ::android::wifi_system::HostapdManager;		using ::android::wifi_system::HostapdManager;
			using ::android::wifi_system::SupplicantManager;

	extern WifiHostapdHidlEnvironment* gEnv;		extern WifiHostapdHidlEnvironment* gEnv;

	@@ -108,6 +110,16 @@ class ServiceNotificationListener : public IServiceNotification {
	std::condition_variable condition_;		std::condition_variable condition_;
	};		};

			void stopSupplicantIfNeeded() {
			SupplicantManager supplicant_manager;
			if (supplicant_manager.IsSupplicantRunning()) {
			LOG(INFO) << "Supplicant is running, stop supplicant first.";
			ASSERT_TRUE(supplicant_manager.StopSupplicant());
			deInitilializeDriverAndFirmware();
			ASSERT_FALSE(supplicant_manager.IsSupplicantRunning());
			}
			}

	void stopHostapd() {		void stopHostapd() {
	HostapdManager hostapd_manager;		HostapdManager hostapd_manager;

wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@
	// Used to stop the android wifi framework before every test.		// Used to stop the android wifi framework before every test.
	void stopWifiFramework();		void stopWifiFramework();
	void startWifiFramework();		void startWifiFramework();
			void stopSupplicantIfNeeded();
	void stopHostapd();		void stopHostapd();
	// Used to configure the chip, driver and start wpa_hostapd before every		// Used to configure the chip, driver and start wpa_hostapd before every
	// test.		// test.