Convert Renderscript Hal test to test against each of the service names.
Bug:64203181
Test: vts-tradefed run vts -m VtsHalRenderscriptV1_0Target
Change-Id: I40bb519f901a553363837a42ee7450db32d22e27
diff --git a/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp b/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp
index c6eecd6..0636cf9 100644
--- a/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp
+++ b/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp
@@ -18,7 +18,8 @@
// The main test class for RENDERSCRIPT HIDL HAL.
void RenderscriptHidlTest::SetUp() {
- device = ::testing::VtsHalHidlTargetTestBase::getService<IDevice>();
+ device = ::testing::VtsHalHidlTargetTestBase::getService<IDevice>(
+ RenderscriptHidlEnvironment::Instance()->getServiceName<IDevice>());
ASSERT_NE(nullptr, device.get());
uint32_t version = 0;
@@ -34,17 +35,10 @@
}
}
-// A class for test environment setup (kept since this file is a template).
-class RenderscriptHidlEnvironment : public ::testing::Environment {
-public:
- virtual void SetUp() {}
- virtual void TearDown() {}
-};
-
-
int main(int argc, char** argv) {
- ::testing::AddGlobalTestEnvironment(new RenderscriptHidlEnvironment);
+ ::testing::AddGlobalTestEnvironment(RenderscriptHidlEnvironment::Instance());
::testing::InitGoogleTest(&argc, argv);
+ RenderscriptHidlEnvironment::Instance()->init(&argc, argv);
int status = RUN_ALL_TESTS();
LOG(INFO) << "Test result = " << status;
return status;
diff --git a/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.h b/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.h
index 527fef0..e11ab92 100644
--- a/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.h
+++ b/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.h
@@ -25,6 +25,7 @@
#include <android/hardware/renderscript/1.0/types.h>
#include <VtsHalHidlTargetTestBase.h>
+#include <VtsHalHidlTargetTestEnvBase.h>
#include <gtest/gtest.h>
using ::android::hardware::renderscript::V1_0::Allocation;
@@ -99,4 +100,16 @@
sp<IDevice> device;
};
+// Test environment for RENDERSCRIPT HIDL HAL.
+class RenderscriptHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
+ public:
+ // get the test environment singleton
+ static RenderscriptHidlEnvironment* Instance() {
+ static RenderscriptHidlEnvironment* instance = new RenderscriptHidlEnvironment;
+ return instance;
+ }
+
+ virtual void registerTestServices() override { registerTestService<IDevice>(); }
+};
+
#endif // VTS_HAL_RENDERSCRIPT_V1_0_TARGET_TESTS_H