From 771928d151f2b49e2dd4ef87e1d753d0dbaaa767 Mon Sep 17 00:00:00 2001 From: Nathalie Le Clair Date: Wed, 11 Jan 2023 13:48:29 +0100 Subject: [PATCH] Remove unused test mapping file These files were created when the HDMI Connection HAL was still called the HDMI HAL. They are no longer required today and should be removed. Test: none Bug: 265065502 Change-Id: I066896077cdc009cc573bb7df44c7b4fdc4c8baf --- tv/hdmi/aidl/TEST_MAPPING | 7 -- tv/hdmi/aidl/vts/functional/AndroidTest.xml | 33 ----- .../functional/VtsHalTvHdmiAidlTargetTest.cpp | 119 ------------------ 3 files changed, 159 deletions(-) delete mode 100644 tv/hdmi/aidl/TEST_MAPPING delete mode 100644 tv/hdmi/aidl/vts/functional/AndroidTest.xml delete mode 100644 tv/hdmi/aidl/vts/functional/VtsHalTvHdmiAidlTargetTest.cpp diff --git a/tv/hdmi/aidl/TEST_MAPPING b/tv/hdmi/aidl/TEST_MAPPING deleted file mode 100644 index 6bd3b571df..0000000000 --- a/tv/hdmi/aidl/TEST_MAPPING +++ /dev/null @@ -1,7 +0,0 @@ -{ - "presubmit": [ - { - "name": "VtsHalTvHdmiAidlTargetTest" - } - ] -} diff --git a/tv/hdmi/aidl/vts/functional/AndroidTest.xml b/tv/hdmi/aidl/vts/functional/AndroidTest.xml deleted file mode 100644 index 0640b2db42..0000000000 --- a/tv/hdmi/aidl/vts/functional/AndroidTest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - diff --git a/tv/hdmi/aidl/vts/functional/VtsHalTvHdmiAidlTargetTest.cpp b/tv/hdmi/aidl/vts/functional/VtsHalTvHdmiAidlTargetTest.cpp deleted file mode 100644 index fd4d94f628..0000000000 --- a/tv/hdmi/aidl/vts/functional/VtsHalTvHdmiAidlTargetTest.cpp +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "Hdmi_hal_test" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using ::aidl::android::hardware::tv::hdmi::BnHdmiCallback; -using ::aidl::android::hardware::tv::hdmi::HdmiPortInfo; -using ::aidl::android::hardware::tv::hdmi::HdmiPortType; -using ::aidl::android::hardware::tv::hdmi::HpdSignal; -using ::aidl::android::hardware::tv::hdmi::IHdmi; -using ::aidl::android::hardware::tv::hdmi::IHdmiCallback; -using ::ndk::SpAIBinder; - -#define INCORRECT_VENDOR_ID 0x00 -#define TV_PHYSICAL_ADDRESS 0x0000 - -// The main test class for TV HDMI HAL. -class HdmiTest : public ::testing::TestWithParam { - static void serviceDied(void* /* cookie */) { ALOGE("VtsHalTvCecAidlTargetTest died"); } - - public: - void SetUp() override { - hdmi = IHdmi::fromBinder(SpAIBinder(AServiceManager_waitForService(GetParam().c_str()))); - ASSERT_NE(hdmi, nullptr); - ALOGI("%s: getService() for hdmi is %s", __func__, hdmi->isRemote() ? "remote" : "local"); - - hdmiCallback = ::ndk::SharedRefBase::make(); - ASSERT_NE(hdmiCallback, nullptr); - hdmiDeathRecipient = - ndk::ScopedAIBinder_DeathRecipient(AIBinder_DeathRecipient_new(&serviceDied)); - ASSERT_EQ(AIBinder_linkToDeath(hdmi->asBinder().get(), hdmiDeathRecipient.get(), 0), - STATUS_OK); - } - - class HdmiCallback : public BnHdmiCallback { - public: - ::ndk::ScopedAStatus onHotplugEvent(bool connected __unused, int32_t portId __unused) { - return ::ndk::ScopedAStatus::ok(); - }; - }; - - std::shared_ptr hdmi; - std::shared_ptr hdmiCallback; - ::ndk::ScopedAIBinder_DeathRecipient hdmiDeathRecipient; -}; - -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(HdmiTest); -INSTANTIATE_TEST_SUITE_P(PerInstance, HdmiTest, - testing::ValuesIn(android::getAidlHalInstanceNames(IHdmi::descriptor)), - android::PrintInstanceNameToString); - -TEST_P(HdmiTest, SetCallback) { - ASSERT_TRUE(hdmi->setCallback(::ndk::SharedRefBase::make()).isOk()); -} - -TEST_P(HdmiTest, GetPortInfo) { - std::vector ports; - ASSERT_TRUE(hdmi->getPortInfo(&ports).isOk()); - - bool cecSupportedOnDevice = false; - for (size_t i = 0; i < ports.size(); ++i) { - EXPECT_TRUE((ports[i].type == HdmiPortType::OUTPUT) || - (ports[i].type == HdmiPortType::INPUT)); - if (ports[i].portId == 0) { - ALOGW("%s: Port id should start from 1", __func__); - } - cecSupportedOnDevice = cecSupportedOnDevice | ports[i].cecSupported; - } - EXPECT_NE(cecSupportedOnDevice, false) << "At least one port should support CEC"; -} - -TEST_P(HdmiTest, IsConnected) { - std::vector ports; - ASSERT_TRUE(hdmi->getPortInfo(&ports).isOk()); - for (size_t i = 0; i < ports.size(); ++i) { - bool connected; - ASSERT_TRUE(hdmi->isConnected(ports[i].portId, &connected).isOk()); - } -} - -TEST_P(HdmiTest, HdpSignal) { - HpdSignal originalSignal; - HpdSignal signal = HpdSignal::HDMI_HPD_STATUS_BIT; - HpdSignal readSignal; - ASSERT_TRUE(hdmi->getHpdSignal(&originalSignal).isOk()); - ASSERT_TRUE(hdmi->setHpdSignal(signal).isOk()); - ASSERT_TRUE(hdmi->getHpdSignal(&readSignal).isOk()); - EXPECT_EQ(readSignal, signal); - signal = HpdSignal::HDMI_HPD_PHYSICAL; - ASSERT_TRUE(hdmi->setHpdSignal(signal).isOk()); - ASSERT_TRUE(hdmi->getHpdSignal(&readSignal).isOk()); - EXPECT_EQ(readSignal, signal); - ASSERT_TRUE(hdmi->setHpdSignal(originalSignal).isOk()); -}