commit 96a098a80d9904f57d0ed65f9de8d210175a11c0
author Chia-I Wu <olv@google.com> Thu Jan 25 10:38:06 2018 -0800
committer Chia-I Wu <olv@google.com> Wed Feb 21 11:03:04 2018 -0800
tree f304ce63750d746d0ee0035156cba9604e164afb
parent 8b20c5c8817534def44224c9ab6dbe166e7383d6

graphics: more reusable libVtsHalGraphicsComposerTestUtils

Versioned library names, versioned include paths, and others.

Test: make VtsHalGraphicsComposerV2_1TargetTest
Change-Id: Ic266763c9ef25e09bc2c97026f2e1324609f48c6

graphics/composer/2.2/vts/functional/Android.bp

diff --git a/graphics/composer/2.2/vts/functional/Android.bp b/graphics/composer/2.2/vts/functional/Android.bp
index c090a23..7747900 100644
--- a/graphics/composer/2.2/vts/functional/Android.bp
+++ b/graphics/composer/2.2/vts/functional/Android.bp
@@ -27,14 +27,13 @@
     ],
     static_libs: [
         "android.hardware.graphics.allocator@2.0",
-        "android.hardware.graphics.composer@2.2",
         "android.hardware.graphics.composer@2.1",
+        "android.hardware.graphics.composer@2.1-vts",
+        "android.hardware.graphics.composer@2.2",
+        "android.hardware.graphics.composer@2.2-vts",
         "android.hardware.graphics.mapper@2.0",
         "android.hardware.graphics.mapper@2.0-vts",
         "android.hardware.graphics.mapper@2.1",
-        "libVtsHalGraphicsComposerTestUtils",
-        "libVtsHalGraphicsComposerTestUtils@2.2",
-        "libnativehelper",
     ],
     header_libs: [
         "android.hardware.graphics.composer@2.1-command-buffer",

graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp

diff --git a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp
index 6fbdd3c..c494329 100644
--- a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp
+++ b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp
@@ -16,23 +16,20 @@
 
 #define LOG_TAG "graphics_composer_hidl_hal_test@2.2"
 
+#include <VtsHalHidlTargetTestBase.h>
 #include <android-base/logging.h>
 #include <android/hardware/graphics/mapper/2.1/IMapper.h>
+#include <composer-vts/2.1/GraphicsComposerCallback.h>
+#include <composer-vts/2.1/TestCommandReader.h>
+#include <composer-vts/2.2/ComposerVts.h>
 #include <mapper-vts/2.0/MapperVts.h>
-#include <sync/sync.h>
-#include "2.2/VtsHalGraphicsComposerTestUtils.h"
-#include "GraphicsComposerCallback.h"
-#include "TestCommandReader.h"
-#include "VtsHalGraphicsComposerTestUtils.h"
-
-#include <VtsHalHidlTargetTestBase.h>
 
 namespace android {
 namespace hardware {
 namespace graphics {
 namespace composer {
 namespace V2_2 {
-namespace tests {
+namespace vts {
 namespace {
 
 using android::hardware::graphics::common::V1_0::BufferUsage;
@@ -71,7 +68,7 @@
                 GraphicsComposerHidlEnvironment::Instance()->getServiceName<IComposer>()));
         ASSERT_NO_FATAL_FAILURE(mComposerClient = mComposer->createClient_v2_2());
 
-        mComposerCallback = new V2_1::tests::GraphicsComposerCallback;
+        mComposerCallback = new V2_1::vts::GraphicsComposerCallback;
         mComposerClient->registerCallback(mComposerCallback);
 
         // assume the first display is primary and is never removed
@@ -95,7 +92,7 @@
 
     std::unique_ptr<Composer_v2_2> mComposer;
     std::unique_ptr<ComposerClient_v2_2> mComposerClient;
-    sp<V2_1::tests::GraphicsComposerCallback> mComposerCallback;
+    sp<V2_1::vts::GraphicsComposerCallback> mComposerCallback;
     // the first display and is assumed never to be removed
     Display mPrimaryDisplay;
 
@@ -122,7 +119,7 @@
         ASSERT_NO_FATAL_FAILURE(mGralloc = std::make_unique<Gralloc>());
 
         mWriter = std::make_unique<V2_2::CommandWriterBase>(1024);
-        mReader = std::make_unique<V2_1::tests::TestCommandReader>();
+        mReader = std::make_unique<V2_1::vts::TestCommandReader>();
     }
 
     void TearDown() override { ASSERT_NO_FATAL_FAILURE(GraphicsComposerHidlTest::TearDown()); }
@@ -142,7 +139,7 @@
     void execute() { mComposerClient->execute_v2_2(mReader.get(), mWriter.get()); }
 
     std::unique_ptr<V2_2::CommandWriterBase> mWriter;
-    std::unique_ptr<V2_1::tests::TestCommandReader> mReader;
+    std::unique_ptr<V2_1::vts::TestCommandReader> mReader;
 
    private:
     std::unique_ptr<Gralloc> mGralloc;
@@ -239,7 +236,7 @@
 }
 
 }  // namespace
-}  // namespace tests
+}  // namespace vts
 }  // namespace V2_2
 }  // namespace composer
 }  // namespace graphics
@@ -247,7 +244,7 @@
 }  // namespace android
 
 int main(int argc, char** argv) {
-    using android::hardware::graphics::composer::V2_2::tests::GraphicsComposerHidlEnvironment;
+    using android::hardware::graphics::composer::V2_2::vts::GraphicsComposerHidlEnvironment;
     ::testing::AddGlobalTestEnvironment(GraphicsComposerHidlEnvironment::Instance());
     ::testing::InitGoogleTest(&argc, argv);
     GraphicsComposerHidlEnvironment::Instance()->init(&argc, argv);