Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Convert Renderscript Hal test to test against each of the service names."

Browse Source 
am: 4fae0e4f75

Change-Id: I76769806c8e90411055c4864b57e8271cc1894a8
This commit is contained in:
Zhuoyao Zhang
2017-11-15 18:16:46 +00:00
committed by android-build-merger
parent 0c9df89f88 4fae0e4f75
commit a529b73890
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp
View File

@@ -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 @@ void RenderscriptHidlTest::TearDown() {
}
}
// 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;

13
renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.h
View File

@@ -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 @@ private:
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