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

Commit ff0f61be authored by RD Babiera's avatar RD Babiera
Browse files

Skip VTS tests based on HAL interface version 

Adds version check to compliance warning, plug orientation, and
DisplayPort VTS tests to skip if feature is not supported. Fixed tab
spacing on mentioned tests.

Bug: 265060163
Test: atest VtsAidlUsbTargetTest
Change-Id: If3e04baa98fa3299f128551e3b93debd729f57e3
parent 1ae58617

usb/aidl/vts/VtsAidlUsbTargetTest.cpp

+95 −62
Original line number Diff line number Diff line
@@ -253,6 +253,9 @@ class UsbAidlTest : public testing::TestWithParam<std::string> { 
  std::mutex usb_mtx;

  std::condition_variable usb_cv;

  int usb_count = 0;



  // Stores usb version

  int32_t usb_version;

};



/*
@@ -295,6 +298,12 @@ TEST_P(UsbAidlTest, DisabledDataStatusCheck) { 
  int disabledCount = 0;



  ALOGI("UsbAidlTest DataStatusCheck  start");

  auto retVersion = usb->getInterfaceVersion(&usb_version);

  ASSERT_TRUE(retVersion.isOk()) << retVersion;

  if (usb_version < 2) {

    ALOGI("UsbAidlTest skipping DataStatusCheck on older interface versions");

    GTEST_SKIP();

  }

  int64_t transactionId = rand() % 10000;

  const auto& ret = usb->queryPortStatus(transactionId);

  ASSERT_TRUE(ret.isOk());
@@ -604,6 +613,12 @@ TEST_P(UsbAidlTest, DISABLED_resetUsbPort) { 
 */

TEST_P(UsbAidlTest, nonCompliantChargerStatus) {

  ALOGI("UsbAidlTest nonCompliantChargerStatus start");

  auto retVersion = usb->getInterfaceVersion(&usb_version);

  ASSERT_TRUE(retVersion.isOk()) << retVersion;

  if (usb_version < 2) {

    ALOGI("UsbAidlTest skipping nonCompliantChargerStatus on older interface versions");

    GTEST_SKIP();

  }

  int64_t transactionId = rand() % 10000;

  const auto& ret = usb->queryPortStatus(transactionId);

  ASSERT_TRUE(ret.isOk());
@@ -625,6 +640,12 @@ TEST_P(UsbAidlTest, nonCompliantChargerStatus) { 
 */

TEST_P(UsbAidlTest, nonCompliantChargerValues) {

  ALOGI("UsbAidlTest nonCompliantChargerValues start");

  auto retVersion = usb->getInterfaceVersion(&usb_version);

  ASSERT_TRUE(retVersion.isOk()) << retVersion;

  if (usb_version < 2) {

    ALOGI("UsbAidlTest skipping nonCompliantChargerValues on older interface versions");

    GTEST_SKIP();

  }

  int64_t transactionId = rand() % 10000;

  const auto& ret = usb->queryPortStatus(transactionId);

  ASSERT_TRUE(ret.isOk());
@@ -648,6 +669,12 @@ TEST_P(UsbAidlTest, nonCompliantChargerValues) { 
 */

TEST_P(UsbAidlTest, plugOrientationValues) {

  ALOGI("UsbAidlTest plugOrientationValues start");

  auto retVersion = usb->getInterfaceVersion(&usb_version);

  ASSERT_TRUE(retVersion.isOk()) << retVersion;

  if (usb_version < 2) {

    ALOGI("UsbAidlTest skipping plugOrientationValues on older interface versions");

    GTEST_SKIP();

  }

  int64_t transactionId = rand() % 10000;

  const auto& ret = usb->queryPortStatus(transactionId);

  ASSERT_TRUE(ret.isOk());
@@ -665,6 +692,12 @@ TEST_P(UsbAidlTest, plugOrientationValues) { 
 */

TEST_P(UsbAidlTest, dpAltModeValues) {

  ALOGI("UsbAidlTest dpAltModeValues start");

  auto retVersion = usb->getInterfaceVersion(&usb_version);

  ASSERT_TRUE(retVersion.isOk()) << retVersion;

  if (usb_version < 2) {

    ALOGI("UsbAidlTest skipping dpAltModeValues on older interface versions");

    GTEST_SKIP();

  }

  int64_t transactionId = rand() % 10000;

  const auto& ret = usb->queryPortStatus(transactionId);

  ASSERT_TRUE(ret.isOk());