Merge "Update VtsHalGraphicsComposerV2_1TargetTest"

#include "VtsHalGraphicsMapperTestUtils.h"

#include <VtsHalHidlTargetTestBase.h>

#include <VtsHalHidlTargetTestEnvBase.h>

#include <unistd.h>

#include <algorithm>

using android::hardware::graphics::mapper::V2_0::tests::Gralloc;

using GrallocError = android::hardware::graphics::mapper::V2_0::Error;

const char* kHalFQName = "android.hardware.graphics.composer@2.1::IComposer";

// Test environment for graphics.composer

class GraphicsComposerHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {

   public:

    // get the test environment singleton

    static GraphicsComposerHidlEnvironment* Instance() {

        static GraphicsComposerHidlEnvironment* instance = new GraphicsComposerHidlEnvironment;

        return instance;

    }

    virtual void registerTestServices() override { registerTestService(kHalFQName); }

   private:

    GraphicsComposerHidlEnvironment() {}

    GTEST_DISALLOW_COPY_AND_ASSIGN_(GraphicsComposerHidlEnvironment);

};

class GraphicsComposerHidlTest : public ::testing::VtsHalHidlTargetTestBase {

 protected:

  void SetUp() override {

    ASSERT_NO_FATAL_FAILURE(mComposer = std::make_unique<Composer>());

      ASSERT_NO_FATAL_FAILURE(

          mComposer = std::make_unique<Composer>(

              GraphicsComposerHidlEnvironment::Instance()->getServiceName(kHalFQName)));

      ASSERT_NO_FATAL_FAILURE(mComposerClient = mComposer->createClient());

      mComposerCallback = new GraphicsComposerCallback;

}  // namespace android

int main(int argc, char** argv) {

    using android::hardware::graphics::composer::V2_1::tests::GraphicsComposerHidlEnvironment;

    ::testing::AddGlobalTestEnvironment(GraphicsComposerHidlEnvironment::Instance());

    ::testing::InitGoogleTest(&argc, argv);

    GraphicsComposerHidlEnvironment::Instance()->init(&argc, argv);

    int status = RUN_ALL_TESTS();

  LOG(INFO) << "Test result = " << status;

    ALOGI("Test result = %d", status);

    return status;

}