Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fcb7be3 authored by Zhuoyao Zhang's avatar Zhuoyao Zhang Committed by android-build-merger
Browse files

Merge "Convert tv input hal test to use VtsHalHidlTargetTestEnvBase" am: 184eb86c

am: 8bf3afb4

Change-Id: Ib3cf4e528ba278612ee9bdc44edb8eab8b8ae766
parents 0a718456 8bf3afb4
Loading
Loading
Loading
Loading
+19 −11
Original line number Diff line number Diff line
@@ -42,11 +42,27 @@ using ::android::sp;
#define WAIT_FOR_EVENT_TIMEOUT 5
#define DEFAULT_ID INT32_MIN

// Test environment for TvInput HIDL HAL.
class TvInputHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
 public:
  // get the test environment singleton
  static TvInputHidlEnvironment* Instance() {
    static TvInputHidlEnvironment* instance = new TvInputHidlEnvironment;
    return instance;
  }

  virtual void registerTestServices() override { registerTestService<ITvInput>(); }

 private:
  TvInputHidlEnvironment() {}
};

/* The main test class for TV Input HIDL HAL. */
class TvInputHidlTest : public ::testing::VtsHalHidlTargetTestBase {
 public:
  virtual void SetUp() override {
    tv_input_ = ::testing::VtsHalHidlTargetTestBase::getService<ITvInput>();
    tv_input_ = ::testing::VtsHalHidlTargetTestBase::getService<ITvInput>(
          TvInputHidlEnvironment::Instance()->getServiceName<ITvInput>());
    ASSERT_NE(tv_input_, nullptr);
    tv_input_callback_ = new TvInputCallback(*this);
    ASSERT_NE(tv_input_callback_, nullptr);
@@ -187,15 +203,6 @@ class TvInputHidlTest : public ::testing::VtsHalHidlTargetTestBase {
};


/* A class for test environment setup. */
class TvInputHidlEnvironment : public ::testing::Environment {
 public:
  virtual void SetUp() {}
  virtual void TearDown() {}

 private:
};

/*
 * GetStreamConfigTest:
 * Calls updateStreamConfigurations() for each existing device
@@ -354,8 +361,9 @@ TEST_F(TvInputHidlTest, CloseStreamBeforeOpenTest) {
}

int main(int argc, char **argv) {
  ::testing::AddGlobalTestEnvironment(new TvInputHidlEnvironment);
  ::testing::AddGlobalTestEnvironment(TvInputHidlEnvironment::Instance());
  ::testing::InitGoogleTest(&argc, argv);
  TvInputHidlEnvironment::Instance()->init(&argc, argv);
  int status = RUN_ALL_TESTS();
  ALOGI("Test result = %d", status);
  return status;