diff options
author | Zhuoyao Zhang <zhuoyao@google.com> | 2018-02-08 21:05:31 -0800 |
---|---|---|
committer | Zhuoyao Zhang <zhuoyao@google.com> | 2018-02-12 17:17:18 -0800 |
commit | 32cbe3edb935ab67739ed1c7aa1e1065afa50569 (patch) | |
tree | 1db1f3fdc85ebeb13983b3538e2ae96bdb4a1673 /soundtrigger | |
parent | 9cdd6f951608e680a3bccbf986c602b3c8b56bbd (diff) | |
download | android_hardware_interfaces-32cbe3edb935ab67739ed1c7aa1e1065afa50569.tar.gz android_hardware_interfaces-32cbe3edb935ab67739ed1c7aa1e1065afa50569.tar.bz2 android_hardware_interfaces-32cbe3edb935ab67739ed1c7aa1e1065afa50569.zip |
Convert soundtrigger hal test to use VtsHalHidlTargetTestEnvBase
Bug: 64203181
Test: make vts
vts-tradefed run vts -m VtsHalSoundtriggerV2_0Target
vts-tradefed run vts -m VtsHalSoundtriggerV2_1Target
Change-Id: I747d674e4c0016cd8a1c373c8d7f744a022a98d8
Diffstat (limited to 'soundtrigger')
-rw-r--r-- | soundtrigger/2.0/vts/functional/VtsHalSoundtriggerV2_0TargetTest.cpp | 41 | ||||
-rw-r--r-- | soundtrigger/2.1/vts/functional/VtsHalSoundtriggerV2_1TargetTest.cpp | 28 |
2 files changed, 51 insertions, 18 deletions
diff --git a/soundtrigger/2.0/vts/functional/VtsHalSoundtriggerV2_0TargetTest.cpp b/soundtrigger/2.0/vts/functional/VtsHalSoundtriggerV2_0TargetTest.cpp index 97956c54b..59ac13e0e 100644 --- a/soundtrigger/2.0/vts/functional/VtsHalSoundtriggerV2_0TargetTest.cpp +++ b/soundtrigger/2.0/vts/functional/VtsHalSoundtriggerV2_0TargetTest.cpp @@ -30,6 +30,7 @@ #include <android/hardware/soundtrigger/2.0/types.h> #include <VtsHalHidlTargetTestBase.h> +#include <VtsHalHidlTargetTestEnvBase.h> #define SHORT_TIMEOUT_PERIOD (1) @@ -85,12 +86,27 @@ class Monitor { int mCount; }; +// Test environment for SoundTrigger HIDL HAL. +class SoundTriggerHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase { + public: + // get the test environment singleton + static SoundTriggerHidlEnvironment* Instance() { + static SoundTriggerHidlEnvironment* instance = new SoundTriggerHidlEnvironment; + return instance; + } + + virtual void registerTestServices() override { registerTestService<ISoundTriggerHw>(); } + + private: + SoundTriggerHidlEnvironment() {} +}; + // The main test class for Sound Trigger HIDL HAL. class SoundTriggerHidlTest : public ::testing::VtsHalHidlTargetTestBase { public: virtual void SetUp() override { - mSoundTriggerHal = - ::testing::VtsHalHidlTargetTestBase::getService<ISoundTriggerHw>(); + mSoundTriggerHal = ::testing::VtsHalHidlTargetTestBase::getService<ISoundTriggerHw>( + SoundTriggerHidlEnvironment::Instance()->getServiceName<ISoundTriggerHw>()); ASSERT_NE(nullptr, mSoundTriggerHal.get()); mCallback = new SoundTriggerHwCallback(*this); ASSERT_NE(nullptr, mCallback.get()); @@ -142,15 +158,6 @@ class SoundTriggerHidlTest : public ::testing::VtsHalHidlTargetTestBase { sp<SoundTriggerHwCallback> mCallback; }; -// A class for test environment setup (kept since this file is a template). -class SoundTriggerHidlEnvironment : public ::testing::Environment { - public: - virtual void SetUp() {} - virtual void TearDown() {} - - private: -}; - /** * Test ISoundTriggerHw::getProperties() method * @@ -318,11 +325,11 @@ TEST_F(SoundTriggerHidlTest, stopAllRecognitions) { EXPECT_TRUE(hidlReturn == 0 || hidlReturn == -ENOSYS); } - int main(int argc, char** argv) { - ::testing::AddGlobalTestEnvironment(new SoundTriggerHidlEnvironment); - ::testing::InitGoogleTest(&argc, argv); - int status = RUN_ALL_TESTS(); - ALOGI("Test result = %d", status); - return status; + ::testing::AddGlobalTestEnvironment(SoundTriggerHidlEnvironment::Instance()); + ::testing::InitGoogleTest(&argc, argv); + SoundTriggerHidlEnvironment::Instance()->init(&argc, argv); + int status = RUN_ALL_TESTS(); + ALOGI("Test result = %d", status); + return status; } diff --git a/soundtrigger/2.1/vts/functional/VtsHalSoundtriggerV2_1TargetTest.cpp b/soundtrigger/2.1/vts/functional/VtsHalSoundtriggerV2_1TargetTest.cpp index fdd5f0db4..0a2eeacad 100644 --- a/soundtrigger/2.1/vts/functional/VtsHalSoundtriggerV2_1TargetTest.cpp +++ b/soundtrigger/2.1/vts/functional/VtsHalSoundtriggerV2_1TargetTest.cpp @@ -33,6 +33,7 @@ #include <hidlmemory/mapping.h> #include <VtsHalHidlTargetTestBase.h> +#include <VtsHalHidlTargetTestEnvBase.h> #define SHORT_TIMEOUT_PERIOD (1) @@ -93,11 +94,27 @@ class Monitor { int mCount; }; +// Test environment for SoundTrigger HIDL HAL. +class SoundTriggerHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase { + public: + // get the test environment singleton + static SoundTriggerHidlEnvironment* Instance() { + static SoundTriggerHidlEnvironment* instance = new SoundTriggerHidlEnvironment; + return instance; + } + + virtual void registerTestServices() override { registerTestService<ISoundTriggerHw>(); } + + private: + SoundTriggerHidlEnvironment() {} +}; + // The main test class for Sound Trigger HIDL HAL. class SoundTriggerHidlTest : public ::testing::VtsHalHidlTargetTestBase { public: virtual void SetUp() override { - mSoundTriggerHal = ::testing::VtsHalHidlTargetTestBase::getService<ISoundTriggerHw>(); + mSoundTriggerHal = ::testing::VtsHalHidlTargetTestBase::getService<ISoundTriggerHw>( + SoundTriggerHidlEnvironment::Instance()->getServiceName<ISoundTriggerHw>()); ASSERT_NE(nullptr, mSoundTriggerHal.get()); mCallback = new SoundTriggerHwCallback(*this); ASSERT_NE(nullptr, mCallback.get()); @@ -480,3 +497,12 @@ TEST_F(SoundTriggerHidlTest, stopAllRecognitions) { EXPECT_TRUE(hidlReturn.isOk()); EXPECT_TRUE(hidlReturn == 0 || hidlReturn == -ENOSYS); } + +int main(int argc, char** argv) { + ::testing::AddGlobalTestEnvironment(SoundTriggerHidlEnvironment::Instance()); + ::testing::InitGoogleTest(&argc, argv); + SoundTriggerHidlEnvironment::Instance()->init(&argc, argv); + int status = RUN_ALL_TESTS(); + ALOGI("Test result = %d", status); + return status; +} |