diff options
author | Zhuoyao Zhang <zhuoyao@google.com> | 2018-02-10 19:34:53 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-02-10 19:34:53 +0000 |
commit | f28f18c0e7f48d1e32daaab4fdf7c8ec5c34d1f5 (patch) | |
tree | e29334aa4c5c6a1057067d4eae90a2e7efbfeb3b /configstore | |
parent | 92a1fbfe6e6cbab49e07a9454e78744cc554dd44 (diff) | |
parent | 8857a90053e9f9d6a7479c2e47a8e1bd62e647ab (diff) | |
download | android_hardware_interfaces-f28f18c0e7f48d1e32daaab4fdf7c8ec5c34d1f5.tar.gz android_hardware_interfaces-f28f18c0e7f48d1e32daaab4fdf7c8ec5c34d1f5.tar.bz2 android_hardware_interfaces-f28f18c0e7f48d1e32daaab4fdf7c8ec5c34d1f5.zip |
Merge "Convert configstore hal test to use VtsHalHidlTargetTestEnvBase" am: 42749f8863
am: 8857a90053
Change-Id: Ifa94c66094f72913b13d0d29647f281d53ac9fd1
Diffstat (limited to 'configstore')
-rw-r--r-- | configstore/1.0/vts/functional/VtsHalConfigstoreV1_0TargetTest.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/configstore/1.0/vts/functional/VtsHalConfigstoreV1_0TargetTest.cpp b/configstore/1.0/vts/functional/VtsHalConfigstoreV1_0TargetTest.cpp index e50158093..a1676be2b 100644 --- a/configstore/1.0/vts/functional/VtsHalConfigstoreV1_0TargetTest.cpp +++ b/configstore/1.0/vts/functional/VtsHalConfigstoreV1_0TargetTest.cpp @@ -17,6 +17,7 @@ #define LOG_TAG "ConfigstoreHidlHalTest" #include <VtsHalHidlTargetTestBase.h> +#include <VtsHalHidlTargetTestEnvBase.h> #include <android-base/logging.h> #include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h> #include <android/hardware/configstore/1.0/types.h> @@ -34,13 +35,25 @@ using ::android::sp; #define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk()) #define EXPECT_OK(ret) EXPECT_TRUE(ret.isOk()) +// Test environment for Configstore HIDL HAL. +class ConfigstoreHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase { + public: + // get the test environment singleton + static ConfigstoreHidlEnvironment* Instance() { + static ConfigstoreHidlEnvironment* instance = new ConfigstoreHidlEnvironment; + return instance; + } + + virtual void registerTestServices() override { registerTestService<ISurfaceFlingerConfigs>(); } +}; + class ConfigstoreHidlTest : public ::testing::VtsHalHidlTargetTestBase { public: sp<ISurfaceFlingerConfigs> sfConfigs; virtual void SetUp() override { - sfConfigs = ::testing::VtsHalHidlTargetTestBase::getService< - ISurfaceFlingerConfigs>(); + sfConfigs = ::testing::VtsHalHidlTargetTestBase::getService<ISurfaceFlingerConfigs>( + ConfigstoreHidlEnvironment::Instance()->getServiceName<ISurfaceFlingerConfigs>()); ASSERT_NE(sfConfigs, nullptr); } @@ -119,7 +132,9 @@ TEST_F(ConfigstoreHidlTest, TestSameReturnValue) { } int main(int argc, char** argv) { + ::testing::AddGlobalTestEnvironment(ConfigstoreHidlEnvironment::Instance()); ::testing::InitGoogleTest(&argc, argv); + ConfigstoreHidlEnvironment::Instance()->init(&argc, argv); int status = RUN_ALL_TESTS(); LOG(INFO) << "Test result = " << status; return status; |