Merge "Convert usb hal test to use VtsHalHidlTargetTestEnvBase" (a5123bb1) · Commits · e / os / android_hardware_interfaces

usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp

+17 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include <android/hardware/usb/1.0/types.h>

		#include <VtsHalHidlTargetTestBase.h>
		#include <VtsHalHidlTargetTestEnvBase.h>
		#include <log/log.h>
		#include <stdlib.h>
		#include <chrono>
		@@ -48,6 +49,18 @@ using ::android::hardware::Return;
		using ::android::hardware::Void;
		using ::android::sp;

		// Test environment for Usb HIDL HAL.
		class UsbHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
		public:
		// get the test environment singleton
		static UsbHidlEnvironment* Instance() {
		static UsbHidlEnvironment* instance = new UsbHidlEnvironment;
		return instance;
		}

		virtual void registerTestServices() override { registerTestService<IUsb>(); }
		};

		// The main test class for the USB hidl HAL
		class UsbHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		public:
		@@ -96,7 +109,8 @@ class UsbHidlTest : public ::testing::VtsHalHidlTargetTestBase {

		virtual void SetUp() override {
		ALOGI("Setup");
		usb = ::testing::VtsHalHidlTargetTestBase::getService<IUsb>();
		usb = ::testing::VtsHalHidlTargetTestBase::getService<IUsb>(
		UsbHidlEnvironment::Instance()->getServiceName<IUsb>());
		ASSERT_NE(usb, nullptr);

		usb_cb_2 = new UsbCallback(*this, 2);
		@@ -343,7 +357,9 @@ TEST_F(UsbHidlTest, switchDataRole) {
		}

		int main(int argc, char** argv) {
		::testing::AddGlobalTestEnvironment(UsbHidlEnvironment::Instance());
		::testing::InitGoogleTest(&argc, argv);
		UsbHidlEnvironment::Instance()->init(&argc, argv);
		int status = RUN_ALL_TESTS();
		ALOGI("Test result = %d", status);
		return status;

usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp

+17 −1

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

		#include <VtsHalHidlTargetCallbackBase.h>
		#include <VtsHalHidlTargetTestBase.h>
		#include <VtsHalHidlTargetTestEnvBase.h>
		#include <log/log.h>
		#include <stdlib.h>
		#include <chrono>
		@@ -113,12 +114,25 @@ class UsbCallback : public ::testing::VtsHalHidlTargetCallbackBase<UsbClientCall
		};
		};

		// Test environment for Usb HIDL HAL.
		class UsbHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
		public:
		// get the test environment singleton
		static UsbHidlEnvironment* Instance() {
		static UsbHidlEnvironment* instance = new UsbHidlEnvironment;
		return instance;
		}

		virtual void registerTestServices() override { registerTestService<IUsb>(); }
		};

		// The main test class for the USB hidl HAL
		class UsbHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		public:
		virtual void SetUp() override {
		ALOGI(__FUNCTION__);
		usb = ::testing::VtsHalHidlTargetTestBase::getService<IUsb>();
		usb = ::testing::VtsHalHidlTargetTestBase::getService<IUsb>(
		UsbHidlEnvironment::Instance()->getServiceName<IUsb>());
		ASSERT_NE(usb, nullptr);

		usb_cb_2 = new UsbCallback(2);
		@@ -169,7 +183,9 @@ TEST_F(UsbHidlTest, queryPortStatus) {
		}

		int main(int argc, char** argv) {
		::testing::AddGlobalTestEnvironment(UsbHidlEnvironment::Instance());
		::testing::InitGoogleTest(&argc, argv);
		UsbHidlEnvironment::Instance()->init(&argc, argv);
		int status = RUN_ALL_TESTS();
		ALOGI("Test result = %d", status);
		return status;