commit ed2bb4e8f851688c09f7639a9183b1285aa0967c
author Yuexi Ma <yuexima@google.com> Fri Mar 10 00:44:45 2017 -0800
committer Yuexi Ma <yuexima@google.com> Fri Mar 10 21:14:48 2017 +0000
tree 35d3b55697123e0b07ad556dc988899ae706fd41
parent 5e1e202bcc25d66890864ac8b73533945ba14d78

Change vts target base test class name

Test: make vts succeed, vts kernel tests and nfc hal tests passed
Change-Id: I95f10ad7a66f261c9030357edd411fe6d94150e8

graphics/mapper/2.0/vts/functional/Android.bp

diff --git a/graphics/mapper/2.0/vts/functional/Android.bp b/graphics/mapper/2.0/vts/functional/Android.bp
index 5b31fe5..e26f087 100644
--- a/graphics/mapper/2.0/vts/functional/Android.bp
+++ b/graphics/mapper/2.0/vts/functional/Android.bp
@@ -23,7 +23,7 @@
         "android.hardware.graphics.mapper@2.0",
     ],
     static_libs: [
-        "VtsHalHidlTargetBaseTest",
+        "VtsHalHidlTargetTestBase",
         "libVtsHalGraphicsAllocatorTestUtils",
     ],
     cflags: [
@@ -56,7 +56,7 @@
     static_libs: [
         "libVtsHalGraphicsAllocatorTestUtils",
         "libVtsHalGraphicsMapperTestUtils",
-        "VtsHalHidlTargetBaseTest",
+        "VtsHalHidlTargetTestBase",
     ],
     cflags: [
         "-Wall",

graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperTestUtils.cpp

diff --git a/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperTestUtils.cpp b/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperTestUtils.cpp
index fc26587..f6a26ac 100644
--- a/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperTestUtils.cpp
+++ b/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperTestUtils.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <VtsHalHidlTargetBaseTest.h>
+#include <VtsHalHidlTargetTestBase.h>
 
 #include "VtsHalGraphicsMapperTestUtils.h"
 
@@ -32,7 +32,7 @@
 Mapper::Mapper() { init(); }
 
 void Mapper::init() {
-  mMapper = ::testing::VtsHalHidlTargetBaseTest::getService<IMapper>();
+  mMapper = ::testing::VtsHalHidlTargetTestBase::getService<IMapper>();
   ASSERT_NE(nullptr, mMapper.get()) << "failed to get mapper service";
   ASSERT_FALSE(mMapper->isRemote()) << "mapper is not in passthrough mode";
 }

graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperV2_0TargetTest.cpp

diff --git a/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperV2_0TargetTest.cpp b/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperV2_0TargetTest.cpp
index bd8315e..92d74d5 100644
--- a/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperV2_0TargetTest.cpp
+++ b/graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperV2_0TargetTest.cpp
@@ -17,7 +17,7 @@
 #define LOG_TAG "graphics_mapper_hidl_hal_test"
 
 #include <android-base/logging.h>
-#include <VtsHalHidlTargetBaseTest.h>
+#include <VtsHalHidlTargetTestBase.h>
 #include <sync/sync.h>
 #include "VtsHalGraphicsMapperTestUtils.h"
 
@@ -32,7 +32,7 @@
 using namespace android::hardware::graphics::allocator::V2_0;
 using namespace android::hardware::graphics::allocator::V2_0::tests;
 
-class GraphicsMapperHidlTest : public ::testing::VtsHalHidlTargetBaseTest {
+class GraphicsMapperHidlTest : public ::testing::VtsHalHidlTargetTestBase {
  protected:
   void SetUp() override {
     ASSERT_NO_FATAL_FAILURE(mAllocator = std::make_unique<Allocator>());