tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Convert usb hal test to use VtsHalHidlTargetTestEnvBase" am: a5123bb1b8 am: ef151c3693

Browse source 
am: 5c5382e428

Change-Id: I1723f96bd7e05320db3b89ef75d70f9051750251
This commit is contained in:
Zhuoyao Zhang 2018-02-09 20:43:01 +00:00 committed by android-build-merger
commit 3818705c2d
2 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp
View file

@ -22,6 +22,7 @@
#include <android/hardware/usb/1.0/types.h> #include <android/hardware/usb/1.0/types.h>
#include <VtsHalHidlTargetTestBase.h> #include <VtsHalHidlTargetTestBase.h>
#include <VtsHalHidlTargetTestEnvBase.h>
#include <log/log.h> #include <log/log.h>
#include <stdlib.h> #include <stdlib.h>
#include <chrono> #include <chrono>
@ -48,6 +49,18 @@ using ::android::hardware::Return;
using ::android::hardware::Void; using ::android::hardware::Void;
using ::android::sp; 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 // The main test class for the USB hidl HAL
class UsbHidlTest : public ::testing::VtsHalHidlTargetTestBase { class UsbHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public: public:
@ -96,7 +109,8 @@ class UsbHidlTest : public ::testing::VtsHalHidlTargetTestBase {
virtual void SetUp() override { virtual void SetUp() override {
ALOGI("Setup"); ALOGI("Setup");
usb = ::testing::VtsHalHidlTargetTestBase::getService<IUsb>(); usb = ::testing::VtsHalHidlTargetTestBase::getService<IUsb>(
UsbHidlEnvironment::Instance()->getServiceName<IUsb>());
ASSERT_NE(usb, nullptr); ASSERT_NE(usb, nullptr);
usb_cb_2 = new UsbCallback(*this, 2); usb_cb_2 = new UsbCallback(*this, 2);
@ -343,7 +357,9 @@ TEST_F(UsbHidlTest, switchDataRole) {
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {
::testing::AddGlobalTestEnvironment(UsbHidlEnvironment::Instance());
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
UsbHidlEnvironment::Instance()->init(&argc, argv);
int status = RUN_ALL_TESTS(); int status = RUN_ALL_TESTS();
ALOGI("Test result = %d", status); ALOGI("Test result = %d", status);
return status; return status;

18
usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp
View file

@ -24,6 +24,7 @@
#include <VtsHalHidlTargetCallbackBase.h> #include <VtsHalHidlTargetCallbackBase.h>
#include <VtsHalHidlTargetTestBase.h> #include <VtsHalHidlTargetTestBase.h>
#include <VtsHalHidlTargetTestEnvBase.h>
#include <log/log.h> #include <log/log.h>
#include <stdlib.h> #include <stdlib.h>
#include <chrono> #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 // The main test class for the USB hidl HAL
class UsbHidlTest : public ::testing::VtsHalHidlTargetTestBase { class UsbHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public: public:
virtual void SetUp() override { virtual void SetUp() override {
ALOGI(__FUNCTION__); ALOGI(__FUNCTION__);
usb = ::testing::VtsHalHidlTargetTestBase::getService<IUsb>(); usb = ::testing::VtsHalHidlTargetTestBase::getService<IUsb>(
UsbHidlEnvironment::Instance()->getServiceName<IUsb>());
ASSERT_NE(usb, nullptr); ASSERT_NE(usb, nullptr);
usb_cb_2 = new UsbCallback(2); usb_cb_2 = new UsbCallback(2);
@ -169,7 +183,9 @@ TEST_F(UsbHidlTest, queryPortStatus) {
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {
::testing::AddGlobalTestEnvironment(UsbHidlEnvironment::Instance());
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
UsbHidlEnvironment::Instance()->init(&argc, argv);
int status = RUN_ALL_TESTS(); int status = RUN_ALL_TESTS();
ALOGI("Test result = %d", status); ALOGI("Test result = %d", status);
return status; return status;