diff options
171 files changed, 1401 insertions, 939 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 543acf6db9..acae4f3a55 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -8,6 +8,9 @@ }, { "name": "hal_implementation_test" + }, + { + "name": "VtsHalTvInputV1_0TargetTest" } ] } diff --git a/atrace/1.0/vts/functional/Android.bp b/atrace/1.0/vts/functional/Android.bp index ae24968aba..07d3f7fedf 100644 --- a/atrace/1.0/vts/functional/Android.bp +++ b/atrace/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalAtraceV1_0TargetTest.cpp"], static_libs: ["android.hardware.atrace@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/audio/2.0/config/Android.bp b/audio/2.0/config/Android.bp new file mode 100644 index 0000000000..65a32eb11d --- /dev/null +++ b/audio/2.0/config/Android.bp @@ -0,0 +1,20 @@ +// +// Copyright (C) 2020 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. +// + +filegroup { + name: "audio_policy_configuration_V2_0", + srcs: ["audio_policy_configuration.xsd"], +} diff --git a/audio/common/all-versions/test/utility/include/utility/EnvironmentTearDown.h b/audio/common/all-versions/test/utility/include/utility/EnvironmentTearDown.h deleted file mode 100644 index 2b240ce309..0000000000 --- a/audio/common/all-versions/test/utility/include/utility/EnvironmentTearDown.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2018 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. - */ - -#ifndef ANDROID_HARDWARE_AUDIO_COMMON_TEST_UTILITY_ENVIRONMENT_TEARDOWN_H -#define ANDROID_HARDWARE_AUDIO_COMMON_TEST_UTILITY_ENVIRONMENT_TEARDOWN_H - -#include <functional> -#include <list> - -namespace android { -namespace hardware { -namespace audio { -namespace common { -namespace test { -namespace utility { - -/** Register callback for static object destruction - * Avoid destroying static objects after main return. - * Post main return destruction leads to incorrect gtest timing measurements as - * well as harder debuging if anything goes wrong during destruction. */ -class EnvironmentTearDown { - public: - using TearDownFunc = std::function<void()>; - void registerTearDown(TearDownFunc&& tearDown) { tearDowns.push_front(std::move(tearDown)); } - - protected: - void executeAllTearDowns() { - // Call the tear downs in reverse order of insertion - for (auto& tearDown : tearDowns) { - tearDown(); - } - } - - private: - std::list<TearDownFunc> tearDowns; -}; - -} // namespace utility -} // namespace test -} // namespace common -} // namespace audio -} // namespace hardware -} // namespace android - -#endif // ANDROID_HARDWARE_AUDIO_COMMON_TEST_UTILITY_ENVIRONMENT_TEARDOWN_H diff --git a/audio/core/all-versions/default/Android.bp b/audio/core/all-versions/default/Android.bp index b8b7feeed0..0af81b2bd4 100644 --- a/audio/core/all-versions/default/Android.bp +++ b/audio/core/all-versions/default/Android.bp @@ -18,8 +18,11 @@ cc_defaults { export_include_dirs: ["include"], - shared_libs: [ + static_libs: [ "libaudiofoundation", + ], + + shared_libs: [ "libbase", "libcutils", "libfmq", @@ -52,7 +55,7 @@ cc_library_shared { "-DMAJOR_VERSION=2", "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", - ] + ], } cc_library_shared { @@ -68,7 +71,7 @@ cc_library_shared { "-DMAJOR_VERSION=4", "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", - ] + ], } cc_library_shared { @@ -83,7 +86,7 @@ cc_library_shared { "-DMAJOR_VERSION=5", "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", - ] + ], } cc_library_shared { @@ -98,5 +101,5 @@ cc_library_shared { "-DMAJOR_VERSION=6", "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", - ] + ], } diff --git a/audio/core/all-versions/vts/functional/2.0/EnvironmentTearDown.h b/audio/core/all-versions/vts/functional/2.0/EnvironmentTearDown.h deleted file mode 100644 index 6373e39111..0000000000 --- a/audio/core/all-versions/vts/functional/2.0/EnvironmentTearDown.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2019 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. - */ - -#ifndef ANDROID_HARDWARE_AUDIO_CORE_2_0_ENVIRONMENT_TEARDOWN_H -#define ANDROID_HARDWARE_AUDIO_CORE_2_0_ENVIRONMENT_TEARDOWN_H - -#include <VtsHalHidlTargetTestEnvBase.h> -#include <gtest/gtest.h> - -#include "utility/EnvironmentTearDown.h" - -class Environment : public ::android::hardware::audio::common::test::utility::EnvironmentTearDown, - public ::testing::VtsHalHidlTargetTestEnvBase { - private: - void HidlTearDown() override { - executeAllTearDowns(); - VtsHalHidlTargetTestEnvBase::HidlTearDown(); - } -}; - -#endif // ANDROID_HARDWARE_AUDIO_CORE_2_0_ENVIRONMENT_TEARDOWN_H diff --git a/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp b/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp index b40a329ee0..e09eeab4eb 100644 --- a/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp +++ b/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp @@ -17,54 +17,6 @@ // pull in all the <= 5.0 tests #include "5.0/AudioPrimaryHidlHalTest.cpp" -const std::vector<DeviceParameter>& getDeviceParametersForFactoryTests() { - static std::vector<DeviceParameter> parameters = [] { - std::vector<DeviceParameter> result; - const auto factories = - ::android::hardware::getAllHalInstanceNames(IDevicesFactory::descriptor); - for (const auto& factoryName : factories) { - result.emplace_back(factoryName, - DeviceManager::getInstance().getPrimary(factoryName) != nullptr - ? DeviceManager::kPrimaryDevice - : ""); - } - return result; - }(); - return parameters; -} - -const std::vector<DeviceParameter>& getDeviceParametersForPrimaryDeviceTests() { - static std::vector<DeviceParameter> parameters = [] { - std::vector<DeviceParameter> result; - const auto primary = std::find_if( - getDeviceParameters().begin(), getDeviceParameters().end(), [](const auto& elem) { - return std::get<PARAM_DEVICE_NAME>(elem) == DeviceManager::kPrimaryDevice; - }); - if (primary != getDeviceParameters().end()) result.push_back(*primary); - return result; - }(); - return parameters; -} - -const std::vector<DeviceParameter>& getDeviceParameters() { - static std::vector<DeviceParameter> parameters = [] { - std::vector<DeviceParameter> result; - const auto factories = - ::android::hardware::getAllHalInstanceNames(IDevicesFactory::descriptor); - const auto devices = getCachedPolicyConfig().getModulesWithDevicesNames(); - result.reserve(devices.size()); - for (const auto& factoryName : factories) { - for (const auto& deviceName : devices) { - if (DeviceManager::getInstance().get(factoryName, deviceName) != nullptr) { - result.emplace_back(factoryName, deviceName); - } - } - } - return result; - }(); - return parameters; -} - const std::vector<DeviceConfigParameter>& getOutputDeviceConfigParameters() { static std::vector<DeviceConfigParameter> parameters = [] { std::vector<DeviceConfigParameter> result; diff --git a/audio/core/all-versions/vts/functional/6.0/EnvironmentTearDown.h b/audio/core/all-versions/vts/functional/6.0/EnvironmentTearDown.h deleted file mode 100644 index 593759f17c..0000000000 --- a/audio/core/all-versions/vts/functional/6.0/EnvironmentTearDown.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2019 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. - */ - -#ifndef ANDROID_HARDWARE_AUDIO_CORE_6_0_ENVIRONMENT_TEARDOWN_H -#define ANDROID_HARDWARE_AUDIO_CORE_6_0_ENVIRONMENT_TEARDOWN_H - -#include <gtest/gtest.h> - -#include "utility/EnvironmentTearDown.h" - -class Environment : public ::android::hardware::audio::common::test::utility::EnvironmentTearDown, - public ::testing::Environment { - public: - void init(int* /*argc*/, char** /*argv*/) {} // emulate VtsHalHidlTargetTestEnvBase - private: - void TearDown() override { executeAllTearDowns(); } -}; - -// FIXME: Will be removed while making getDeviceParameters to use the config -static constexpr const char* kDefaultServiceName = "default"; - -#endif // ANDROID_HARDWARE_AUDIO_CORE_6_0_ENVIRONMENT_TEARDOWN_H diff --git a/audio/core/all-versions/vts/functional/Android.bp b/audio/core/all-versions/vts/functional/Android.bp index 715f3763b2..db52e6095f 100644 --- a/audio/core/all-versions/vts/functional/Android.bp +++ b/audio/core/all-versions/vts/functional/Android.bp @@ -31,7 +31,10 @@ cc_defaults { header_libs: [ "android.hardware.audio.common.util@all-versions", ], - test_suites: ["general-tests"], + test_suites: [ + "general-tests", + "vts-core", + ], } cc_test { @@ -49,6 +52,12 @@ cc_test { "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", ], + data: [ + ":audio_policy_configuration_V2_0", + ], + // Use test_config for vts-core suite. + // TODO(b/146104851): Add auto-gen rules and remove it. + test_config: "VtsHalAudioV2_0TargetTest.xml", } cc_test { @@ -66,6 +75,12 @@ cc_test { "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", ], + data: [ + ":audio_policy_configuration_V4_0", + ], + // Use test_config for vts-core suite. + // TODO(b/146104851): Add auto-gen rules and remove it. + test_config: "VtsHalAudioV4_0TargetTest.xml", } cc_test { @@ -83,6 +98,12 @@ cc_test { "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", ], + data: [ + ":audio_policy_configuration_V5_0", + ], + // Use test_config for vts-core suite. + // TODO(b/146104851): Add auto-gen rules and remove it. + test_config: "VtsHalAudioV5_0TargetTest.xml", } cc_test { @@ -100,14 +121,10 @@ cc_test { "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", ], - // Use test_config for vts-core suite. - // TODO(b/146104851): Add auto-gen rules and remove it. - test_config: "VtsHalAudioV6_0TargetTest.xml", data: [ ":audio_policy_configuration_V6_0", ], - test_suites: [ - "general-tests", - "vts-core", - ], + // Use test_config for vts-core suite. + // TODO(b/146104851): Add auto-gen rules and remove it. + test_config: "VtsHalAudioV6_0TargetTest.xml", } diff --git a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h index b77aec9208..5d82e7bd80 100644 --- a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h +++ b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h @@ -34,10 +34,6 @@ #include <hwbinder/IPCThreadState.h> -#if MAJOR_VERSION <= 5 -#include <VtsHalHidlTargetTestBase.h> -#endif - #include <android-base/logging.h> #include PATH(android/hardware/audio/FILE_VERSION/IDevice.h) @@ -49,10 +45,8 @@ #include <Serializer.h> #include <fmq/EventFlag.h> #include <fmq/MessageQueue.h> -#if MAJOR_VERSION >= 6 #include <hidl/GtestPrinter.h> #include <hidl/ServiceManagement.h> -#endif #include <common/all-versions/VersionUtils.h> @@ -61,12 +55,6 @@ #include "utility/ReturnIn.h" #include "utility/ValidateXml.h" -#if MAJOR_VERSION <= 5 -#include "2.0/EnvironmentTearDown.h" -#elif MAJOR_VERSION >= 6 -#include "6.0/EnvironmentTearDown.h" -#endif - /** Provide version specific functions that are used in the generic tests */ #if MAJOR_VERSION == 2 #include "2.0/AudioPrimaryHidlHalUtils.h" @@ -114,30 +102,10 @@ static auto okOrInvalidStateOrNotSupported = {Result::OK, Result::INVALID_STATE, static auto invalidArgsOrNotSupported = {Result::INVALID_ARGUMENTS, Result::NOT_SUPPORTED}; static auto invalidStateOrNotSupported = {Result::INVALID_STATE, Result::NOT_SUPPORTED}; -////////////////////////////////////////////////////////////////////////////// -//////////////////////////////// Environment ///////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - -class AudioHidlTestEnvironment : public ::Environment { - public: -#if MAJOR_VERSION <= 5 - void registerTestServices() override { registerTestService<IDevicesFactory>(); } -#endif -}; - -// Instance to register global tearDown -static AudioHidlTestEnvironment* environment; - #define AUDIO_PRIMARY_HIDL_HAL_TEST #include "DeviceManager.h" -#if MAJOR_VERSION <= 5 -using HidlTestBase = ::testing::VtsHalHidlTargetTestBase; -#elif MAJOR_VERSION >= 6 -using HidlTestBase = ::testing::Test; -#endif - -class HidlTest : public HidlTestBase { +class HidlTest : public ::testing::Test { public: virtual ~HidlTest() = default; // public access to avoid annoyances when using this method in template classes @@ -174,15 +142,6 @@ static constexpr char kConfigFileName[] = "audio_policy_configuration.xml"; #define QUOTE(x) #x #define STRINGIFY(x) QUOTE(x) -TEST(CheckConfig, audioPolicyConfigurationValidation) { - RecordProperty("description", - "Verify that the audio policy configuration file " - "is valid according to the schema"); - - const char* xsd = "/data/local/tmp/audio_policy_configuration_" STRINGIFY(CPP_VERSION) ".xsd"; - EXPECT_ONE_VALID_XML_MULTIPLE_LOCATIONS(kConfigFileName, kConfigLocations, xsd); -} - struct PolicyConfigData { android::HwModuleCollection hwModules; android::DeviceVector availableOutputDevices; @@ -254,32 +213,11 @@ class PolicyConfig : private PolicyConfigData, public AudioPolicyConfig { const PolicyConfig& getCachedPolicyConfig() { static std::unique_ptr<PolicyConfig> policyConfig = [] { auto config = std::make_unique<PolicyConfig>(); - environment->registerTearDown([] { policyConfig.reset(); }); return config; }(); return *policyConfig; } -class AudioPolicyConfigTest : public HidlTestBase { - public: - void SetUp() override { - ASSERT_NO_FATAL_FAILURE(HidlTestBase::SetUp()); // setup base - auto& policyConfig = getCachedPolicyConfig(); - ASSERT_EQ(0, policyConfig.getStatus()) << policyConfig.getError(); - } -}; - -TEST_F(AudioPolicyConfigTest, LoadAudioPolicyXMLConfiguration) { - doc::test("Test parsing audio_policy_configuration.xml (called in SetUp)"); -} - -TEST_F(AudioPolicyConfigTest, HasPrimaryModule) { - auto& policyConfig = getCachedPolicyConfig(); - ASSERT_TRUE(policyConfig.getPrimaryModule() != nullptr) - << "Could not find primary module in configuration file: " - << policyConfig.getFilePath(); -} - ////////////////////////////////////////////////////////////////////////////// //////////////////// Test parameter types and definitions //////////////////// ////////////////////////////////////////////////////////////////////////////// @@ -290,53 +228,59 @@ using DeviceParameter = std::tuple<std::string, std::string>; static inline std::string DeviceParameterToString( const ::testing::TestParamInfo<DeviceParameter>& info) { const auto& deviceName = std::get<PARAM_DEVICE_NAME>(info.param); -#if MAJOR_VERSION <= 5 - return !deviceName.empty() ? deviceName : std::to_string(info.index); -#elif MAJOR_VERSION >= 6 const auto factoryName = ::android::hardware::PrintInstanceNameToString(::testing::TestParamInfo<std::string>{ std::get<PARAM_FACTORY_NAME>(info.param), info.index}); return !deviceName.empty() ? factoryName + "_" + deviceName : factoryName; -#endif } -#if MAJOR_VERSION <= 5 -// For V2..5 the factory is looked up using the instance name passed -// in the environment, only one factory is returned. This is because the VTS -// framework will call the test for each instance. Only the primary device of -// the default service factory can be tested. - -// Return a pair of <"default", "primary"> or <[non-default name], ""> -// This is used to parametrize device factory tests. -// The device name is used to indicate whether IPrimaryDevice is required. +const std::vector<DeviceParameter>& getDeviceParameters() { + static std::vector<DeviceParameter> parameters = [] { + std::vector<DeviceParameter> result; + const auto factories = + ::android::hardware::getAllHalInstanceNames(IDevicesFactory::descriptor); + const auto devices = getCachedPolicyConfig().getModulesWithDevicesNames(); + result.reserve(devices.size()); + for (const auto& factoryName : factories) { + for (const auto& deviceName : devices) { + if (DeviceManager::getInstance().get(factoryName, deviceName) != nullptr) { + result.emplace_back(factoryName, deviceName); + } + } + } + return result; + }(); + return parameters; +} + const std::vector<DeviceParameter>& getDeviceParametersForFactoryTests() { - static std::vector<DeviceParameter> parameters = { - {environment->getServiceName<IDevicesFactory>(), - environment->getServiceName<IDevicesFactory>() == kDefaultServiceName - ? DeviceManager::kPrimaryDevice - : ""}}; + static std::vector<DeviceParameter> parameters = [] { + std::vector<DeviceParameter> result; + const auto factories = + ::android::hardware::getAllHalInstanceNames(IDevicesFactory::descriptor); + for (const auto& factoryName : factories) { + result.emplace_back(factoryName, + DeviceManager::getInstance().getPrimary(factoryName) != nullptr + ? DeviceManager::kPrimaryDevice + : ""); + } + return result; + }(); return parameters; } -// Return a pair of <"default", "primary"> or nothing. -// This is used to parametrize primary device tests. + const std::vector<DeviceParameter>& getDeviceParametersForPrimaryDeviceTests() { - static std::vector<DeviceParameter> parameters = - !std::get<PARAM_DEVICE_NAME>(*getDeviceParametersForFactoryTests().begin()).empty() - ? getDeviceParametersForFactoryTests() - : std::vector<DeviceParameter>{}; + static std::vector<DeviceParameter> parameters = [] { + std::vector<DeviceParameter> result; + const auto primary = std::find_if( + getDeviceParameters().begin(), getDeviceParameters().end(), [](const auto& elem) { + return std::get<PARAM_DEVICE_NAME>(elem) == DeviceManager::kPrimaryDevice; + }); + if (primary != getDeviceParameters().end()) result.push_back(*primary); + return result; + }(); return parameters; } -// In V2..5 device tests must only test the primary device. -// No device tests are executed for non-primary devices. -const std::vector<DeviceParameter>& getDeviceParameters() { - return getDeviceParametersForPrimaryDeviceTests(); -} -#elif MAJOR_VERSION >= 6 -// For V6 and above these functions are implemented in 6.0/AudioPrimaryHidlHalTest.cpp -const std::vector<DeviceParameter>& getDeviceParametersForFactoryTests(); -const std::vector<DeviceParameter>& getDeviceParametersForPrimaryDeviceTests(); -const std::vector<DeviceParameter>& getDeviceParameters(); -#endif class AudioHidlTestWithDeviceParameter : public HidlTest, public ::testing::WithParamInterface<DeviceParameter> { @@ -349,6 +293,44 @@ class AudioHidlTestWithDeviceParameter : public HidlTest, } }; +TEST(CheckConfig, audioPolicyConfigurationValidation) { + auto deviceParameters = getDeviceParametersForFactoryTests(); + if (deviceParameters.size() == 0) { + GTEST_SKIP() << "Skipping audioPolicyConfigurationValidation because no device parameter " + "is found."; + } + RecordProperty("description", + "Verify that the audio policy configuration file " + "is valid according to the schema"); + + const char* xsd = "/data/local/tmp/audio_policy_configuration_" STRINGIFY(CPP_VERSION) ".xsd"; + EXPECT_ONE_VALID_XML_MULTIPLE_LOCATIONS(kConfigFileName, kConfigLocations, xsd); +} + +class AudioPolicyConfigTest : public AudioHidlTestWithDeviceParameter { + public: + void SetUp() override { + ASSERT_NO_FATAL_FAILURE(AudioHidlTestWithDeviceParameter::SetUp()); // setup base + auto& policyConfig = getCachedPolicyConfig(); + ASSERT_EQ(0, policyConfig.getStatus()) << policyConfig.getError(); + } +}; + +TEST_P(AudioPolicyConfigTest, LoadAudioPolicyXMLConfiguration) { + doc::test("Test parsing audio_policy_configuration.xml (called in SetUp)"); +} + +TEST_P(AudioPolicyConfigTest, HasPrimaryModule) { + auto& policyConfig = getCachedPolicyConfig(); + ASSERT_TRUE(policyConfig.getPrimaryModule() != nullptr) + << "Could not find primary module in configuration file: " + << policyConfig.getFilePath(); +} + +INSTANTIATE_TEST_CASE_P(AudioHidl, AudioPolicyConfigTest, + ::testing::ValuesIn(getDeviceParametersForFactoryTests()), + &DeviceParameterToString); + ////////////////////////////////////////////////////////////////////////////// ////////////////////// getService audio_devices_factory ////////////////////// ////////////////////////////////////////////////////////////////////////////// @@ -1576,20 +1558,3 @@ TEST_P(BoolAccessorPrimaryHidlTest, setGetHac) { testAccessors<OPTIONAL>("HAC", Initial{false}, {true}, &IPrimaryDevice::setHacEnabled, &IPrimaryDevice::getHacEnabled); } - -////////////////////////////////////////////////////////////////////////////// -//////////////////// Clean caches on global tear down //////////////////////// -////////////////////////////////////////////////////////////////////////////// - -int main(int argc, char** argv) { - environment = new AudioHidlTestEnvironment; - // For V2..5 it's critical to initialize environment before GTest. - // The environment parses the service name from the command line, - // then it can be used in GTest parameter generators which are - // initialized during the call to InitGoogleTest. - environment->init(&argc, argv); - ::testing::AddGlobalTestEnvironment(environment); - ::testing::InitGoogleTest(&argc, argv); - int status = RUN_ALL_TESTS(); - return status; -} diff --git a/audio/core/all-versions/vts/functional/DeviceManager.h b/audio/core/all-versions/vts/functional/DeviceManager.h index cb6584d123..0c0727f283 100644 --- a/audio/core/all-versions/vts/functional/DeviceManager.h +++ b/audio/core/all-versions/vts/functional/DeviceManager.h @@ -31,10 +31,6 @@ class InterfaceManager { auto existing = instances.find(name); if (existing != instances.end()) return existing->second; auto [inserted, _] = instances.emplace(name, Derived::createInterfaceInstance(name)); - if (inserted->second) { - environment->registerTearDown( - [name]() { (void)Derived::getInstance().reset(name, false); }); - } return inserted->second; } @@ -75,11 +71,7 @@ class DevicesFactoryManager return instance; } static sp<IDevicesFactory> createInterfaceInstance(const std::string& name) { -#if MAJOR_VERSION <= 5 - return ::testing::VtsHalHidlTargetTestBase::getService<IDevicesFactory>(name); -#elif MAJOR_VERSION >= 6 return IDevicesFactory::getService(name); -#endif } }; diff --git a/audio/core/all-versions/vts/functional/VtsHalAudioV2_0TargetTest.xml b/audio/core/all-versions/vts/functional/VtsHalAudioV2_0TargetTest.xml new file mode 100644 index 0000000000..67fcdb64c3 --- /dev/null +++ b/audio/core/all-versions/vts/functional/VtsHalAudioV2_0TargetTest.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<configuration description="Runs VtsHalAudioV2_0TargetTest."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-native" /> + + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> + </target_preparer> + + <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> + <option name="run-command" value="stop"/> + <option name="run-command" value="setprop vts.native_server.on 1"/> + <option name="teardown-command" value="start"/> + <option name="teardown-command" value="setprop vts.native_server.on 0"/> + </target_preparer> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push-file" key="VtsHalAudioV2_0TargetTest" value="/data/local/tmp/VtsHalAudioV2_0TargetTest" /> + <option name="push-file" key="audio_policy_configuration.xsd" value="/data/local/tmp/audio_policy_configuration_V2_0.xsd" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="VtsHalAudioV2_0TargetTest" /> + </test> +</configuration> diff --git a/audio/core/all-versions/vts/functional/VtsHalAudioV4_0TargetTest.xml b/audio/core/all-versions/vts/functional/VtsHalAudioV4_0TargetTest.xml new file mode 100644 index 0000000000..2084060703 --- /dev/null +++ b/audio/core/all-versions/vts/functional/VtsHalAudioV4_0TargetTest.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<configuration description="Runs VtsHalAudioV4_0TargetTest."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-native" /> + + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> + </target_preparer> + + <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> + <option name="run-command" value="stop"/> + <option name="run-command" value="setprop vts.native_server.on 1"/> + <option name="teardown-command" value="start"/> + <option name="teardown-command" value="setprop vts.native_server.on 0"/> + </target_preparer> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push-file" key="VtsHalAudioV4_0TargetTest" value="/data/local/tmp/VtsHalAudioV4_0TargetTest" /> + <option name="push-file" key="audio_policy_configuration_V4_0.xsd" value="/data/local/tmp/audio_policy_configuration_V4_0.xsd" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="VtsHalAudioV4_0TargetTest" /> + </test> +</configuration> diff --git a/audio/core/all-versions/vts/functional/VtsHalAudioV5_0TargetTest.xml b/audio/core/all-versions/vts/functional/VtsHalAudioV5_0TargetTest.xml new file mode 100644 index 0000000000..8b01e41fec --- /dev/null +++ b/audio/core/all-versions/vts/functional/VtsHalAudioV5_0TargetTest.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<configuration description="Runs VtsHalAudioV5_0TargetTest."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-native" /> + + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> + </target_preparer> + + <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> + <option name="run-command" value="stop"/> + <option name="run-command" value="setprop vts.native_server.on 1"/> + <option name="teardown-command" value="start"/> + <option name="teardown-command" value="setprop vts.native_server.on 0"/> + </target_preparer> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push-file" key="VtsHalAudioV5_0TargetTest" value="/data/local/tmp/VtsHalAudioV5_0TargetTest" /> + <option name="push-file" key="audio_policy_configuration_V5_0.xsd" value="/data/local/tmp/audio_policy_configuration_V5_0.xsd" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="VtsHalAudioV5_0TargetTest" /> + </test> +</configuration> diff --git a/audio/effect/all-versions/vts/functional/Android.bp b/audio/effect/all-versions/vts/functional/Android.bp index 4ab572e6ed..309aa9d27f 100644 --- a/audio/effect/all-versions/vts/functional/Android.bp +++ b/audio/effect/all-versions/vts/functional/Android.bp @@ -31,13 +31,13 @@ cc_defaults { header_libs: [ "android.hardware.audio.common.util@all-versions", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } cc_test { name: "VtsHalAudioEffectV2_0TargetTest", defaults: ["VtsHalAudioEffectTargetTest_default"], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioEffectV2_0TargetTest.xml", static_libs: [ @@ -57,7 +57,7 @@ cc_test { cc_test { name: "VtsHalAudioEffectV4_0TargetTest", defaults: ["VtsHalAudioEffectTargetTest_default"], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioEffectV4_0TargetTest.xml", static_libs: [ @@ -77,7 +77,7 @@ cc_test { cc_test { name: "VtsHalAudioEffectV5_0TargetTest", defaults: ["VtsHalAudioEffectTargetTest_default"], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioEffectV5_0TargetTest.xml", static_libs: [ @@ -97,7 +97,7 @@ cc_test { cc_test { name: "VtsHalAudioEffectV6_0TargetTest", defaults: ["VtsHalAudioEffectTargetTest_default"], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioEffectV6_0TargetTest.xml", static_libs: [ diff --git a/audio/policy/1.0/vts/functional/Android.bp b/audio/policy/1.0/vts/functional/Android.bp index b50e501d15..a5ddee51ef 100644 --- a/audio/policy/1.0/vts/functional/Android.bp +++ b/audio/policy/1.0/vts/functional/Android.bp @@ -24,7 +24,7 @@ cc_test { shared_libs: [ "libaudiofoundation", ], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioPolicyV1_0TargetTest.xml", cflags: [ @@ -54,6 +54,6 @@ cc_test { gtest: true, test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/authsecret/1.0/vts/functional/Android.bp b/authsecret/1.0/vts/functional/Android.bp index 9ce9cda2f9..c49d37492d 100644 --- a/authsecret/1.0/vts/functional/Android.bp +++ b/authsecret/1.0/vts/functional/Android.bp @@ -21,7 +21,7 @@ cc_test { static_libs: ["android.hardware.authsecret@1.0"], test_suites: [ "general-tests", - "vts-core", + "vts", ], require_root: true, } diff --git a/automotive/audiocontrol/2.0/vts/functional/Android.bp b/automotive/audiocontrol/2.0/vts/functional/Android.bp index 520b042e37..ac20509dd5 100644 --- a/automotive/audiocontrol/2.0/vts/functional/Android.bp +++ b/automotive/audiocontrol/2.0/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/automotive/evs/1.0/vts/functional/Android.bp b/automotive/evs/1.0/vts/functional/Android.bp index 9f7cd3f02a..74d512293b 100644 --- a/automotive/evs/1.0/vts/functional/Android.bp +++ b/automotive/evs/1.0/vts/functional/Android.bp @@ -28,7 +28,7 @@ cc_test { "android.hardware.automotive.evs@1.0", "android.hardware.automotive.evs@common-default-lib", ], - test_suites: ["vts-core"], + test_suites: ["vts"], cflags: [ "-O0", "-g", diff --git a/automotive/evs/1.1/vts/functional/Android.bp b/automotive/evs/1.1/vts/functional/Android.bp index 086a199ca5..d61f0a8f9c 100644 --- a/automotive/evs/1.1/vts/functional/Android.bp +++ b/automotive/evs/1.1/vts/functional/Android.bp @@ -38,7 +38,7 @@ cc_test { "android.hardware.graphics.common@1.2", "android.hardware.camera.device@3.2", ], - test_suites: ["vts-core"], + test_suites: ["vts"], cflags: [ "-O0", "-g", diff --git a/automotive/occupant_awareness/aidl/vts/functional/Android.bp b/automotive/occupant_awareness/aidl/vts/functional/Android.bp index 1256b69c67..514b0afc2b 100644 --- a/automotive/occupant_awareness/aidl/vts/functional/Android.bp +++ b/automotive/occupant_awareness/aidl/vts/functional/Android.bp @@ -12,6 +12,6 @@ cc_test { "android.hardware.automotive.occupant_awareness-cpp", ], test_suites: [ - "vts-core", + "vts", ], } diff --git a/automotive/sv/1.0/vts/functional/Android.bp b/automotive/sv/1.0/vts/functional/Android.bp index 0e5d3df9a7..d5d72a6c5b 100644 --- a/automotive/sv/1.0/vts/functional/Android.bp +++ b/automotive/sv/1.0/vts/functional/Android.bp @@ -33,7 +33,7 @@ cc_test { "android.hidl.memory@1.0", "libhidlmemory", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], cflags: [ "-O0", "-g", diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp index 84354c15f8..bdc52448e7 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp @@ -16,8 +16,12 @@ #define LOG_TAG "DefaultVehicleHal_v2_0" #include <android-base/macros.h> +#include <android-base/properties.h> #include <android/log.h> +#include <dirent.h> #include <sys/system_properties.h> +#include <fstream> +#include <regex> #include "EmulatedVehicleHal.h" #include "JsonFakeValueGenerator.h" @@ -101,6 +105,30 @@ EmulatedVehicleHal::EmulatedVehicleHal(VehiclePropertyStore* propStore, VehicleH mVehicleClient->registerPropertyValueCallback(std::bind(&EmulatedVehicleHal::onPropertyValue, this, std::placeholders::_1, std::placeholders::_2)); + + mInitVhalValueOverride = + android::base::GetBoolProperty("persist.vendor.vhal_init_value_override", false); + if (mInitVhalValueOverride) { + getAllPropertiesOverride(); + } +} + +void EmulatedVehicleHal::getAllPropertiesOverride() { + if (auto dir = opendir("/vendor/etc/vhaloverride/")) { + std::regex reg_json(".*[.]json", std::regex::icase); + while (auto f = readdir(dir)) { + if (!regex_match(f->d_name, reg_json)) { + continue; + } + std::string file = "/vendor/etc/vhaloverride/" + std::string(f->d_name); + JsonFakeValueGenerator tmpGenerator(file); + + std::vector<VehiclePropValue> propvalues = tmpGenerator.getAllEvents(); + mVehiclePropertiesOverride.insert(std::end(mVehiclePropertiesOverride), + std::begin(propvalues), std::end(propvalues)); + } + closedir(dir); + } } VehicleHal::VehiclePropValuePtr EmulatedVehicleHal::get( @@ -277,6 +305,13 @@ void EmulatedVehicleHal::onCreate() { } } else { prop.value = it.initialValue; + if (mInitVhalValueOverride) { + for (auto& itOverride : mVehiclePropertiesOverride) { + if (itOverride.prop == cfg.prop) { + prop.value = itOverride.value; + } + } + } } mPropStore->writeValue(prop, shouldUpdateStatus); } diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.h index dc05145cd7..cba4b8ae11 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.h +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.h @@ -62,6 +62,7 @@ public: // Methods from EmulatedVehicleHalIface bool setPropertyFromVehicle(const VehiclePropValue& propValue) override; std::vector<VehiclePropValue> getAllProperties() const override; + void getAllPropertiesOverride(); private: constexpr std::chrono::nanoseconds hertzToNanoseconds(float hz) const { @@ -87,6 +88,8 @@ private: RecurrentTimer mRecurrentTimer; VehicleHalClient* mVehicleClient; bool mInEmulator; + bool mInitVhalValueOverride; + std::vector<VehiclePropValue> mVehiclePropertiesOverride; }; } // impl diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/JsonFakeValueGenerator.cpp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/JsonFakeValueGenerator.cpp index 8677f837f5..890eb33643 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/JsonFakeValueGenerator.cpp +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/JsonFakeValueGenerator.cpp @@ -48,6 +48,22 @@ JsonFakeValueGenerator::JsonFakeValueGenerator(const VehiclePropValue& request) mNumOfIterations = v.int32Values.size() < 2 ? -1 : v.int32Values[1]; } +JsonFakeValueGenerator::JsonFakeValueGenerator(std::string path) { + std::ifstream ifs(path); + if (!ifs) { + ALOGE("%s: couldn't open %s for parsing.", __func__, path.c_str()); + } + mGenCfg = { + .index = 0, + .events = parseFakeValueJson(ifs), + }; + mNumOfIterations = mGenCfg.events.size(); +} + +std::vector<VehiclePropValue> JsonFakeValueGenerator::getAllEvents() { + return mGenCfg.events; +} + VehiclePropValue JsonFakeValueGenerator::nextEvent() { VehiclePropValue generatedValue; if (!hasNext()) { @@ -109,6 +125,7 @@ std::vector<VehiclePropValue> JsonFakeValueGenerator::parseFakeValueJson(std::is Json::Value rawEventValue = rawEvent["value"]; auto& value = event.value; + int32_t count; switch (getPropType(event.prop)) { case VehiclePropertyType::BOOLEAN: case VehiclePropertyType::INT32: @@ -126,6 +143,13 @@ std::vector<VehiclePropValue> JsonFakeValueGenerator::parseFakeValueJson(std::is case VehiclePropertyType::STRING: value.stringValue = rawEventValue.asString(); break; + case VehiclePropertyType::INT32_VEC: + value.int32Values.resize(rawEventValue.size()); + count = 0; + for (auto& it : rawEventValue) { + value.int32Values[count++] = it.asInt(); + } + break; case VehiclePropertyType::MIXED: copyMixedValueJson(value, rawEventValue); if (isDiagnosticProperty(event.prop)) { diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/JsonFakeValueGenerator.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/JsonFakeValueGenerator.h index 70575f77bf..dc8ff6680c 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/JsonFakeValueGenerator.h +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/JsonFakeValueGenerator.h @@ -41,9 +41,12 @@ private: public: JsonFakeValueGenerator(const VehiclePropValue& request); + JsonFakeValueGenerator(std::string path); + ~JsonFakeValueGenerator() = default; VehiclePropValue nextEvent(); + std::vector<VehiclePropValue> getAllEvents(); bool hasNext(); diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp index 2eedecda2a..9784f751f2 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp @@ -27,7 +27,17 @@ cc_library_static { "-Wall", "-Werror", ], - srcs: ["VehicleHalProto.proto"] + srcs: ["VehicleHalProto.proto"], +} + +filegroup { + name: "vhal-proto-src", + visibility: [ + "//device/google/trout/hal/vehicle/2.0:__subpackages__", + ], + srcs: [ + "VehicleHalProto.proto", + ], } cc_library_static { @@ -49,7 +59,7 @@ cc_library_static { "libgrpc++_unsecure", ], cflags: [ - "-Wno-unused-parameter" + "-Wno-unused-parameter", ], } diff --git a/biometrics/face/1.0/vts/functional/Android.bp b/biometrics/face/1.0/vts/functional/Android.bp index f2598a7934..ff4a6de889 100644 --- a/biometrics/face/1.0/vts/functional/Android.bp +++ b/biometrics/face/1.0/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBiometricsFaceV1_0TargetTest.cpp"], static_libs: ["android.hardware.biometrics.face@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/biometrics/fingerprint/2.1/vts/functional/Android.bp b/biometrics/fingerprint/2.1/vts/functional/Android.bp index c4180322b8..7e3f3406bb 100644 --- a/biometrics/fingerprint/2.1/vts/functional/Android.bp +++ b/biometrics/fingerprint/2.1/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBiometricsFingerprintV2_1TargetTest.cpp"], static_libs: ["android.hardware.biometrics.fingerprint@2.1"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/biometrics/fingerprint/2.2/vts/functional/Android.bp b/biometrics/fingerprint/2.2/vts/functional/Android.bp index 496570c64c..5e8e7c80be 100644 --- a/biometrics/fingerprint/2.2/vts/functional/Android.bp +++ b/biometrics/fingerprint/2.2/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/bluetooth/1.0/vts/functional/Android.bp b/bluetooth/1.0/vts/functional/Android.bp index cf25cc8ff9..463ed849f6 100644 --- a/bluetooth/1.0/vts/functional/Android.bp +++ b/bluetooth/1.0/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/bluetooth/1.1/vts/functional/Android.bp b/bluetooth/1.1/vts/functional/Android.bp index 8d6d7490e3..eb4a720f95 100644 --- a/bluetooth/1.1/vts/functional/Android.bp +++ b/bluetooth/1.1/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.bluetooth@1.0", "libbluetooth-types", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/bluetooth/a2dp/1.0/vts/functional/Android.bp b/bluetooth/a2dp/1.0/vts/functional/Android.bp index e50e16730a..5b8410adc5 100644 --- a/bluetooth/a2dp/1.0/vts/functional/Android.bp +++ b/bluetooth/a2dp/1.0/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.bluetooth.a2dp@1.0", "libbluetooth-types", ], - test_suites: ["general-tests"], + test_suites: ["general-tests", "vts-core"], } diff --git a/bluetooth/a2dp/1.0/vts/functional/VtsHalBluetoothA2dpV1_0TargetTest.cpp b/bluetooth/a2dp/1.0/vts/functional/VtsHalBluetoothA2dpV1_0TargetTest.cpp index d8d0c29828..44b138a894 100644 --- a/bluetooth/a2dp/1.0/vts/functional/VtsHalBluetoothA2dpV1_0TargetTest.cpp +++ b/bluetooth/a2dp/1.0/vts/functional/VtsHalBluetoothA2dpV1_0TargetTest.cpp @@ -19,12 +19,14 @@ #include <android-base/logging.h> #include <android/hardware/bluetooth/a2dp/1.0/IBluetoothAudioHost.h> #include <android/hardware/bluetooth/a2dp/1.0/IBluetoothAudioOffload.h> +#include <gtest/gtest.h> #include <hardware/bluetooth.h> +#include <hidl/GtestPrinter.h> +#include <hidl/MQDescriptor.h> +#include <hidl/ServiceManagement.h> #include <utils/Log.h> #include <VtsHalHidlTargetCallbackBase.h> -#include <VtsHalHidlTargetTestBase.h> -#include <VtsHalHidlTargetTestEnvBase.h> using ::android::sp; using ::android::hardware::Return; @@ -38,34 +40,12 @@ using ::android::hardware::bluetooth::a2dp::V1_0::IBluetoothAudioOffload; using ::android::hardware::bluetooth::a2dp::V1_0::SampleRate; using ::android::hardware::bluetooth::a2dp::V1_0::Status; -// Test environment for Bluetooth HIDL A2DP HAL. -class BluetoothA2dpHidlEnvironment - : public ::testing::VtsHalHidlTargetTestEnvBase { - public: - // get the test environment singleton - static BluetoothA2dpHidlEnvironment* Instance() { - static BluetoothA2dpHidlEnvironment* instance = - new BluetoothA2dpHidlEnvironment; - return instance; - } - - virtual void registerTestServices() override { - registerTestService<IBluetoothAudioOffload>(); - } - - private: - BluetoothA2dpHidlEnvironment() {} -}; - // The main test class for Bluetooth A2DP HIDL HAL. -class BluetoothA2dpHidlTest : public ::testing::VtsHalHidlTargetTestBase { +class BluetoothA2dpHidlTest : public ::testing::TestWithParam<std::string> { public: virtual void SetUp() override { // currently test passthrough mode only - audio_offload = - ::testing::VtsHalHidlTargetTestBase::getService<IBluetoothAudioOffload>( - BluetoothA2dpHidlEnvironment::Instance() - ->getServiceName<IBluetoothAudioOffload>()); + audio_offload = IBluetoothAudioOffload::getService(GetParam()); ASSERT_NE(audio_offload, nullptr); audio_host = new BluetoothAudioHost(*this); @@ -115,19 +95,16 @@ class BluetoothA2dpHidlTest : public ::testing::VtsHalHidlTargetTestBase { }; // Empty test: Initialize()/Close() are called in SetUp()/TearDown(). -TEST_F(BluetoothA2dpHidlTest, InitializeAndClose) {} +TEST_P(BluetoothA2dpHidlTest, InitializeAndClose) {} // Test start and end session -TEST_F(BluetoothA2dpHidlTest, StartAndEndSession) { +TEST_P(BluetoothA2dpHidlTest, StartAndEndSession) { EXPECT_EQ(Status::SUCCESS, audio_offload->startSession(audio_host, codec)); audio_offload->endSession(); } -int main(int argc, char** argv) { - ::testing::AddGlobalTestEnvironment(BluetoothA2dpHidlEnvironment::Instance()); - ::testing::InitGoogleTest(&argc, argv); - BluetoothA2dpHidlEnvironment::Instance()->init(&argc, argv); - int status = RUN_ALL_TESTS(); - LOG(INFO) << "Test result = " << status; - return status; -} +INSTANTIATE_TEST_SUITE_P( + PerInstance, BluetoothA2dpHidlTest, + testing::ValuesIn(android::hardware::getAllHalInstanceNames( + IBluetoothAudioOffload::descriptor)), + android::hardware::PrintInstanceNameToString);
\ No newline at end of file diff --git a/bluetooth/audio/2.0/vts/functional/Android.bp b/bluetooth/audio/2.0/vts/functional/Android.bp index b778b97b09..0ed5da43f2 100644 --- a/bluetooth/audio/2.0/vts/functional/Android.bp +++ b/bluetooth/audio/2.0/vts/functional/Android.bp @@ -9,5 +9,5 @@ cc_test { shared_libs: [ "libfmq", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/boot/1.0/vts/functional/Android.bp b/boot/1.0/vts/functional/Android.bp index 5244b958ca..92c818c56c 100644 --- a/boot/1.0/vts/functional/Android.bp +++ b/boot/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBootV1_0TargetTest.cpp"], static_libs: ["android.hardware.boot@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/broadcastradio/2.0/vts/functional/Android.bp b/broadcastradio/2.0/vts/functional/Android.bp index 49bb66554f..be17da32df 100644 --- a/broadcastradio/2.0/vts/functional/Android.bp +++ b/broadcastradio/2.0/vts/functional/Android.bp @@ -27,6 +27,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/camera/provider/2.4/vts/functional/Android.bp b/camera/provider/2.4/vts/functional/Android.bp index 4b9d6f125b..cd66f74571 100644 --- a/camera/provider/2.4/vts/functional/Android.bp +++ b/camera/provider/2.4/vts/functional/Android.bp @@ -49,5 +49,5 @@ cc_test { "libhidlmemory", "libgralloctypes", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/cas/1.0/vts/functional/Android.bp b/cas/1.0/vts/functional/Android.bp index ab39c0e93b..82dc568fa6 100644 --- a/cas/1.0/vts/functional/Android.bp +++ b/cas/1.0/vts/functional/Android.bp @@ -29,6 +29,6 @@ cc_test { shared_libs: [ "libbinder", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/cas/1.1/vts/functional/Android.bp b/cas/1.1/vts/functional/Android.bp index 9e8eb52efe..de223c8ce2 100644 --- a/cas/1.1/vts/functional/Android.bp +++ b/cas/1.1/vts/functional/Android.bp @@ -30,6 +30,6 @@ cc_test { shared_libs: [ "libbinder", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/cas/1.2/vts/functional/Android.bp b/cas/1.2/vts/functional/Android.bp index 2d6517f0b0..74ea85fbf2 100644 --- a/cas/1.2/vts/functional/Android.bp +++ b/cas/1.2/vts/functional/Android.bp @@ -33,6 +33,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/compatibility_matrices/compatibility_matrix.5.xml b/compatibility_matrices/compatibility_matrix.5.xml index 38f589daf0..30c15721c0 100644 --- a/compatibility_matrices/compatibility_matrix.5.xml +++ b/compatibility_matrices/compatibility_matrix.5.xml @@ -157,14 +157,6 @@ </interface> </hal> <hal format="hidl" optional="true"> - <name>android.hardware.configstore</name> - <version>1.1</version> - <interface> - <name>ISurfaceFlingerConfigs</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl" optional="true"> <name>android.hardware.confirmationui</name> <version>1.0</version> <interface> diff --git a/configstore/1.0/vts/functional/Android.bp b/configstore/1.0/vts/functional/Android.bp index 31d4b1c9d9..4e1e045dd1 100644 --- a/configstore/1.0/vts/functional/Android.bp +++ b/configstore/1.0/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalConfigstoreV1_0TargetTest.cpp"], static_libs: ["android.hardware.configstore@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/confirmationui/1.0/vts/functional/Android.bp b/confirmationui/1.0/vts/functional/Android.bp index c8b522c119..c73ee2826c 100644 --- a/confirmationui/1.0/vts/functional/Android.bp +++ b/confirmationui/1.0/vts/functional/Android.bp @@ -27,5 +27,5 @@ cc_test { "libcn-cbor", "android.hardware.confirmationui-support-lib", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/contexthub/1.0/vts/functional/Android.bp b/contexthub/1.0/vts/functional/Android.bp index d51c9669c8..091f2dc201 100644 --- a/contexthub/1.0/vts/functional/Android.bp +++ b/contexthub/1.0/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/contexthub/1.1/vts/functional/Android.bp b/contexthub/1.1/vts/functional/Android.bp index f1625a6b6b..034c11fb0c 100644 --- a/contexthub/1.1/vts/functional/Android.bp +++ b/contexthub/1.1/vts/functional/Android.bp @@ -25,6 +25,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/drm/1.0/vts/functional/Android.bp b/drm/1.0/vts/functional/Android.bp index 235bfb406f..8fd258a163 100644 --- a/drm/1.0/vts/functional/Android.bp +++ b/drm/1.0/vts/functional/Android.bp @@ -24,7 +24,7 @@ cc_library_static { "vendor_modules.cpp", ], static_libs: [ - "android.hardware.drm@1.0-helper", + "android.hardware.drm@1.0-helper", ], export_include_dirs: ["include"], } @@ -84,8 +84,22 @@ cc_test { "libcrypto_static", "libdrmvtshelper", ], + arch: { + arm: { + data: [":libvtswidevine-arm-prebuilts"], + }, + arm64: { + data: [":libvtswidevine-arm64-prebuilts"], + }, + x86: { + data: [":libvtswidevine-x86-prebuilts"], + }, + x86_64: { + data: [":libvtswidevine-x86_64-prebuilts"], + }, + }, test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/drm/1.0/vts/functional/AndroidTest.xml b/drm/1.0/vts/functional/AndroidTest.xml new file mode 100644 index 0000000000..92ea7e48dd --- /dev/null +++ b/drm/1.0/vts/functional/AndroidTest.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<configuration description="Runs VtsHalDrmV1_0TargetTest."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-native" /> + + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push-file" key="VtsHalDrmV1_0TargetTest" value="/data/local/tmp/VtsHalDrmV1_0TargetTest" /> + <option name="push-file" key="libvtswidevine64.so" value="/data/local/tmp/64/lib/libvtswidevine.so" /> + <option name="push-file" key="libvtswidevine32.so" value="/data/local/tmp/32/lib/libvtswidevine.so" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="VtsHalDrmV1_0TargetTest" /> + </test> +</configuration> diff --git a/drm/1.1/vts/functional/Android.bp b/drm/1.1/vts/functional/Android.bp index e08d760ea4..053a564023 100644 --- a/drm/1.1/vts/functional/Android.bp +++ b/drm/1.1/vts/functional/Android.bp @@ -60,13 +60,27 @@ cc_test { "drm_hal_test_main.cpp", ], whole_static_libs: [ - "android.hardware.drm@1.1-vts" + "android.hardware.drm@1.1-vts", ], shared_libs: [ "android.hardware.drm@1.1", ], + arch: { + arm: { + data: [":libvtswidevine-arm-prebuilts"], + }, + arm64: { + data: [":libvtswidevine-arm64-prebuilts"], + }, + x86: { + data: [":libvtswidevine-x86-prebuilts"], + }, + x86_64: { + data: [":libvtswidevine-x86_64-prebuilts"], + }, + }, test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/drm/1.1/vts/functional/AndroidTest.xml b/drm/1.1/vts/functional/AndroidTest.xml new file mode 100644 index 0000000000..65c45accee --- /dev/null +++ b/drm/1.1/vts/functional/AndroidTest.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<configuration description="Runs VtsHalDrmV1_1TargetTest."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-native" /> + + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push-file" key="VtsHalDrmV1_1TargetTest" value="/data/local/tmp/VtsHalDrmV1_1TargetTest" /> + <option name="push-file" key="libvtswidevine64.so" value="/data/local/tmp/64/lib/libvtswidevine.so" /> + <option name="push-file" key="libvtswidevine32.so" value="/data/local/tmp/32/lib/libvtswidevine.so" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="VtsHalDrmV1_1TargetTest" /> + </test> +</configuration> diff --git a/drm/1.2/vts/functional/Android.bp b/drm/1.2/vts/functional/Android.bp index ecc7d6c592..9aed4eea9f 100644 --- a/drm/1.2/vts/functional/Android.bp +++ b/drm/1.2/vts/functional/Android.bp @@ -70,8 +70,22 @@ cc_test { "libcrypto_static", "libdrmvtshelper", ], + arch: { + arm: { + data: [":libvtswidevine-arm-prebuilts"], + }, + arm64: { + data: [":libvtswidevine-arm64-prebuilts"], + }, + x86: { + data: [":libvtswidevine-x86-prebuilts"], + }, + x86_64: { + data: [":libvtswidevine-x86_64-prebuilts"], + }, + }, test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/drm/1.2/vts/functional/AndroidTest.xml b/drm/1.2/vts/functional/AndroidTest.xml new file mode 100644 index 0000000000..5da38aefaa --- /dev/null +++ b/drm/1.2/vts/functional/AndroidTest.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<configuration description="Runs VtsHalDrmV1_2TargetTest."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-native" /> + + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push-file" key="VtsHalDrmV1_2TargetTest" value="/data/local/tmp/VtsHalDrmV1_2TargetTest" /> + <option name="push-file" key="libvtswidevine64.so" value="/data/local/tmp/64/lib/libvtswidevine.so" /> + <option name="push-file" key="libvtswidevine32.so" value="/data/local/tmp/32/lib/libvtswidevine.so" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="VtsHalDrmV1_2TargetTest" /> + </test> +</configuration> diff --git a/drm/1.3/vts/functional/Android.bp b/drm/1.3/vts/functional/Android.bp index ac1f912c08..3e40adfd4a 100644 --- a/drm/1.3/vts/functional/Android.bp +++ b/drm/1.3/vts/functional/Android.bp @@ -71,8 +71,22 @@ cc_test { "android.hardware.drm@1.0-helper", "libdrmvtshelper", ], + arch: { + arm: { + data: [":libvtswidevine-arm-prebuilts"], + }, + arm64: { + data: [":libvtswidevine-arm64-prebuilts"], + }, + x86: { + data: [":libvtswidevine-x86-prebuilts"], + }, + x86_64: { + data: [":libvtswidevine-x86_64-prebuilts"], + }, + }, test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/drm/1.3/vts/functional/AndroidTest.xml b/drm/1.3/vts/functional/AndroidTest.xml new file mode 100644 index 0000000000..338430f010 --- /dev/null +++ b/drm/1.3/vts/functional/AndroidTest.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<configuration description="Runs VtsHalDrmV1_3TargetTest."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-native" /> + + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push-file" key="VtsHalDrmV1_3TargetTest" value="/data/local/tmp/VtsHalDrmV1_3TargetTest" /> + <option name="push-file" key="libvtswidevine64.so" value="/data/local/tmp/64/lib/libvtswidevine.so" /> + <option name="push-file" key="libvtswidevine32.so" value="/data/local/tmp/32/lib/libvtswidevine.so" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="VtsHalDrmV1_3TargetTest" /> + </test> +</configuration> diff --git a/drm/1.3/vts/functional/drm_hal_test.cpp b/drm/1.3/vts/functional/drm_hal_test.cpp index 738f5b28f6..0958c35869 100644 --- a/drm/1.3/vts/functional/drm_hal_test.cpp +++ b/drm/1.3/vts/functional/drm_hal_test.cpp @@ -39,10 +39,10 @@ TEST_P(DrmHalTestV1_3, SignRsaNotAllowed) { } // signRSA - const hidl_vec<uint8_t>& sessionId{}; - const hidl_string& algorithm{}; - const hidl_vec<uint8_t>& message{}; - const hidl_vec<uint8_t>& wrappedKey{}; + const hidl_vec<uint8_t>& sessionId{0}; + const hidl_string& algorithm{"RSASSA-PSS-SHA1"}; + const hidl_vec<uint8_t>& message{0}; + const hidl_vec<uint8_t>& wrappedKey{0}; auto res = drmPlugin_->signRSA( sessionId, algorithm, message, wrappedKey, [&](StatusV1_0 status, const hidl_vec<uint8_t>& signature) { diff --git a/dumpstate/1.0/vts/functional/Android.bp b/dumpstate/1.0/vts/functional/Android.bp index 3bac281598..451b0536fd 100644 --- a/dumpstate/1.0/vts/functional/Android.bp +++ b/dumpstate/1.0/vts/functional/Android.bp @@ -18,5 +18,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalDumpstateV1_0TargetTest.cpp"], static_libs: ["android.hardware.dumpstate@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/dumpstate/1.1/vts/functional/Android.bp b/dumpstate/1.1/vts/functional/Android.bp index 5267706c0b..43a3c21b7c 100644 --- a/dumpstate/1.1/vts/functional/Android.bp +++ b/dumpstate/1.1/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/gatekeeper/1.0/vts/functional/Android.bp b/gatekeeper/1.0/vts/functional/Android.bp index a115285392..1ca966d20f 100644 --- a/gatekeeper/1.0/vts/functional/Android.bp +++ b/gatekeeper/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalGatekeeperV1_0TargetTest.cpp"], static_libs: ["android.hardware.gatekeeper@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/gnss/1.0/vts/functional/Android.bp b/gnss/1.0/vts/functional/Android.bp index d73b32ea8b..45755e6671 100644 --- a/gnss/1.0/vts/functional/Android.bp +++ b/gnss/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalGnssV1_0TargetTest.cpp"], static_libs: ["android.hardware.gnss@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/gnss/1.1/vts/functional/Android.bp b/gnss/1.1/vts/functional/Android.bp index 369a89da39..0d540b7250 100644 --- a/gnss/1.1/vts/functional/Android.bp +++ b/gnss/1.1/vts/functional/Android.bp @@ -33,6 +33,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/gnss/2.0/vts/functional/Android.bp b/gnss/2.0/vts/functional/Android.bp index da5289d006..d67677afe4 100644 --- a/gnss/2.0/vts/functional/Android.bp +++ b/gnss/2.0/vts/functional/Android.bp @@ -31,5 +31,5 @@ cc_test { "android.hardware.gnss@2.1", "android.hardware.gnss@common-vts-lib", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/gnss/2.1/vts/functional/Android.bp b/gnss/2.1/vts/functional/Android.bp index f008a26f1f..b3051d4b48 100644 --- a/gnss/2.1/vts/functional/Android.bp +++ b/gnss/2.1/vts/functional/Android.bp @@ -34,6 +34,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/graphics/composer/2.1/vts/functional/Android.bp b/graphics/composer/2.1/vts/functional/Android.bp index 5f1ed63936..dafbbf9c9e 100644 --- a/graphics/composer/2.1/vts/functional/Android.bp +++ b/graphics/composer/2.1/vts/functional/Android.bp @@ -43,5 +43,5 @@ cc_test { "android.hardware.graphics.composer@2.1-command-buffer", ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/composer/2.2/vts/functional/Android.bp b/graphics/composer/2.2/vts/functional/Android.bp index e38af00a38..e1a254dee4 100644 --- a/graphics/composer/2.2/vts/functional/Android.bp +++ b/graphics/composer/2.2/vts/functional/Android.bp @@ -61,6 +61,6 @@ cc_test { disable_framework: true, test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/graphics/composer/2.3/vts/functional/Android.bp b/graphics/composer/2.3/vts/functional/Android.bp index fa4823efbd..18ea2aa96c 100644 --- a/graphics/composer/2.3/vts/functional/Android.bp +++ b/graphics/composer/2.3/vts/functional/Android.bp @@ -50,5 +50,5 @@ cc_test { "android.hardware.graphics.composer@2.3-command-buffer", ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/composer/2.4/vts/functional/Android.bp b/graphics/composer/2.4/vts/functional/Android.bp index 937af3d4d2..9e7cc46c56 100644 --- a/graphics/composer/2.4/vts/functional/Android.bp +++ b/graphics/composer/2.4/vts/functional/Android.bp @@ -52,5 +52,5 @@ cc_test { "android.hardware.graphics.composer@2.4-command-buffer", ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/mapper/2.0/vts/functional/Android.bp b/graphics/mapper/2.0/vts/functional/Android.bp index a055b61b60..1f7ae04c15 100644 --- a/graphics/mapper/2.0/vts/functional/Android.bp +++ b/graphics/mapper/2.0/vts/functional/Android.bp @@ -24,5 +24,5 @@ cc_test { "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.0-vts", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/mapper/2.1/vts/functional/Android.bp b/graphics/mapper/2.1/vts/functional/Android.bp index bb76c7452a..ccbe40fd96 100644 --- a/graphics/mapper/2.1/vts/functional/Android.bp +++ b/graphics/mapper/2.1/vts/functional/Android.bp @@ -26,5 +26,5 @@ cc_test { "android.hardware.graphics.mapper@2.0-vts", "android.hardware.graphics.mapper@2.1-vts", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/mapper/3.0/vts/functional/Android.bp b/graphics/mapper/3.0/vts/functional/Android.bp index f01670e299..3f4abecdd4 100644 --- a/graphics/mapper/3.0/vts/functional/Android.bp +++ b/graphics/mapper/3.0/vts/functional/Android.bp @@ -26,5 +26,5 @@ cc_test { "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@3.0-vts", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/mapper/4.0/vts/functional/Android.bp b/graphics/mapper/4.0/vts/functional/Android.bp index 3542a6ee89..03abc891c0 100644 --- a/graphics/mapper/4.0/vts/functional/Android.bp +++ b/graphics/mapper/4.0/vts/functional/Android.bp @@ -36,6 +36,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/health/1.0/vts/functional/Android.bp b/health/1.0/vts/functional/Android.bp index be2d20685a..f4a04a7308 100644 --- a/health/1.0/vts/functional/Android.bp +++ b/health/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalHealthV1_0TargetTest.cpp"], static_libs: ["android.hardware.health@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/health/2.0/vts/functional/Android.bp b/health/2.0/vts/functional/Android.bp index 43571efaef..ab14ca75c3 100644 --- a/health/2.0/vts/functional/Android.bp +++ b/health/2.0/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.health@1.0", "android.hardware.health@2.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/health/2.1/vts/functional/Android.bp b/health/2.1/vts/functional/Android.bp index 17472fa2fa..7894ca24a8 100644 --- a/health/2.1/vts/functional/Android.bp +++ b/health/2.1/vts/functional/Android.bp @@ -27,6 +27,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/health/storage/1.0/vts/functional/Android.bp b/health/storage/1.0/vts/functional/Android.bp index 4c703c571f..22010319a2 100644 --- a/health/storage/1.0/vts/functional/Android.bp +++ b/health/storage/1.0/vts/functional/Android.bp @@ -24,7 +24,7 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], test_config: "VtsHalHealthStorageV1_0TargetTest.config", } diff --git a/identity/aidl/vts/Android.bp b/identity/aidl/vts/Android.bp index cecc814fdc..ef8beb4cdf 100644 --- a/identity/aidl/vts/Android.bp +++ b/identity/aidl/vts/Android.bp @@ -17,6 +17,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/input/classifier/1.0/vts/functional/Android.bp b/input/classifier/1.0/vts/functional/Android.bp index 4db1398778..4d6c9c367e 100644 --- a/input/classifier/1.0/vts/functional/Android.bp +++ b/input/classifier/1.0/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/ir/1.0/vts/functional/Android.bp b/ir/1.0/vts/functional/Android.bp index f9edebdb96..160129f8c5 100644 --- a/ir/1.0/vts/functional/Android.bp +++ b/ir/1.0/vts/functional/Android.bp @@ -21,5 +21,5 @@ cc_test { static_libs: [ "android.hardware.ir@1.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/keymaster/3.0/vts/functional/Android.bp b/keymaster/3.0/vts/functional/Android.bp index 36a6861a7d..35b9387132 100644 --- a/keymaster/3.0/vts/functional/Android.bp +++ b/keymaster/3.0/vts/functional/Android.bp @@ -29,5 +29,5 @@ cc_test { "libcrypto_static", "libsoftkeymasterdevice", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/keymaster/4.0/vts/functional/Android.bp b/keymaster/4.0/vts/functional/Android.bp index db500805dc..e706c689e6 100644 --- a/keymaster/4.0/vts/functional/Android.bp +++ b/keymaster/4.0/vts/functional/Android.bp @@ -30,7 +30,7 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/keymaster/4.1/vts/functional/Android.bp b/keymaster/4.1/vts/functional/Android.bp index c2d7fa3547..5ba05ea4ef 100644 --- a/keymaster/4.1/vts/functional/Android.bp +++ b/keymaster/4.1/vts/functional/Android.bp @@ -37,6 +37,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/light/2.0/vts/functional/Android.bp b/light/2.0/vts/functional/Android.bp index 2c0a08fab4..06590c3a15 100644 --- a/light/2.0/vts/functional/Android.bp +++ b/light/2.0/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalLightV2_0TargetTest.cpp"], static_libs: ["android.hardware.light@2.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/light/aidl/vts/functional/Android.bp b/light/aidl/vts/functional/Android.bp index 3dd8cf64ce..aa4719b739 100644 --- a/light/aidl/vts/functional/Android.bp +++ b/light/aidl/vts/functional/Android.bp @@ -30,6 +30,6 @@ cc_test { "android.hardware.light-cpp", ], test_suites: [ - "vts-core", + "vts", ], } diff --git a/media/Android.bp b/media/Android.bp new file mode 100644 index 0000000000..267c02bdf4 --- /dev/null +++ b/media/Android.bp @@ -0,0 +1,27 @@ +// +// Copyright (C) 2020 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. +// + +filegroup { + name: "media_omx_audio_res", + path: "res", + srcs: ["res/*hz*"], +} + +filegroup { + name: "media_omx_video_res", + path: "res", + srcs: ["res/*fps*"], +} diff --git a/media/omx/1.0/vts/functional/README.md b/media/omx/1.0/vts/functional/README.md index 274b30d8be..c5a686747f 100644 --- a/media/omx/1.0/vts/functional/README.md +++ b/media/omx/1.0/vts/functional/README.md @@ -6,29 +6,27 @@ The scope of the tests presented here is not restricted solely to testing omx ha #### master : Functionality of master is to enumerate all the omx components (and the roles it supports) available in android media framework. -usage: VtsHalMediaOmxV1\_0TargetMasterTest -I default +usage: atest VtsHalMediaOmxV1\_0TargetMasterTest #### component : This folder includes test fixtures that tests aspects common to all omx compatible components. For instance, port enabling/disabling, enumerating port formats, state transitions, flush, ..., stay common to all components irrespective of the service they offer. Test fixtures here are directed towards testing these (omx core). Every standard OMX compatible component is expected to pass these tests. -usage: VtsHalMediaOmxV1\_0TargetComponentTest -I default -C <comp name> -R <comp role> +usage: atest VtsHalMediaOmxV1\_0TargetComponentTest #### audio : This folder includes test fixtures associated with testing audio encoder and decoder components such as simple encoding of a raw clip or decoding of an elementary stream, end of stream test, timestamp deviations test, flush test and so on. These tests are aimed towards testing the plugin that connects the component to the omx core. usage: -VtsHalMediaOmxV1\_0TargetAudioDecTest -I default -C <comp name> -R audio_decoder.<comp class> -P /data/local/tmp/media/ +atest VtsHalMediaOmxV1\_0TargetAudioDecTest -VtsHalMediaOmxV1\_0TargetAudioEncTest -I default -C <comp name> -R audio_encoder.<comp class> -P /data/local/tmp/media/ +atest VtsHalMediaOmxV1\_0TargetAudioEncTest #### video : This folder includes test fixtures associated with testing video encoder and decoder components such as simple encoding of a raw clip or decoding of an elementary stream, end of stream test, timestamp deviations test, flush test and so on. These tests are aimed towards testing the plugin that connects the component to the omx core. usage: -VtsHalMediaOmxV1\_0TargetVideoDecTest -I default -C <comp name> -R video_decoder.<comp class> -P /data/local/tmp/media/ +atest VtsHalMediaOmxV1\_0TargetVideoDecTest -VtsHalMediaOmxV1\_0TargetVideoEncTest -I default -C <comp name> -R video_encoder.<comp class> -P /data/local/tmp/media/ - -While tesing audio/video encoder, decoder components, test fixtures require input files. These input are files are present in the folder 'res'. Before running the tests all the files in 'res' have to be placed in '/data/local/tmp/media' or a path of your choice and this path needs to be provided as an argument to the test application +atest VtsHalMediaOmxV1\_0TargetVideoEncTest diff --git a/media/omx/1.0/vts/functional/audio/Android.bp b/media/omx/1.0/vts/functional/audio/Android.bp index 7418bb4226..532521e0fe 100644 --- a/media/omx/1.0/vts/functional/audio/Android.bp +++ b/media/omx/1.0/vts/functional/audio/Android.bp @@ -16,22 +16,30 @@ cc_test { name: "VtsHalMediaOmxV1_0TargetAudioEncTest", + stem: "vts_hal_media_omx_v1_0_audio_enc_test", defaults: ["VtsHalMediaOmxV1_0Defaults"], srcs: [ "VtsHalMediaOmxV1_0TargetAudioEncTest.cpp", - "media_audio_hidl_test_common.cpp" + "media_audio_hidl_test_common.cpp", + ], + data: [":media_omx_audio_res"], + test_config: "VtsHalMediaOmxV1_0TargetAudioEncTest.xml", + test_suites: [ + "vts-core", ], - test_suites: ["general-tests"], } cc_test { name: "VtsHalMediaOmxV1_0TargetAudioDecTest", + stem: "vts_hal_media_omx_v1_0_audio_dec_test", defaults: ["VtsHalMediaOmxV1_0Defaults"], srcs: [ "VtsHalMediaOmxV1_0TargetAudioDecTest.cpp", - "media_audio_hidl_test_common.cpp" + "media_audio_hidl_test_common.cpp", + ], + data: [":media_omx_audio_res"], + test_config: "VtsHalMediaOmxV1_0TargetAudioDecTest.xml", + test_suites: [ + "vts-core", ], - test_suites: ["general-tests"], } - - diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp index 4543c01252..3ed567044a 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp @@ -28,6 +28,8 @@ #include <android/hidl/allocator/1.0/IAllocator.h> #include <android/hidl/memory/1.0/IMapper.h> #include <android/hidl/memory/1.0/IMemory.h> +#include <gtest/gtest.h> +#include <hidl/GtestPrinter.h> using ::android::hardware::media::omx::V1_0::IOmx; using ::android::hardware::media::omx::V1_0::IOmxObserver; @@ -44,48 +46,45 @@ using ::android::hardware::hidl_vec; using ::android::hardware::hidl_string; using ::android::sp; -#include <VtsHalHidlTargetTestBase.h> #include <getopt.h> #include <media_audio_hidl_test_common.h> -#include <media_hidl_test_common.h> #include <fstream> -static ComponentTestEnvironment* gEnv = nullptr; +// Resource directory +std::string sResourceDir = ""; // audio decoder test fixture class -class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { - private: - typedef ::testing::VtsHalHidlTargetTestBase Super; - public: - ::std::string getTestCaseInfo() const override { - return ::std::string() + - "Component: " + gEnv->getComponent().c_str() + " | " + - "Role: " + gEnv->getRole().c_str() + " | " + - "Instance: " + gEnv->getInstance().c_str() + " | " + - "Res: " + gEnv->getRes().c_str(); +class AudioDecHidlTest + : public ::testing::TestWithParam<std::tuple<std::string, std::string, std::string>> { + public: + ::std::string getTestCaseInfo() const { + return ::std::string() + "Component: " + component_ + " | " + "Role: " + role_ + " | " + + "Instance: " + instance_ + " | " + "Res: " + sResourceDir; } virtual void SetUp() override { - Super::SetUp(); + instance_ = std::get<0>(GetParam()); + component_ = std::get<1>(GetParam()); + role_ = std::get<2>(GetParam()); + ASSERT_NE(sResourceDir.empty(), true); + disableTest = false; android::hardware::media::omx::V1_0::Status status; - omx = Super::getService<IOmx>(gEnv->getInstance()); + omx = IOmx::getService(instance_); ASSERT_NE(omx, nullptr); observer = new CodecObserver([this](Message msg, const BufferInfo* buffer) { handleMessage(msg, buffer); }); ASSERT_NE(observer, nullptr); - if (strncmp(gEnv->getComponent().c_str(), "OMX.", 4) != 0) - disableTest = true; - EXPECT_TRUE(omx->allocateNode( - gEnv->getComponent(), observer, - [&](android::hardware::media::omx::V1_0::Status _s, - sp<IOmxNode> const& _nl) { - status = _s; - this->omxNode = _nl; - }) - .isOk()); + if (component_.find("OMX.") != 0) disableTest = true; + EXPECT_TRUE(omx->allocateNode(component_, observer, + [&](android::hardware::media::omx::V1_0::Status _s, + sp<IOmxNode> const& _nl) { + status = _s; + this->omxNode = _nl; + }) + .isOk()); if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) { disableTest = true; std::cout << "[ WARN ] Test Disabled, component not present\n"; @@ -93,7 +92,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { } ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); ASSERT_NE(omxNode, nullptr); - ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role"; + ASSERT_NE(role_.empty(), true) << "Invalid Component Role"; struct StringToName { const char* Name; standardComp CompName; @@ -108,7 +107,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { sizeof(kStringToName) / sizeof(kStringToName[0]); const char* pch; char substring[OMX_MAX_STRINGNAME_SIZE]; - strcpy(substring, gEnv->getRole().c_str()); + strcpy(substring, role_.c_str()); pch = strchr(substring, '.'); ASSERT_NE(pch, nullptr); compName = unknown_comp; @@ -153,11 +152,8 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { timestampDevTest = false; isSecure = false; size_t suffixLen = strlen(".secure"); - if (strlen(gEnv->getComponent().c_str()) >= suffixLen) { - isSecure = - !strcmp(gEnv->getComponent().c_str() + - strlen(gEnv->getComponent().c_str()) - suffixLen, - ".secure"); + if (component_.rfind(".secure") == component_.length() - suffixLen) { + isSecure = true; } if (isSecure) disableTest = true; if (disableTest) std::cout << "[ WARN ] Test Disabled \n"; @@ -172,7 +168,6 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { EXPECT_TRUE((omxNode->freeNode()).isOk()); omxNode = nullptr; } - Super::TearDown(); } // callback function to process messages received by onMessages() from IL @@ -249,6 +244,10 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { unknown_comp, }; + std::string component_; + std::string role_; + std::string instance_; + sp<IOmx> omx; sp<CodecObserver> observer; sp<IOmxNode> omxNode; @@ -656,21 +655,21 @@ void decodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer, } // set component role -TEST_F(AudioDecHidlTest, SetRole) { +TEST_P(AudioDecHidlTest, SetRole) { description("Test Set Component Role"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); } // port format enumeration -TEST_F(AudioDecHidlTest, EnumeratePortFormat) { +TEST_P(AudioDecHidlTest, EnumeratePortFormat) { description("Test Component on Mandatory Port Parameters (Port Format)"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamAudioInit, ¶ms); @@ -687,12 +686,12 @@ TEST_F(AudioDecHidlTest, EnumeratePortFormat) { // test port settings reconfiguration, elementary stream decode and timestamp // deviation -TEST_F(AudioDecHidlTest, DecodeTest) { +TEST_P(AudioDecHidlTest, DecodeTest) { description("Tests Port Reconfiguration, Decode and timestamp deviation"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamAudioInit, ¶ms); @@ -702,8 +701,8 @@ TEST_F(AudioDecHidlTest, DecodeTest) { kPortIndexOutput = kPortIndexInput + 1; } char mURL[512], info[512]; - strcpy(mURL, gEnv->getRes().c_str()); - strcpy(info, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); + strcpy(info, sResourceDir.c_str()); GetURLForComponent(compName, mURL, info); std::ifstream eleStream, eleInfo; @@ -776,12 +775,12 @@ TEST_F(AudioDecHidlTest, DecodeTest) { } // end of sequence test -TEST_F(AudioDecHidlTest, EOSTest_M) { +TEST_P(AudioDecHidlTest, EOSTest_M) { description("Test end of stream monkeying"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamAudioInit, ¶ms); @@ -840,12 +839,12 @@ TEST_F(AudioDecHidlTest, EOSTest_M) { } // end of sequence test -TEST_F(AudioDecHidlTest, ThumbnailTest) { +TEST_P(AudioDecHidlTest, ThumbnailTest) { description("Test Request for thumbnail"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamAudioInit, ¶ms); @@ -855,8 +854,8 @@ TEST_F(AudioDecHidlTest, ThumbnailTest) { kPortIndexOutput = kPortIndexInput + 1; } char mURL[512], info[512]; - strcpy(mURL, gEnv->getRes().c_str()); - strcpy(info, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); + strcpy(info, sResourceDir.c_str()); GetURLForComponent(compName, mURL, info); std::ifstream eleStream, eleInfo; @@ -954,12 +953,12 @@ TEST_F(AudioDecHidlTest, ThumbnailTest) { } // end of sequence test -TEST_F(AudioDecHidlTest, SimpleEOSTest) { +TEST_P(AudioDecHidlTest, SimpleEOSTest) { description("Test end of stream"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamAudioInit, ¶ms); @@ -969,8 +968,8 @@ TEST_F(AudioDecHidlTest, SimpleEOSTest) { kPortIndexOutput = kPortIndexInput + 1; } char mURL[512], info[512]; - strcpy(mURL, gEnv->getRes().c_str()); - strcpy(info, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); + strcpy(info, sResourceDir.c_str()); GetURLForComponent(compName, mURL, info); std::ifstream eleStream, eleInfo; @@ -1046,12 +1045,12 @@ TEST_F(AudioDecHidlTest, SimpleEOSTest) { } // test input/output port flush -TEST_F(AudioDecHidlTest, FlushTest) { +TEST_P(AudioDecHidlTest, FlushTest) { description("Test Flush"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamAudioInit, ¶ms); @@ -1061,8 +1060,8 @@ TEST_F(AudioDecHidlTest, FlushTest) { kPortIndexOutput = kPortIndexInput + 1; } char mURL[512], info[512]; - strcpy(mURL, gEnv->getRes().c_str()); - strcpy(info, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); + strcpy(info, sResourceDir.c_str()); GetURLForComponent(compName, mURL, info); std::ifstream eleStream, eleInfo; @@ -1153,15 +1152,21 @@ TEST_F(AudioDecHidlTest, FlushTest) { kPortIndexOutput)); } +INSTANTIATE_TEST_SUITE_P(PerInstance, AudioDecHidlTest, testing::ValuesIn(kTestParameters), + android::hardware::PrintInstanceTupleNameToString<>); + int main(int argc, char** argv) { - gEnv = new ComponentTestEnvironment(); - ::testing::AddGlobalTestEnvironment(gEnv); + kTestParameters = getTestParameters("audio_decoder"); ::testing::InitGoogleTest(&argc, argv); - gEnv->init(&argc, argv); - int status = gEnv->initFromOptions(argc, argv); - if (status == 0) { - status = RUN_ALL_TESTS(); - ALOGI("Test result = %d", status); + + // Set the resource directory based on command line args. + // Test will fail to set up if the argument is not set. + for (int i = 1; i < argc; i++) { + if (strcmp(argv[i], "-P") == 0 && i < argc - 1) { + sResourceDir = argv[i + 1]; + break; + } } - return status; -} + + return RUN_ALL_TESTS(); +}
\ No newline at end of file diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.xml b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.xml new file mode 100644 index 0000000000..275fefe597 --- /dev/null +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<configuration description="Runs VtsHalMediaOmxV1_0TargetAudioDecTest."> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push-file" key="vts_hal_media_omx_v1_0_audio_dec_test" value="/data/local/tmp/vts_hal_media_omx_v1_0_audio_dec_test" /> + + <!-- Files used for audio testing --> + <option name="push-file" key="bbb_aac_stereo_128kbps_48000hz.aac" value="/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz.aac" /> + <option name="push-file" key="bbb_aac_stereo_128kbps_48000hz.info" value="/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz.info" /> + <option name="push-file" key="bbb_amrwb_1ch_14kbps_16000hz.amrwb" value="/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz.amrwb" /> + <option name="push-file" key="bbb_amrwb_1ch_14kbps_16000hz.info" value="/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz.info" /> + <option name="push-file" key="bbb_flac_stereo_680kbps_48000hz.flac" value="/data/local/tmp/media/bbb_flac_stereo_680kbps_48000hz.flac" /> + <option name="push-file" key="bbb_flac_stereo_680kbps_48000hz.info" value="/data/local/tmp/media/bbb_flac_stereo_680kbps_48000hz.info" /> + <option name="push-file" key="bbb_g711alaw_1ch_8khz.info" value="/data/local/tmp/media/bbb_g711alaw_1ch_8khz.info" /> + <option name="push-file" key="bbb_g711alaw_1ch_8khz.raw" value="/data/local/tmp/media/bbb_g711alaw_1ch_8khz.raw" /> + <option name="push-file" key="bbb_g711mulaw_1ch_8khz.info" value="/data/local/tmp/media/bbb_g711mulaw_1ch_8khz.info" /> + <option name="push-file" key="bbb_g711mulaw_1ch_8khz.raw" value="/data/local/tmp/media/bbb_g711mulaw_1ch_8khz.raw" /> + <option name="push-file" key="bbb_gsm_1ch_8khz_13kbps.info" value="/data/local/tmp/media/bbb_gsm_1ch_8khz_13kbps.info" /> + <option name="push-file" key="bbb_gsm_1ch_8khz_13kbps.raw" value="/data/local/tmp/media/bbb_gsm_1ch_8khz_13kbps.raw" /> + <option name="push-file" key="bbb_mp3_stereo_192kbps_48000hz.info" value="/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz.info" /> + <option name="push-file" key="bbb_mp3_stereo_192kbps_48000hz.mp3" value="/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz.mp3" /> + <option name="push-file" key="bbb_opus_stereo_128kbps_48000hz.info" value="/data/local/tmp/media/bbb_opus_stereo_128kbps_48000hz.info" /> + <option name="push-file" key="bbb_opus_stereo_128kbps_48000hz.opus" value="/data/local/tmp/media/bbb_opus_stereo_128kbps_48000hz.opus" /> + <option name="push-file" key="bbb_raw_1ch_16khz_s16le.raw" value="/data/local/tmp/media/bbb_raw_1ch_16khz_s16le.raw" /> + <option name="push-file" key="bbb_raw_1ch_8khz_s16le.raw" value="/data/local/tmp/media/bbb_raw_1ch_8khz_s16le.raw" /> + <option name="push-file" key="bbb_raw_1ch_8khz_s32le.info" value="/data/local/tmp/media/bbb_raw_1ch_8khz_s32le.info" /> + <option name="push-file" key="bbb_raw_1ch_8khz_s32le.raw" value="/data/local/tmp/media/bbb_raw_1ch_8khz_s32le.raw" /> + <option name="push-file" key="bbb_raw_2ch_48khz_s16le.raw" value="/data/local/tmp/media/bbb_raw_2ch_48khz_s16le.raw" /> + <option name="push-file" key="bbb_vorbis_stereo_128kbps_48000hz.info" value="/data/local/tmp/media/bbb_vorbis_stereo_128kbps_48000hz.info" /> + <option name="push-file" key="bbb_vorbis_stereo_128kbps_48000hz.vorbis" value="/data/local/tmp/media/bbb_vorbis_stereo_128kbps_48000hz.vorbis" /> + <option name="push-file" key="sine_amrnb_1ch_12kbps_8000hz.amrnb" value="/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz.amrnb" /> + <option name="push-file" key="sine_amrnb_1ch_12kbps_8000hz.info" value="/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz.info" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="vts_hal_media_omx_v1_0_audio_dec_test" /> + <option name="native-test-flag" value="-P /data/local/tmp/media/" /> + </test> +</configuration>
\ No newline at end of file diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp index 0ebab886e4..32e6f4ce59 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp @@ -28,6 +28,8 @@ #include <android/hidl/allocator/1.0/IAllocator.h> #include <android/hidl/memory/1.0/IMapper.h> #include <android/hidl/memory/1.0/IMemory.h> +#include <gtest/gtest.h> +#include <hidl/GtestPrinter.h> using ::android::hardware::media::omx::V1_0::IOmx; using ::android::hardware::media::omx::V1_0::IOmxObserver; @@ -44,48 +46,45 @@ using ::android::hardware::hidl_vec; using ::android::hardware::hidl_string; using ::android::sp; -#include <VtsHalHidlTargetTestBase.h> #include <getopt.h> #include <media_audio_hidl_test_common.h> -#include <media_hidl_test_common.h> #include <fstream> -static ComponentTestEnvironment* gEnv = nullptr; +// Resource directory +std::string sResourceDir = ""; // audio encoder test fixture class -class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { - private: - typedef ::testing::VtsHalHidlTargetTestBase Super; - public: - ::std::string getTestCaseInfo() const override { - return ::std::string() + - "Component: " + gEnv->getComponent().c_str() + " | " + - "Role: " + gEnv->getRole().c_str() + " | " + - "Instance: " + gEnv->getInstance().c_str() + " | " + - "Res: " + gEnv->getRes().c_str(); +class AudioEncHidlTest + : public ::testing::TestWithParam<std::tuple<std::string, std::string, std::string>> { + public: + ::std::string getTestCaseInfo() const { + return ::std::string() + "Component: " + component_ + " | " + "Role: " + role_ + " | " + + "Instance: " + instance_ + " | " + "Res: " + sResourceDir; } virtual void SetUp() override { - Super::SetUp(); + instance_ = std::get<0>(GetParam()); + component_ = std::get<1>(GetParam()); + role_ = std::get<2>(GetParam()); + ASSERT_NE(sResourceDir.empty(), true); + disableTest = false; android::hardware::media::omx::V1_0::Status status; - omx = Super::getService<IOmx>(gEnv->getInstance()); + omx = IOmx::getService(instance_); ASSERT_NE(omx, nullptr); observer = new CodecObserver([this](Message msg, const BufferInfo* buffer) { handleMessage(msg, buffer); }); ASSERT_NE(observer, nullptr); - if (strncmp(gEnv->getComponent().c_str(), "OMX.", 4) != 0) - disableTest = true; - EXPECT_TRUE(omx->allocateNode( - gEnv->getComponent(), observer, - [&](android::hardware::media::omx::V1_0::Status _s, - sp<IOmxNode> const& _nl) { - status = _s; - this->omxNode = _nl; - }) - .isOk()); + if (component_.find("OMX.") != 0) disableTest = true; + EXPECT_TRUE(omx->allocateNode(component_, observer, + [&](android::hardware::media::omx::V1_0::Status _s, + sp<IOmxNode> const& _nl) { + status = _s; + this->omxNode = _nl; + }) + .isOk()); if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) { disableTest = true; std::cout << "[ WARN ] Test Disabled, component not present\n"; @@ -93,7 +92,7 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { } ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); ASSERT_NE(omxNode, nullptr); - ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role"; + ASSERT_NE(role_.empty(), true) << "Invalid Component Role"; struct StringToName { const char* Name; standardComp CompName; @@ -105,7 +104,7 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { sizeof(kStringToName) / sizeof(kStringToName[0]); const char* pch; char substring[OMX_MAX_STRINGNAME_SIZE]; - strcpy(substring, gEnv->getRole().c_str()); + strcpy(substring, role_.c_str()); pch = strchr(substring, '.'); ASSERT_NE(pch, nullptr); compName = unknown_comp; @@ -149,7 +148,6 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { EXPECT_TRUE((omxNode->freeNode()).isOk()); omxNode = nullptr; } - Super::TearDown(); } // callback function to process messages received by onMessages() from IL @@ -190,6 +188,10 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { unknown_comp, }; + std::string component_; + std::string role_; + std::string instance_; + sp<IOmx> omx; sp<CodecObserver> observer; sp<IOmxNode> omxNode; @@ -364,21 +366,21 @@ void encodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer, } // set component role -TEST_F(AudioEncHidlTest, SetRole) { +TEST_P(AudioEncHidlTest, SetRole) { description("Test Set Component Role"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_.c_str()); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); } // port format enumeration -TEST_F(AudioEncHidlTest, EnumeratePortFormat) { +TEST_P(AudioEncHidlTest, EnumeratePortFormat) { description("Test Component on Mandatory Port Parameters (Port Format)"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamAudioInit, ¶ms); @@ -394,12 +396,12 @@ TEST_F(AudioEncHidlTest, EnumeratePortFormat) { } // test raw stream encode -TEST_F(AudioEncHidlTest, SimpleEncodeTest) { +TEST_P(AudioEncHidlTest, SimpleEncodeTest) { description("Tests Basic encoding and EOS"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamAudioInit, ¶ms); @@ -409,7 +411,7 @@ TEST_F(AudioEncHidlTest, SimpleEncodeTest) { kPortIndexOutput = kPortIndexInput + 1; } char mURL[512]; - strcpy(mURL, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); GetURLForComponent(compName, mURL); std::ifstream eleStream; @@ -484,15 +486,21 @@ TEST_F(AudioEncHidlTest, SimpleEncodeTest) { kPortIndexOutput)); } +INSTANTIATE_TEST_SUITE_P(PerInstance, AudioEncHidlTest, testing::ValuesIn(kTestParameters), + android::hardware::PrintInstanceTupleNameToString<>); + int main(int argc, char** argv) { - gEnv = new ComponentTestEnvironment(); - ::testing::AddGlobalTestEnvironment(gEnv); + kTestParameters = getTestParameters("audio_encoder"); ::testing::InitGoogleTest(&argc, argv); - gEnv->init(&argc, argv); - int status = gEnv->initFromOptions(argc, argv); - if (status == 0) { - status = RUN_ALL_TESTS(); - ALOGI("Test result = %d", status); + + // Set the resource directory based on command line args. + // Test will fail to set up if the argument is not set. + for (int i = 1; i < argc; i++) { + if (strcmp(argv[i], "-P") == 0 && i < argc - 1) { + sResourceDir = argv[i + 1]; + break; + } } - return status; -} + + return RUN_ALL_TESTS(); +}
\ No newline at end of file diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.xml b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.xml new file mode 100644 index 0000000000..88b6c87d45 --- /dev/null +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<configuration description="Runs VtsHalMediaOmxV1_0TargetAudioEncTest."> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push-file" key="vts_hal_media_omx_v1_0_audio_enc_test" value="/data/local/tmp/vts_hal_media_omx_v1_0_audio_enc_test" /> + + <!-- Files used for audio testing --> + <option name="push-file" key="bbb_aac_stereo_128kbps_48000hz.aac" value="/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz.aac" /> + <option name="push-file" key="bbb_aac_stereo_128kbps_48000hz.info" value="/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz.info" /> + <option name="push-file" key="bbb_amrwb_1ch_14kbps_16000hz.amrwb" value="/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz.amrwb" /> + <option name="push-file" key="bbb_amrwb_1ch_14kbps_16000hz.info" value="/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz.info" /> + <option name="push-file" key="bbb_flac_stereo_680kbps_48000hz.flac" value="/data/local/tmp/media/bbb_flac_stereo_680kbps_48000hz.flac" /> + <option name="push-file" key="bbb_flac_stereo_680kbps_48000hz.info" value="/data/local/tmp/media/bbb_flac_stereo_680kbps_48000hz.info" /> + <option name="push-file" key="bbb_g711alaw_1ch_8khz.info" value="/data/local/tmp/media/bbb_g711alaw_1ch_8khz.info" /> + <option name="push-file" key="bbb_g711alaw_1ch_8khz.raw" value="/data/local/tmp/media/bbb_g711alaw_1ch_8khz.raw" /> + <option name="push-file" key="bbb_g711mulaw_1ch_8khz.info" value="/data/local/tmp/media/bbb_g711mulaw_1ch_8khz.info" /> + <option name="push-file" key="bbb_g711mulaw_1ch_8khz.raw" value="/data/local/tmp/media/bbb_g711mulaw_1ch_8khz.raw" /> + <option name="push-file" key="bbb_gsm_1ch_8khz_13kbps.info" value="/data/local/tmp/media/bbb_gsm_1ch_8khz_13kbps.info" /> + <option name="push-file" key="bbb_gsm_1ch_8khz_13kbps.raw" value="/data/local/tmp/media/bbb_gsm_1ch_8khz_13kbps.raw" /> + <option name="push-file" key="bbb_mp3_stereo_192kbps_48000hz.info" value="/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz.info" /> + <option name="push-file" key="bbb_mp3_stereo_192kbps_48000hz.mp3" value="/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz.mp3" /> + <option name="push-file" key="bbb_opus_stereo_128kbps_48000hz.info" value="/data/local/tmp/media/bbb_opus_stereo_128kbps_48000hz.info" /> + <option name="push-file" key="bbb_opus_stereo_128kbps_48000hz.opus" value="/data/local/tmp/media/bbb_opus_stereo_128kbps_48000hz.opus" /> + <option name="push-file" key="bbb_raw_1ch_16khz_s16le.raw" value="/data/local/tmp/media/bbb_raw_1ch_16khz_s16le.raw" /> + <option name="push-file" key="bbb_raw_1ch_8khz_s16le.raw" value="/data/local/tmp/media/bbb_raw_1ch_8khz_s16le.raw" /> + <option name="push-file" key="bbb_raw_1ch_8khz_s32le.info" value="/data/local/tmp/media/bbb_raw_1ch_8khz_s32le.info" /> + <option name="push-file" key="bbb_raw_1ch_8khz_s32le.raw" value="/data/local/tmp/media/bbb_raw_1ch_8khz_s32le.raw" /> + <option name="push-file" key="bbb_raw_2ch_48khz_s16le.raw" value="/data/local/tmp/media/bbb_raw_2ch_48khz_s16le.raw" /> + <option name="push-file" key="bbb_vorbis_stereo_128kbps_48000hz.info" value="/data/local/tmp/media/bbb_vorbis_stereo_128kbps_48000hz.info" /> + <option name="push-file" key="bbb_vorbis_stereo_128kbps_48000hz.vorbis" value="/data/local/tmp/media/bbb_vorbis_stereo_128kbps_48000hz.vorbis" /> + <option name="push-file" key="sine_amrnb_1ch_12kbps_8000hz.amrnb" value="/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz.amrnb" /> + <option name="push-file" key="sine_amrnb_1ch_12kbps_8000hz.info" value="/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz.info" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="vts_hal_media_omx_v1_0_audio_enc_test" /> + <option name="native-test-flag" value="-P /data/local/tmp/media/" /> + </test> +</configuration>
\ No newline at end of file diff --git a/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp b/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp index e7ae083012..7c3b23f097 100644 --- a/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp +++ b/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp @@ -44,7 +44,6 @@ using ::android::hardware::hidl_vec; using ::android::hardware::hidl_string; using ::android::sp; -#include <VtsHalHidlTargetTestBase.h> #include <hidlmemory/mapping.h> #include <media_audio_hidl_test_common.h> #include <media_hidl_test_common.h> diff --git a/media/omx/1.0/vts/functional/common/Android.bp b/media/omx/1.0/vts/functional/common/Android.bp index 5a79e55426..2c024a0c0c 100644 --- a/media/omx/1.0/vts/functional/common/Android.bp +++ b/media/omx/1.0/vts/functional/common/Android.bp @@ -23,7 +23,7 @@ cc_library_static { export_include_dirs: ["."], static_libs: [ - "VtsHalHidlTargetTestBase", + "libgtest", "libhidlmemory", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", diff --git a/media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp b/media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp index 8d4c022013..d9d11571c4 100644 --- a/media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp +++ b/media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp @@ -56,17 +56,16 @@ using ::android::hardware::hidl_vec; using ::android::hardware::hidl_string; using ::android::sp; -#include <VtsHalHidlTargetTestBase.h> #include <hidlmemory/mapping.h> #include <media/hardware/HardwareAPI.h> #include <media_hidl_test_common.h> #include <memory> // set component role -Return<android::hardware::media::omx::V1_0::Status> setRole( - sp<IOmxNode> omxNode, const char* role) { +Return<android::hardware::media::omx::V1_0::Status> setRole(sp<IOmxNode> omxNode, + const std::string& role) { OMX_PARAM_COMPONENTROLETYPE params; - strcpy((char*)params.cRole, role); + strcpy((char*)params.cRole, role.c_str()); return setParam(omxNode, OMX_IndexParamStandardComponentRole, ¶ms); } @@ -759,3 +758,46 @@ void testEOS(sp<IOmxNode> omxNode, sp<CodecObserver> observer, EXPECT_EQ(eosFlag, true); eosFlag = false; } + +hidl_vec<IOmx::ComponentInfo> getComponentInfoList(sp<IOmx> omx) { + android::hardware::media::omx::V1_0::Status status; + hidl_vec<IOmx::ComponentInfo> nodeList; + omx->listNodes([&status, &nodeList](android::hardware::media::omx::V1_0::Status _s, + hidl_vec<IOmx::ComponentInfo> const& _nl) { + status = _s; + nodeList = _nl; + }); + if (status != android::hardware::media::omx::V1_0::Status::OK) { + ALOGE("Failed to get ComponentInfo list for IOmx."); + } + return nodeList; +} + +// Return all test parameters, a list of tuple of <instance, component, role> +const std::vector<std::tuple<std::string, std::string, std::string>>& getTestParameters( + const std::string& filter) { + static std::vector<std::tuple<std::string, std::string, std::string>> parameters; + + auto instances = android::hardware::getAllHalInstanceNames(IOmx::descriptor); + for (std::string instance : instances) { + sp<IOmx> omx = IOmx::getService(instance); + hidl_vec<IOmx::ComponentInfo> componentInfos = getComponentInfoList(omx); + for (IOmx::ComponentInfo info : componentInfos) { + for (std::string role : info.mRoles) { + if (filter.empty()) { + if (kWhiteListRoles.find(role.c_str()) == kWhiteListRoles.end()) { + // This is for component test and the role is not in the white list. + continue; + } + } else if (role.find(filter) == std::string::npos) { + // The role doesn't match the given filter, e.g., video_decoder_vp8 role doesn't + // need to run for audio_decoder tests. + continue; + } + parameters.push_back(std::make_tuple(instance, info.mName.c_str(), role.c_str())); + } + } + } + + return parameters; +}
\ No newline at end of file diff --git a/media/omx/1.0/vts/functional/common/media_hidl_test_common.h b/media/omx/1.0/vts/functional/common/media_hidl_test_common.h index ac077a3c76..bb03dd0341 100644 --- a/media/omx/1.0/vts/functional/common/media_hidl_test_common.h +++ b/media/omx/1.0/vts/functional/common/media_hidl_test_common.h @@ -32,6 +32,8 @@ #include <android/hardware/graphics/mapper/2.0/types.h> #include <android/hardware/graphics/mapper/3.0/IMapper.h> #include <android/hardware/graphics/mapper/3.0/types.h> +#include <gtest/gtest.h> +#include <hidl/ServiceManagement.h> #include <media/stagefright/foundation/ALooper.h> #include <utils/Condition.h> #include <utils/List.h> @@ -44,8 +46,6 @@ #include <media/openmax/OMX_AudioExt.h> #include <media/openmax/OMX_VideoExt.h> -#include <VtsHalHidlTargetTestEnvBase.h> - /* TIME OUTS (Wait time in dequeueMessage()) */ /* As component is switching states (loaded<->idle<->execute), dequeueMessage() @@ -78,6 +78,20 @@ enum bufferOwner { unknown, }; +// White list audio/video roles to be tested. +static std::set<std::string> kWhiteListRoles{ + "audio_encoder.aac", "audio_encoder.amrnb", "audio_encoder.amrwb", + "audio_encoder.flac", "audio_decoder.aac", "audio_decoder.amrnb", + "audio_decoder.amrwb", "audio_decoder.flac", "audio_decoder.g711alaw", + "audio_decoder.g711mlaw", "audio_decoder.gsm", "audio_decoder.mp3", + "audio_decoder.opus", "audio_decoder.raw", "audio_decoder.vorbis", + "video_encoder.avc", "video_encoder.h263", "video_encoder.mpeg4", + "video_encoder.vp8", "video_encoder.vp9", "video_decoder.avc", + "video_decoder.h263", "video_decoder.hevc", "video_decoder.mpeg4", + "video_decoder.vp8", "video_decoder.vp9"}; + +static std::vector<std::tuple<std::string, std::string, std::string>> kTestParameters; + /* * TODO: below definitions are borrowed from Conversion.h. * This is not the ideal way to do it. Loose these definitions once you @@ -328,8 +342,8 @@ struct GrallocV3 { using Rect = IMapper::Rect; }; -Return<android::hardware::media::omx::V1_0::Status> setRole( - sp<IOmxNode> omxNode, const char* role); +Return<android::hardware::media::omx::V1_0::Status> setRole(sp<IOmxNode> omxNode, + const std::string& role); Return<android::hardware::media::omx::V1_0::Status> setPortBufferSize( sp<IOmxNode> omxNode, OMX_U32 portIndex, OMX_U32 size); @@ -400,77 +414,10 @@ void testEOS(sp<IOmxNode> omxNode, sp<CodecObserver> observer, portreconfig fptr = nullptr, OMX_U32 kPortIndexInput = 0, OMX_U32 kPortIndexOutput = 1, void* args = nullptr); -// A class for test environment setup -class ComponentTestEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase { - private: - typedef ::testing::VtsHalHidlTargetTestEnvBase Super; - - public: - virtual void registerTestServices() override { registerTestService<IOmx>(); } - - ComponentTestEnvironment() : res("/data/local/tmp/media/") {} - - void setComponent(const char* _component) { component = _component; } - - void setRole(const char* _role) { role = _role; } - - void setRes(const char* _res) { res = _res; } - - const hidl_string getInstance() { return Super::getServiceName<IOmx>(); } - - const hidl_string getComponent() const { return component; } - - const hidl_string getRole() const { return role; } +hidl_vec<IOmx::ComponentInfo> getComponentInfoList(sp<IOmx> omx); - const hidl_string getRes() const { return res; } - - int initFromOptions(int argc, char** argv) { - static struct option options[] = {{"component", required_argument, 0, 'C'}, - {"role", required_argument, 0, 'R'}, - {"res", required_argument, 0, 'P'}, - {0, 0, 0, 0}}; - - while (true) { - int index = 0; - int c = getopt_long(argc, argv, "C:R:P:", options, &index); - if (c == -1) { - break; - } - - switch (c) { - case 'C': - setComponent(optarg); - break; - case 'R': - setRole(optarg); - break; - case 'P': - setRes(optarg); - break; - case '?': - break; - } - } - - if (optind < argc) { - fprintf(stderr, - "unrecognized option: %s\n\n" - "usage: %s <gtest options> <test options>\n\n" - "test options are:\n\n" - "-C, --component: OMX component to test\n" - "-R, --role: OMX component Role\n" - "-P, --res: Resource files directory location\n", - argv[optind ?: 1], argv[0]); - return 2; - } - return 0; - } - - private: - hidl_string instance; - hidl_string component; - hidl_string role; - hidl_string res; -}; +// Return all test parameters, a list of tuple of <instance, component, role> +const std::vector<std::tuple<std::string, std::string, std::string>>& getTestParameters( + const std::string& filter); #endif // MEDIA_HIDL_TEST_COMMON_H diff --git a/media/omx/1.0/vts/functional/component/Android.bp b/media/omx/1.0/vts/functional/component/Android.bp index 970eabe6fc..c7be2cc8d9 100644 --- a/media/omx/1.0/vts/functional/component/Android.bp +++ b/media/omx/1.0/vts/functional/component/Android.bp @@ -18,6 +18,7 @@ cc_test { name: "VtsHalMediaOmxV1_0TargetComponentTest", defaults: ["VtsHalMediaOmxV1_0Defaults"], srcs: ["VtsHalMediaOmxV1_0TargetComponentTest.cpp"], - test_suites: ["general-tests"], + test_suites: [ + "vts-core", + ], } - diff --git a/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp b/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp index 1c1d39b4e0..01cec6d9ea 100644 --- a/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp +++ b/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp @@ -28,6 +28,8 @@ #include <android/hidl/allocator/1.0/IAllocator.h> #include <android/hidl/memory/1.0/IMapper.h> #include <android/hidl/memory/1.0/IMemory.h> +#include <gtest/gtest.h> +#include <hidl/GtestPrinter.h> using ::android::hardware::media::omx::V1_0::IOmx; using ::android::hardware::media::omx::V1_0::IOmxObserver; @@ -44,42 +46,37 @@ using ::android::hardware::hidl_vec; using ::android::hardware::hidl_string; using ::android::sp; -#include <VtsHalHidlTargetTestBase.h> #include <getopt.h> #include <media_hidl_test_common.h> -static ComponentTestEnvironment* gEnv = nullptr; - // generic component test fixture class -class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase { - private: - typedef ::testing::VtsHalHidlTargetTestBase Super; - public: - ::std::string getTestCaseInfo() const override { - return ::std::string() + - "Component: " + gEnv->getComponent().c_str() + " | " + - "Role: " + gEnv->getRole().c_str() + " | " + - "Instance: " + gEnv->getInstance().c_str(); +class ComponentHidlTest + : public ::testing::TestWithParam<std::tuple<std::string, std::string, std::string>> { + public: + ::std::string getTestCaseInfo() const { + return ::std::string() + "Component: " + component_ + " | " + "Role: " + role_ + " | " + + "Instance: " + instance_; } virtual void SetUp() override { - Super::SetUp(); + instance_ = std::get<0>(GetParam()); + component_ = std::get<1>(GetParam()); + role_ = std::get<2>(GetParam()); + disableTest = false; android::hardware::media::omx::V1_0::Status status; - omx = Super::getService<IOmx>(gEnv->getInstance()); + omx = IOmx::getService(instance_); ASSERT_NE(omx, nullptr); observer = new CodecObserver(nullptr); ASSERT_NE(observer, nullptr); - if (strncmp(gEnv->getComponent().c_str(), "OMX.", 4) != 0) - disableTest = true; - EXPECT_TRUE(omx->allocateNode( - gEnv->getComponent(), observer, - [&](android::hardware::media::omx::V1_0::Status _s, - sp<IOmxNode> const& _nl) { - status = _s; - this->omxNode = _nl; - }) - .isOk()); + if (component_.find("OMX.") != 0) disableTest = true; + EXPECT_TRUE(omx->allocateNode(component_, observer, + [&](android::hardware::media::omx::V1_0::Status _s, + sp<IOmxNode> const& _nl) { + status = _s; + this->omxNode = _nl; + }) + .isOk()); if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) { disableTest = true; std::cout << "[ WARN ] Test Disabled, component not present\n"; @@ -87,7 +84,7 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase { } ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK); ASSERT_NE(omxNode, nullptr); - ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role"; + ASSERT_NE(role_.empty(), true) << "Invalid Component Role"; struct StringToClass { const char* Class; standardCompClass CompClass; @@ -102,7 +99,7 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase { sizeof(kStringToClass) / sizeof(kStringToClass[0]); const char* pch; char substring[OMX_MAX_STRINGNAME_SIZE]; - strcpy(substring, gEnv->getRole().c_str()); + strcpy(substring, role_.c_str()); pch = strchr(substring, '.'); ASSERT_NE(pch, nullptr) << "Invalid Component Role"; substring[pch - substring] = '\0'; @@ -117,11 +114,8 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase { isSecure = false; mTunnel = false; size_t suffixLen = strlen(".secure"); - if (strlen(gEnv->getComponent().c_str()) >= suffixLen) { - isSecure = - !strcmp(gEnv->getComponent().c_str() + - strlen(gEnv->getComponent().c_str()) - suffixLen, - ".secure"); + if (component_.rfind(".secure") == component_.length() - suffixLen) { + isSecure = true; } if (compClass == video_decoder) { omxNode->configureVideoTunnelMode( @@ -147,7 +141,6 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase { EXPECT_TRUE((omxNode->freeNode()).isOk()); omxNode = nullptr; } - Super::TearDown(); } enum standardCompClass { @@ -158,6 +151,10 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase { unknown_class, }; + std::string component_; + std::string role_; + std::string instance_; + sp<IOmx> omx; sp<CodecObserver> observer; sp<IOmxNode> omxNode; @@ -191,7 +188,7 @@ void initPortMode(PortMode* pm, bool isSecure, } // test dispatch message API call -TEST_F(ComponentHidlTest, dispatchMsg) { +TEST_P(ComponentHidlTest, dispatchMsg) { description("test dispatch message API call"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; @@ -216,22 +213,22 @@ TEST_F(ComponentHidlTest, dispatchMsg) { } // set component role -TEST_F(ComponentHidlTest, SetRole) { +TEST_P(ComponentHidlTest, SetRole) { description("Test Set Component Role"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); } // port indices enumeration -TEST_F(ComponentHidlTest, DISABLED_GetPortIndices) { +TEST_P(ComponentHidlTest, DISABLED_GetPortIndices) { description("Test Component on Mandatory Port Parameters (Port Indices)"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; OMX_PORT_PARAM_TYPE params; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); // Get Number of Ports and their Indices for all Domains @@ -248,13 +245,13 @@ TEST_F(ComponentHidlTest, DISABLED_GetPortIndices) { } // port format enumeration -TEST_F(ComponentHidlTest, EnumeratePortFormat) { +TEST_P(ComponentHidlTest, EnumeratePortFormat) { description("Test Component on Mandatory Port Parameters (Port Format)"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -308,14 +305,14 @@ TEST_F(ComponentHidlTest, EnumeratePortFormat) { } // get/set default port settings of a component -TEST_F(ComponentHidlTest, DISABLED_SetDefaultPortParams) { +TEST_P(ComponentHidlTest, DISABLED_SetDefaultPortParams) { description( "Test Component on Mandatory Port Parameters (Port Definition)"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -398,7 +395,7 @@ TEST_F(ComponentHidlTest, DISABLED_SetDefaultPortParams) { portDef = mirror; OMX_U32 nBufferSize = portDef.nBufferSize >> 1; if (nBufferSize != 0) { - if (!strncmp(gEnv->getComponent().c_str(), "OMX.google.", 11)) { + if (component_.find("OMX.google.") != 0) { portDef.nBufferSize = nBufferSize; } else { // Probable alignment requirements of vendor component @@ -438,13 +435,13 @@ TEST_F(ComponentHidlTest, DISABLED_SetDefaultPortParams) { } // populate port test -TEST_F(ComponentHidlTest, DISABLED_PopulatePort) { +TEST_P(ComponentHidlTest, DISABLED_PopulatePort) { description("Verify bPopulated field of a component port"); if (disableTest || isSecure) return; android::hardware::media::omx::V1_0::Status status; OMX_U32 portBase = 0; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -490,14 +487,14 @@ TEST_F(ComponentHidlTest, DISABLED_PopulatePort) { } // Flush test -TEST_F(ComponentHidlTest, Flush) { +TEST_P(ComponentHidlTest, Flush) { description("Test Flush"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; Message msg; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -561,14 +558,14 @@ TEST_F(ComponentHidlTest, Flush) { } // Flush test - monkeying -TEST_F(ComponentHidlTest, Flush_M) { +TEST_P(ComponentHidlTest, Flush_M) { description("Test Flush monkeying"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; Message msg; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -669,14 +666,14 @@ TEST_F(ComponentHidlTest, Flush_M) { } // test port mode configuration when the component is in various states -TEST_F(ComponentHidlTest, PortModeConfig) { +TEST_P(ComponentHidlTest, PortModeConfig) { description("Test Port Mode Configuration"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; Message msg; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -733,14 +730,14 @@ TEST_F(ComponentHidlTest, PortModeConfig) { } // state transitions test -TEST_F(ComponentHidlTest, StateTransitions) { +TEST_P(ComponentHidlTest, StateTransitions) { description("Test State Transitions Loaded<->Idle<->Execute"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; OMX_U32 portBase = 0; Message msg; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -852,14 +849,14 @@ TEST_F(ComponentHidlTest, StateTransitions) { } // state transitions test - monkeying -TEST_F(ComponentHidlTest, DISABLED_StateTransitions_M) { +TEST_P(ComponentHidlTest, DISABLED_StateTransitions_M) { description("Test State Transitions monkeying"); if (disableTest || isSecure) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; Message msg; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -918,13 +915,13 @@ TEST_F(ComponentHidlTest, DISABLED_StateTransitions_M) { } // port enable disable test -TEST_F(ComponentHidlTest, DISABLED_PortEnableDisable_Loaded) { +TEST_P(ComponentHidlTest, DISABLED_PortEnableDisable_Loaded) { description("Test Port Enable and Disable (Component State :: Loaded)"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; OMX_U32 portBase = 0; Message msg; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -968,14 +965,14 @@ TEST_F(ComponentHidlTest, DISABLED_PortEnableDisable_Loaded) { } // port enable disable test -TEST_F(ComponentHidlTest, PortEnableDisable_Idle) { +TEST_P(ComponentHidlTest, PortEnableDisable_Idle) { description("Test Port Enable and Disable (Component State :: Idle)"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; OMX_U32 portBase = 0; Message msg; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -1074,14 +1071,14 @@ TEST_F(ComponentHidlTest, PortEnableDisable_Idle) { } // port enable disable test -TEST_F(ComponentHidlTest, PortEnableDisable_Execute) { +TEST_P(ComponentHidlTest, PortEnableDisable_Execute) { description("Test Port Enable and Disable (Component State :: Execute)"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; OMX_U32 portBase = 0; Message msg; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -1192,14 +1189,14 @@ TEST_F(ComponentHidlTest, PortEnableDisable_Execute) { } // port enable disable test - monkeying -TEST_F(ComponentHidlTest, DISABLED_PortEnableDisable_M) { +TEST_P(ComponentHidlTest, DISABLED_PortEnableDisable_M) { description( "Test Port Enable and Disable Monkeying (Component State :: Loaded)"); if (disableTest || isSecure) return; android::hardware::media::omx::V1_0::Status status; OMX_U32 portBase = 0; Message msg; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; if (compClass == audio_decoder || compClass == audio_encoder) { @@ -1267,15 +1264,11 @@ TEST_F(ComponentHidlTest, DISABLED_PortEnableDisable_M) { } } +INSTANTIATE_TEST_SUITE_P(PerInstance, ComponentHidlTest, testing::ValuesIn(kTestParameters), + android::hardware::PrintInstanceTupleNameToString<>); + int main(int argc, char** argv) { - gEnv = new ComponentTestEnvironment(); - ::testing::AddGlobalTestEnvironment(gEnv); + kTestParameters = getTestParameters(""); ::testing::InitGoogleTest(&argc, argv); - gEnv->init(&argc, argv); - int status = gEnv->initFromOptions(argc, argv); - if (status == 0) { - status = RUN_ALL_TESTS(); - ALOGI("Test result = %d", status); - } - return status; -} + return RUN_ALL_TESTS(); +}
\ No newline at end of file diff --git a/media/omx/1.0/vts/functional/master/Android.bp b/media/omx/1.0/vts/functional/master/Android.bp index cf3f15d530..0eb2cc998d 100644 --- a/media/omx/1.0/vts/functional/master/Android.bp +++ b/media/omx/1.0/vts/functional/master/Android.bp @@ -18,6 +18,7 @@ cc_test { name: "VtsHalMediaOmxV1_0TargetMasterTest", defaults: ["VtsHalMediaOmxV1_0Defaults"], srcs: ["VtsHalMediaOmxV1_0TargetMasterTest.cpp"], - test_suites: ["general-tests"], + test_suites: [ + "vts-core", + ], } - diff --git a/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp b/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp index 64abe1c1b1..c14f1da8bc 100644 --- a/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp +++ b/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp @@ -29,6 +29,9 @@ #include <android/hidl/allocator/1.0/IAllocator.h> #include <android/hidl/memory/1.0/IMapper.h> #include <android/hidl/memory/1.0/IMemory.h> +#include <gtest/gtest.h> +#include <hidl/GtestPrinter.h> +#include <hidl/ServiceManagement.h> using ::android::hardware::media::omx::V1_0::IOmx; using ::android::hardware::media::omx::V1_0::IOmxObserver; @@ -46,30 +49,18 @@ using ::android::hardware::hidl_vec; using ::android::hardware::hidl_string; using ::android::sp; -#include <VtsHalHidlTargetTestBase.h> #include <getopt.h> #include <media_hidl_test_common.h> -static ComponentTestEnvironment* gEnv = nullptr; - -class MasterHidlTest : public ::testing::VtsHalHidlTargetTestBase { - private: - typedef ::testing::VtsHalHidlTargetTestBase Super; - public: +class MasterHidlTest : public ::testing::TestWithParam<std::string> { + public: virtual void SetUp() override { - Super::SetUp(); - omxStore = nullptr; - omxStore = Super::getService<IOmxStore>(); + omxStore = IOmxStore::getService(GetParam()); ASSERT_NE(omxStore, nullptr); - omx = nullptr; - omx = omxStore->getOmx(gEnv->getInstance()); + omx = IOmx::getService(GetParam()); ASSERT_NE(omx, nullptr); } - virtual void TearDown() override { - Super::TearDown(); - } - sp<IOmxStore> omxStore; sp<IOmx> omx; @@ -89,8 +80,19 @@ void displayComponentInfo(hidl_vec<IOmx::ComponentInfo>& nodeList) { } } +// Make sure IOmx and IOmxStore have the same set of instances. +TEST(MasterHidlTest, instanceMatchValidation) { + auto omxInstances = android::hardware::getAllHalInstanceNames(IOmx::descriptor); + auto omxStoreInstances = android::hardware::getAllHalInstanceNames(IOmxStore::descriptor); + ASSERT_EQ(omxInstances.size(), omxInstances.size()); + for (const std::string& omxInstance : omxInstances) { + EXPECT_TRUE(std::find(omxStoreInstances.begin(), omxStoreInstances.end(), omxInstance) != + omxStoreInstances.end()); + } +} + // list service attributes -TEST_F(MasterHidlTest, ListServiceAttr) { +TEST_P(MasterHidlTest, ListServiceAttr) { description("list service attributes"); android::hardware::media::omx::V1_0::Status status; hidl_vec<IOmxStore::Attribute> attributes; @@ -107,7 +109,7 @@ TEST_F(MasterHidlTest, ListServiceAttr) { } // get node prefix -TEST_F(MasterHidlTest, getNodePrefix) { +TEST_P(MasterHidlTest, getNodePrefix) { description("get node prefix"); hidl_string prefix; omxStore->getNodePrefix( @@ -116,7 +118,7 @@ TEST_F(MasterHidlTest, getNodePrefix) { } // list roles -TEST_F(MasterHidlTest, ListRoles) { +TEST_P(MasterHidlTest, ListRoles) { description("list roles"); hidl_vec<IOmxStore::RoleInfo> roleList; omxStore->listRoles([&roleList](hidl_vec<IOmxStore::RoleInfo> const& _nl) { @@ -126,7 +128,7 @@ TEST_F(MasterHidlTest, ListRoles) { } // list components and roles. -TEST_F(MasterHidlTest, ListNodes) { +TEST_P(MasterHidlTest, ListNodes) { description("enumerate component and roles"); android::hardware::media::omx::V1_0::Status status; hidl_vec<IOmx::ComponentInfo> nodeList; @@ -174,15 +176,7 @@ TEST_F(MasterHidlTest, ListNodes) { EXPECT_TRUE(isPass); } -int main(int argc, char** argv) { - gEnv = new ComponentTestEnvironment(); - ::testing::AddGlobalTestEnvironment(gEnv); - ::testing::InitGoogleTest(&argc, argv); - gEnv->init(&argc, argv); - int status = gEnv->initFromOptions(argc, argv); - if (status == 0) { - status = RUN_ALL_TESTS(); - ALOGI("Test result = %d", status); - } - return status; -} +INSTANTIATE_TEST_CASE_P( + PerInstance, MasterHidlTest, + testing::ValuesIn(android::hardware::getAllHalInstanceNames(IOmxStore::descriptor)), + android::hardware::PrintInstanceNameToString); diff --git a/media/omx/1.0/vts/functional/video/Android.bp b/media/omx/1.0/vts/functional/video/Android.bp index c7e0424472..7e93faa261 100644 --- a/media/omx/1.0/vts/functional/video/Android.bp +++ b/media/omx/1.0/vts/functional/video/Android.bp @@ -16,23 +16,33 @@ cc_test { name: "VtsHalMediaOmxV1_0TargetVideoDecTest", + stem: "vts_hal_media_omx_v1_0_video_dec_test", defaults: ["VtsHalMediaOmxV1_0Defaults"], srcs: [ "VtsHalMediaOmxV1_0TargetVideoDecTest.cpp", - "media_video_hidl_test_common.cpp" + "media_video_hidl_test_common.cpp", + ], + data: [":media_omx_video_res"], + test_config: "VtsHalMediaOmxV1_0TargetVideoDecTest.xml", + test_suites: [ + "vts-core", ], - test_suites: ["general-tests"], } cc_test { name: "VtsHalMediaOmxV1_0TargetVideoEncTest", + stem: "vts_hal_media_omx_v1_0_video_enc_test", defaults: ["VtsHalMediaOmxV1_0Defaults"], srcs: [ "VtsHalMediaOmxV1_0TargetVideoEncTest.cpp", - "media_video_hidl_test_common.cpp" + "media_video_hidl_test_common.cpp", ], static_libs: [ "libnativewindow", ], - test_suites: ["general-tests"], + data: [":media_omx_video_res"], + test_config: "VtsHalMediaOmxV1_0TargetVideoEncTest.xml", + test_suites: [ + "vts-core", + ], } diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp index df048c6bf2..29a32a5d36 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp @@ -28,6 +28,8 @@ #include <android/hidl/allocator/1.0/IAllocator.h> #include <android/hidl/memory/1.0/IMapper.h> #include <android/hidl/memory/1.0/IMemory.h> +#include <gtest/gtest.h> +#include <hidl/GtestPrinter.h> using ::android::hardware::media::omx::V1_0::IOmx; using ::android::hardware::media::omx::V1_0::IOmxObserver; @@ -44,49 +46,46 @@ using ::android::hardware::hidl_vec; using ::android::hardware::hidl_string; using ::android::sp; -#include <VtsHalHidlTargetTestBase.h> #include <getopt.h> #include <media/hardware/HardwareAPI.h> -#include <media_hidl_test_common.h> #include <media_video_hidl_test_common.h> #include <fstream> -static ComponentTestEnvironment* gEnv = nullptr; +// Resource directory +std::string sResourceDir = ""; // video decoder test fixture class -class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { - private: - typedef ::testing::VtsHalHidlTargetTestBase Super; - public: - ::std::string getTestCaseInfo() const override { - return ::std::string() + - "Component: " + gEnv->getComponent().c_str() + " | " + - "Role: " + gEnv->getRole().c_str() + " | " + - "Instance: " + gEnv->getInstance().c_str() + " | " + - "Res: " + gEnv->getRes().c_str(); +class VideoDecHidlTest + : public ::testing::TestWithParam<std::tuple<std::string, std::string, std::string>> { + public: + ::std::string getTestCaseInfo() const { + return ::std::string() + "Component: " + component_ + " | " + "Role: " + role_ + " | " + + "Instance: " + instance_ + " | " + "Res: " + sResourceDir; } virtual void SetUp() override { - Super::SetUp(); + instance_ = std::get<0>(GetParam()); + component_ = std::get<1>(GetParam()); + role_ = std::get<2>(GetParam()); + ASSERT_NE(sResourceDir.empty(), true); + disableTest = false; android::hardware::media::omx::V1_0::Status status; - omx = Super::getService<IOmx>(gEnv->getInstance()); + omx = IOmx::getService(instance_); ASSERT_NE(omx, nullptr); observer = new CodecObserver([this](Message msg, const BufferInfo* buffer) { handleMessage(msg, buffer); }); ASSERT_NE(observer, nullptr); - if (strncmp(gEnv->getComponent().c_str(), "OMX.", 4) != 0) - disableTest = true; - EXPECT_TRUE(omx->allocateNode( - gEnv->getComponent(), observer, - [&](android::hardware::media::omx::V1_0::Status _s, - sp<IOmxNode> const& _nl) { - status = _s; - this->omxNode = _nl; - }) - .isOk()); + if (component_.find("OMX.") != 0) disableTest = true; + EXPECT_TRUE(omx->allocateNode(component_, observer, + [&](android::hardware::media::omx::V1_0::Status _s, + sp<IOmxNode> const& _nl) { + status = _s; + this->omxNode = _nl; + }) + .isOk()); if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) { disableTest = true; std::cout << "[ WARN ] Test Disabled, component not present\n"; @@ -94,7 +93,7 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { } ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); ASSERT_NE(omxNode, nullptr); - ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role"; + ASSERT_NE(role_.empty(), true) << "Invalid Component Role"; struct StringToName { const char* Name; standardComp CompName; @@ -107,7 +106,7 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { sizeof(kStringToName) / sizeof(kStringToName[0]); const char* pch; char substring[OMX_MAX_STRINGNAME_SIZE]; - strcpy(substring, gEnv->getRole().c_str()); + strcpy(substring, role_.c_str()); pch = strchr(substring, '.'); ASSERT_NE(pch, nullptr); compName = unknown_comp; @@ -146,11 +145,8 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { isSecure = false; portSettingsChange = false; size_t suffixLen = strlen(".secure"); - if (strlen(gEnv->getComponent().c_str()) >= suffixLen) { - isSecure = - !strcmp(gEnv->getComponent().c_str() + - strlen(gEnv->getComponent().c_str()) - suffixLen, - ".secure"); + if (component_.rfind(".secure") == component_.length() - suffixLen) { + isSecure = true; } if (isSecure) disableTest = true; omxNode->configureVideoTunnelMode( @@ -175,7 +171,6 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { EXPECT_TRUE((omxNode->freeNode()).isOk()); omxNode = nullptr; } - Super::TearDown(); } // callback function to process messages received by onMessages() from IL @@ -255,6 +250,10 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { unknown_comp, }; + std::string component_; + std::string role_; + std::string instance_; + sp<IOmx> omx; sp<CodecObserver> observer; sp<IOmxNode> omxNode; @@ -719,23 +718,23 @@ void getDefaultColorFormat(sp<IOmxNode> omxNode, OMX_U32 kPortIndexOutput, } // set component role -TEST_F(VideoDecHidlTest, SetRole) { +TEST_P(VideoDecHidlTest, SetRole) { description("Test Set Component Role"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); } // port format enumeration -TEST_F(VideoDecHidlTest, EnumeratePortFormat) { +TEST_P(VideoDecHidlTest, EnumeratePortFormat) { description("Test Component on Mandatory Port Parameters (Port Format)"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatYUV420Planar; OMX_U32 xFramerate = (24U << 16); - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -755,12 +754,12 @@ TEST_F(VideoDecHidlTest, EnumeratePortFormat) { // test port settings reconfiguration, elementary stream decode and timestamp // deviation -TEST_F(VideoDecHidlTest, DecodeTest) { +TEST_P(VideoDecHidlTest, DecodeTest) { description("Tests Port Reconfiguration, Decode and timestamp deviation"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -770,8 +769,8 @@ TEST_F(VideoDecHidlTest, DecodeTest) { kPortIndexOutput = kPortIndexInput + 1; } char mURL[512], info[512]; - strcpy(mURL, gEnv->getRes().c_str()); - strcpy(info, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); + strcpy(info, sResourceDir.c_str()); GetURLForComponent(compName, mURL, info); std::ifstream eleStream, eleInfo; @@ -860,7 +859,7 @@ TEST_F(VideoDecHidlTest, DecodeTest) { } // Test for adaptive playback support -TEST_F(VideoDecHidlTest, AdaptivePlaybackTest) { +TEST_P(VideoDecHidlTest, AdaptivePlaybackTest) { description("Tests for Adaptive Playback support"); if (disableTest) return; if (!(compName == avc || compName == hevc || compName == vp8 || @@ -868,7 +867,7 @@ TEST_F(VideoDecHidlTest, AdaptivePlaybackTest) { return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -895,7 +894,7 @@ TEST_F(VideoDecHidlTest, AdaptivePlaybackTest) { uint32_t adaptiveMaxHeight = 240; status = omxNode->prepareForAdaptivePlayback( kPortIndexOutput, true, adaptiveMaxWidth, adaptiveMaxHeight); - if (strncmp(gEnv->getComponent().c_str(), "OMX.google.", 11) == 0) { + if (component_.find("OMX.google.") == 0) { // SoftOMX Decoders donot support graphic buffer modes. So for them // support for adaptive play back is mandatory in Byte Buffer mode ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); @@ -944,8 +943,8 @@ TEST_F(VideoDecHidlTest, AdaptivePlaybackTest) { std::ifstream eleStream, eleInfo; char mURL[512], info[512]; android::Vector<FrameData> Info; - strcpy(mURL, gEnv->getRes().c_str()); - strcpy(info, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); + strcpy(info, sResourceDir.c_str()); GetURLForComponent(compName, mURL, info, i % STREAM_COUNT); eleInfo.open(info); ASSERT_EQ(eleInfo.is_open(), true); @@ -1008,12 +1007,12 @@ TEST_F(VideoDecHidlTest, AdaptivePlaybackTest) { } // end of sequence test -TEST_F(VideoDecHidlTest, EOSTest_M) { +TEST_P(VideoDecHidlTest, EOSTest_M) { description("Test End of stream monkeying"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -1074,12 +1073,12 @@ TEST_F(VideoDecHidlTest, EOSTest_M) { } // end of sequence test -TEST_F(VideoDecHidlTest, ThumbnailTest) { +TEST_P(VideoDecHidlTest, ThumbnailTest) { description("Test Request for thumbnail"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -1089,8 +1088,8 @@ TEST_F(VideoDecHidlTest, ThumbnailTest) { kPortIndexOutput = kPortIndexInput + 1; } char mURL[512], info[512]; - strcpy(mURL, gEnv->getRes().c_str()); - strcpy(info, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); + strcpy(info, sResourceDir.c_str()); GetURLForComponent(compName, mURL, info); std::ifstream eleStream, eleInfo; @@ -1195,12 +1194,12 @@ TEST_F(VideoDecHidlTest, ThumbnailTest) { } // end of sequence test -TEST_F(VideoDecHidlTest, SimpleEOSTest) { +TEST_P(VideoDecHidlTest, SimpleEOSTest) { description("Test End of stream"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -1210,8 +1209,8 @@ TEST_F(VideoDecHidlTest, SimpleEOSTest) { kPortIndexOutput = kPortIndexInput + 1; } char mURL[512], info[512]; - strcpy(mURL, gEnv->getRes().c_str()); - strcpy(info, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); + strcpy(info, sResourceDir.c_str()); GetURLForComponent(compName, mURL, info); std::ifstream eleStream, eleInfo; @@ -1302,12 +1301,12 @@ TEST_F(VideoDecHidlTest, SimpleEOSTest) { } // test input/output port flush -TEST_F(VideoDecHidlTest, FlushTest) { +TEST_P(VideoDecHidlTest, FlushTest) { description("Test Flush"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -1317,8 +1316,8 @@ TEST_F(VideoDecHidlTest, FlushTest) { kPortIndexOutput = kPortIndexInput + 1; } char mURL[512], info[512]; - strcpy(mURL, gEnv->getRes().c_str()); - strcpy(info, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); + strcpy(info, sResourceDir.c_str()); GetURLForComponent(compName, mURL, info); std::ifstream eleStream, eleInfo; @@ -1420,15 +1419,21 @@ TEST_F(VideoDecHidlTest, FlushTest) { kPortIndexOutput)); } +INSTANTIATE_TEST_SUITE_P(PerInstance, VideoDecHidlTest, testing::ValuesIn(kTestParameters), + android::hardware::PrintInstanceTupleNameToString<>); + int main(int argc, char** argv) { - gEnv = new ComponentTestEnvironment(); - ::testing::AddGlobalTestEnvironment(gEnv); + kTestParameters = getTestParameters("video_decoder"); ::testing::InitGoogleTest(&argc, argv); - gEnv->init(&argc, argv); - int status = gEnv->initFromOptions(argc, argv); - if (status == 0) { - status = RUN_ALL_TESTS(); - ALOGI("Test result = %d", status); + + // Set the resource directory based on command line args. + // Test will fail to set up if the argument is not set. + for (int i = 1; i < argc; i++) { + if (strcmp(argv[i], "-P") == 0 && i < argc - 1) { + sResourceDir = argv[i + 1]; + break; + } } - return status; -} + + return RUN_ALL_TESTS(); +}
\ No newline at end of file diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.xml b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.xml new file mode 100644 index 0000000000..a2fd92ad89 --- /dev/null +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<configuration description="Runs VtsHalMediaOmxV1_0TargetVideoDecTest."> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push-file" key="vts_hal_media_omx_v1_0_video_dec_test" value="/data/local/tmp/vts_hal_media_omx_v1_0_video_dec_test" /> + + <!-- Files used for video testing --> + <option name="push-file" key="bbb_352x288_420p_30fps_32frames.yuv" value="/data/local/tmp/media/bbb_352x288_420p_30fps_32frames.yuv" /> + <option name="push-file" key="bbb_avc_176x144_300kbps_60fps.h264" value="/data/local/tmp/media/bbb_avc_176x144_300kbps_60fps.h264" /> + <option name="push-file" key="bbb_avc_176x144_300kbps_60fps.info" value="/data/local/tmp/media/bbb_avc_176x144_300kbps_60fps.info" /> + <option name="push-file" key="bbb_avc_640x360_768kbps_30fps.h264" value="/data/local/tmp/media/bbb_avc_640x360_768kbps_30fps.h264" /> + <option name="push-file" key="bbb_avc_640x360_768kbps_30fps.info" value="/data/local/tmp/media/bbb_avc_640x360_768kbps_30fps.info" /> + <option name="push-file" key="bbb_h263_352x288_300kbps_12fps.h263" value="/data/local/tmp/media/bbb_h263_352x288_300kbps_12fps.h263" /> + <option name="push-file" key="bbb_h263_352x288_300kbps_12fps.info" value="/data/local/tmp/media/bbb_h263_352x288_300kbps_12fps.info" /> + <option name="push-file" key="bbb_hevc_176x144_176kbps_60fps.hevc" value="/data/local/tmp/media/bbb_hevc_176x144_176kbps_60fps.hevc" /> + <option name="push-file" key="bbb_hevc_176x144_176kbps_60fps.info" value="/data/local/tmp/media/bbb_hevc_176x144_176kbps_60fps.info" /> + <option name="push-file" key="bbb_hevc_640x360_1600kbps_30fps.hevc" value="/data/local/tmp/media/bbb_hevc_640x360_1600kbps_30fps.hevc" /> + <option name="push-file" key="bbb_hevc_640x360_1600kbps_30fps.info" value="/data/local/tmp/media/bbb_hevc_640x360_1600kbps_30fps.info" /> + <option name="push-file" key="bbb_mpeg2_176x144_105kbps_25fps.info" value="/data/local/tmp/media/bbb_mpeg2_176x144_105kbps_25fps.info" /> + <option name="push-file" key="bbb_mpeg2_176x144_105kbps_25fps.m2v" value="/data/local/tmp/media/bbb_mpeg2_176x144_105kbps_25fps.m2v" /> + <option name="push-file" key="bbb_mpeg2_352x288_1mbps_60fps.info" value="/data/local/tmp/media/bbb_mpeg2_352x288_1mbps_60fps.info" /> + <option name="push-file" key="bbb_mpeg2_352x288_1mbps_60fps.m2v" value="/data/local/tmp/media/bbb_mpeg2_352x288_1mbps_60fps.m2v" /> + <option name="push-file" key="bbb_mpeg4_352x288_512kbps_30fps.info" value="/data/local/tmp/media/bbb_mpeg4_352x288_512kbps_30fps.info" /> + <option name="push-file" key="bbb_mpeg4_352x288_512kbps_30fps.m4v" value="/data/local/tmp/media/bbb_mpeg4_352x288_512kbps_30fps.m4v" /> + <option name="push-file" key="bbb_vp8_176x144_240kbps_60fps.info" value="/data/local/tmp/media/bbb_vp8_176x144_240kbps_60fps.info" /> + <option name="push-file" key="bbb_vp8_176x144_240kbps_60fps.vp8" value="/data/local/tmp/media/bbb_vp8_176x144_240kbps_60fps.vp8" /> + <option name="push-file" key="bbb_vp8_640x360_2mbps_30fps.info" value="/data/local/tmp/media/bbb_vp8_640x360_2mbps_30fps.info" /> + <option name="push-file" key="bbb_vp8_640x360_2mbps_30fps.vp8" value="/data/local/tmp/media/bbb_vp8_640x360_2mbps_30fps.vp8" /> + <option name="push-file" key="bbb_vp9_176x144_285kbps_60fps.info" value="/data/local/tmp/media/bbb_vp9_176x144_285kbps_60fps.info" /> + <option name="push-file" key="bbb_vp9_176x144_285kbps_60fps.vp9" value="/data/local/tmp/media/bbb_vp9_176x144_285kbps_60fps.vp9" /> + <option name="push-file" key="bbb_vp9_640x360_1600kbps_30fps.info" value="/data/local/tmp/media/bbb_vp9_640x360_1600kbps_30fps.info" /> + <option name="push-file" key="bbb_vp9_640x360_1600kbps_30fps.vp9" value="/data/local/tmp/media/bbb_vp9_640x360_1600kbps_30fps.vp9" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="vts_hal_media_omx_v1_0_video_dec_test" /> + <option name="native-test-flag" value="-P /data/local/tmp/media/" /> + </test> +</configuration>
\ No newline at end of file diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp index 2280cee8c2..4b469e6bb1 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp @@ -34,6 +34,8 @@ #include <android/hidl/allocator/1.0/IAllocator.h> #include <android/hidl/memory/1.0/IMapper.h> #include <android/hidl/memory/1.0/IMemory.h> +#include <gtest/gtest.h> +#include <hidl/GtestPrinter.h> using ::android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer; using ::android::hardware::graphics::bufferqueue::V1_0::IProducerListener; @@ -56,51 +58,48 @@ using ::android::hardware::hidl_vec; using ::android::hardware::hidl_string; using ::android::sp; -#include <VtsHalHidlTargetTestBase.h> #include <getopt.h> #include <media/hardware/HardwareAPI.h> -#include <media_hidl_test_common.h> #include <media_video_hidl_test_common.h> #include <system/window.h> #include <fstream> #include <variant> -static ComponentTestEnvironment* gEnv = nullptr; +// Resource directory +std::string sResourceDir = ""; // video encoder test fixture class -class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { - private: - typedef ::testing::VtsHalHidlTargetTestBase Super; - public: - ::std::string getTestCaseInfo() const override { - return ::std::string() + - "Component: " + gEnv->getComponent().c_str() + " | " + - "Role: " + gEnv->getRole().c_str() + " | " + - "Instance: " + gEnv->getInstance().c_str() + " | " + - "Res: " + gEnv->getRes().c_str(); +class VideoEncHidlTest + : public ::testing::TestWithParam<std::tuple<std::string, std::string, std::string>> { + public: + ::std::string getTestCaseInfo() const { + return ::std::string() + "Component: " + component_ + " | " + "Role: " + role_ + " | " + + "Instance: " + instance_ + " | " + "Res: " + sResourceDir; } virtual void SetUp() override { - Super::SetUp(); + instance_ = std::get<0>(GetParam()); + component_ = std::get<1>(GetParam()); + role_ = std::get<2>(GetParam()); + ASSERT_NE(sResourceDir.empty(), true); + disableTest = false; android::hardware::media::omx::V1_0::Status status; - omx = Super::getService<IOmx>(gEnv->getInstance()); + omx = IOmx::getService(instance_); ASSERT_NE(omx, nullptr); observer = new CodecObserver([this](Message msg, const BufferInfo* buffer) { handleMessage(msg, buffer); }); ASSERT_NE(observer, nullptr); - if (strncmp(gEnv->getComponent().c_str(), "OMX.", 4) != 0) - disableTest = true; - EXPECT_TRUE(omx->allocateNode( - gEnv->getComponent(), observer, - [&](android::hardware::media::omx::V1_0::Status _s, - sp<IOmxNode> const& _nl) { - status = _s; - this->omxNode = _nl; - }) - .isOk()); + if (component_.find("OMX.") != 0) disableTest = true; + EXPECT_TRUE(omx->allocateNode(component_, observer, + [&](android::hardware::media::omx::V1_0::Status _s, + sp<IOmxNode> const& _nl) { + status = _s; + this->omxNode = _nl; + }) + .isOk()); if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) { disableTest = true; std::cout << "[ WARN ] Test Disabled, component not present\n"; @@ -108,7 +107,7 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { } ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); ASSERT_NE(omxNode, nullptr); - ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role"; + ASSERT_NE(role_.empty(), true) << "Invalid Component Role"; struct StringToName { const char* Name; standardComp CompName; @@ -121,7 +120,7 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { sizeof(kStringToName) / sizeof(kStringToName[0]); const char* pch; char substring[OMX_MAX_STRINGNAME_SIZE]; - strcpy(substring, gEnv->getRole().c_str()); + strcpy(substring, role_.c_str()); pch = strchr(substring, '.'); ASSERT_NE(pch, nullptr); compName = unknown_comp; @@ -158,11 +157,8 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { source = nullptr; isSecure = false; size_t suffixLen = strlen(".secure"); - if (strlen(gEnv->getComponent().c_str()) >= suffixLen) { - isSecure = - !strcmp(gEnv->getComponent().c_str() + - strlen(gEnv->getComponent().c_str()) - suffixLen, - ".secure"); + if (component_.rfind(".secure") == component_.length() - suffixLen) { + isSecure = true; } if (isSecure) disableTest = true; if (disableTest) std::cout << "[ WARN ] Test Disabled \n"; @@ -177,7 +173,6 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { EXPECT_TRUE((omxNode->freeNode()).isOk()); omxNode = nullptr; } - Super::TearDown(); } // callback function to process messages received by onMessages() from IL @@ -245,6 +240,10 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { unknown_comp, }; + std::string component_; + std::string role_; + std::string instance_; + sp<IOmx> omx; sp<CodecObserver> observer; sp<IOmxNode> omxNode; @@ -1085,23 +1084,23 @@ void encodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer, } // set component role -TEST_F(VideoEncHidlTest, SetRole) { +TEST_P(VideoEncHidlTest, SetRole) { description("Test Set Component Role"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); } // port format enumeration -TEST_F(VideoEncHidlTest, EnumeratePortFormat) { +TEST_P(VideoEncHidlTest, EnumeratePortFormat) { description("Test Component on Mandatory Port Parameters (Port Format)"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatYUV420Planar; OMX_U32 xFramerate = (30U << 16); - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -1121,12 +1120,12 @@ TEST_F(VideoEncHidlTest, EnumeratePortFormat) { } // Test IOmxBufferSource CallBacks -TEST_F(VideoEncHidlTest, BufferSourceCallBacks) { +TEST_P(VideoEncHidlTest, BufferSourceCallBacks) { description("Test IOmxBufferSource CallBacks"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -1178,12 +1177,12 @@ TEST_F(VideoEncHidlTest, BufferSourceCallBacks) { } // test raw stream encode (input is byte buffers) -TEST_F(VideoEncHidlTest, EncodeTest) { +TEST_P(VideoEncHidlTest, EncodeTest) { description("Test Encode"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -1193,7 +1192,7 @@ TEST_F(VideoEncHidlTest, EncodeTest) { kPortIndexOutput = kPortIndexInput + 1; } char mURL[512]; - strcpy(mURL, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); GetURLForComponent(mURL); std::ifstream eleStream; @@ -1293,12 +1292,12 @@ TEST_F(VideoEncHidlTest, EncodeTest) { } // test raw stream encode (input is ANW buffers) -TEST_F(VideoEncHidlTest, EncodeTestBufferMetaModes) { +TEST_P(VideoEncHidlTest, EncodeTestBufferMetaModes) { description("Test Encode Input buffer metamodes"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -1383,7 +1382,7 @@ TEST_F(VideoEncHidlTest, EncodeTestBufferMetaModes) { ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); char mURL[512]; - strcpy(mURL, gEnv->getRes().c_str()); + strcpy(mURL, sResourceDir.c_str()); GetURLForComponent(mURL); uint32_t latency = 0; @@ -1460,12 +1459,12 @@ TEST_F(VideoEncHidlTest, EncodeTestBufferMetaModes) { } // Test end of stream -TEST_F(VideoEncHidlTest, EncodeTestEOS) { +TEST_P(VideoEncHidlTest, EncodeTestEOS) { description("Test EOS"); if (disableTest) return; android::hardware::media::omx::V1_0::Status status; uint32_t kPortIndexInput = 0, kPortIndexOutput = 1; - status = setRole(omxNode, gEnv->getRole().c_str()); + status = setRole(omxNode, role_); ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); OMX_PORT_PARAM_TYPE params; status = getParam(omxNode, OMX_IndexParamVideoInit, ¶ms); @@ -1574,15 +1573,21 @@ TEST_F(VideoEncHidlTest, EncodeTestEOS) { ASSERT_EQ(returnval, 0); } +INSTANTIATE_TEST_SUITE_P(PerInstance, VideoEncHidlTest, testing::ValuesIn(kTestParameters), + android::hardware::PrintInstanceTupleNameToString<>); + int main(int argc, char** argv) { - gEnv = new ComponentTestEnvironment(); - ::testing::AddGlobalTestEnvironment(gEnv); + kTestParameters = getTestParameters("video_encoder"); ::testing::InitGoogleTest(&argc, argv); - gEnv->init(&argc, argv); - int status = gEnv->initFromOptions(argc, argv); - if (status == 0) { - status = RUN_ALL_TESTS(); - ALOGI("Test result = %d", status); + + // Set the resource directory based on command line args. + // Test will fail to set up if the argument is not set. + for (int i = 1; i < argc; i++) { + if (strcmp(argv[i], "-P") == 0 && i < argc - 1) { + sResourceDir = argv[i + 1]; + break; + } } - return status; -} + + return RUN_ALL_TESTS(); +}
\ No newline at end of file diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.xml b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.xml new file mode 100644 index 0000000000..57ba1e4c3e --- /dev/null +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<configuration description="Runs VtsHalMediaOmxV1_0TargetVideoEncTest."> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push-file" key="vts_hal_media_omx_v1_0_video_enc_test" value="/data/local/tmp/vts_hal_media_omx_v1_0_video_enc_test" /> + + <!-- Files used for video testing --> + <option name="push-file" key="bbb_352x288_420p_30fps_32frames.yuv" value="/data/local/tmp/media/bbb_352x288_420p_30fps_32frames.yuv" /> + <option name="push-file" key="bbb_avc_176x144_300kbps_60fps.h264" value="/data/local/tmp/media/bbb_avc_176x144_300kbps_60fps.h264" /> + <option name="push-file" key="bbb_avc_176x144_300kbps_60fps.info" value="/data/local/tmp/media/bbb_avc_176x144_300kbps_60fps.info" /> + <option name="push-file" key="bbb_avc_640x360_768kbps_30fps.h264" value="/data/local/tmp/media/bbb_avc_640x360_768kbps_30fps.h264" /> + <option name="push-file" key="bbb_avc_640x360_768kbps_30fps.info" value="/data/local/tmp/media/bbb_avc_640x360_768kbps_30fps.info" /> + <option name="push-file" key="bbb_h263_352x288_300kbps_12fps.h263" value="/data/local/tmp/media/bbb_h263_352x288_300kbps_12fps.h263" /> + <option name="push-file" key="bbb_h263_352x288_300kbps_12fps.info" value="/data/local/tmp/media/bbb_h263_352x288_300kbps_12fps.info" /> + <option name="push-file" key="bbb_hevc_176x144_176kbps_60fps.hevc" value="/data/local/tmp/media/bbb_hevc_176x144_176kbps_60fps.hevc" /> + <option name="push-file" key="bbb_hevc_176x144_176kbps_60fps.info" value="/data/local/tmp/media/bbb_hevc_176x144_176kbps_60fps.info" /> + <option name="push-file" key="bbb_hevc_640x360_1600kbps_30fps.hevc" value="/data/local/tmp/media/bbb_hevc_640x360_1600kbps_30fps.hevc" /> + <option name="push-file" key="bbb_hevc_640x360_1600kbps_30fps.info" value="/data/local/tmp/media/bbb_hevc_640x360_1600kbps_30fps.info" /> + <option name="push-file" key="bbb_mpeg2_176x144_105kbps_25fps.info" value="/data/local/tmp/media/bbb_mpeg2_176x144_105kbps_25fps.info" /> + <option name="push-file" key="bbb_mpeg2_176x144_105kbps_25fps.m2v" value="/data/local/tmp/media/bbb_mpeg2_176x144_105kbps_25fps.m2v" /> + <option name="push-file" key="bbb_mpeg2_352x288_1mbps_60fps.info" value="/data/local/tmp/media/bbb_mpeg2_352x288_1mbps_60fps.info" /> + <option name="push-file" key="bbb_mpeg2_352x288_1mbps_60fps.m2v" value="/data/local/tmp/media/bbb_mpeg2_352x288_1mbps_60fps.m2v" /> + <option name="push-file" key="bbb_mpeg4_352x288_512kbps_30fps.info" value="/data/local/tmp/media/bbb_mpeg4_352x288_512kbps_30fps.info" /> + <option name="push-file" key="bbb_mpeg4_352x288_512kbps_30fps.m4v" value="/data/local/tmp/media/bbb_mpeg4_352x288_512kbps_30fps.m4v" /> + <option name="push-file" key="bbb_vp8_176x144_240kbps_60fps.info" value="/data/local/tmp/media/bbb_vp8_176x144_240kbps_60fps.info" /> + <option name="push-file" key="bbb_vp8_176x144_240kbps_60fps.vp8" value="/data/local/tmp/media/bbb_vp8_176x144_240kbps_60fps.vp8" /> + <option name="push-file" key="bbb_vp8_640x360_2mbps_30fps.info" value="/data/local/tmp/media/bbb_vp8_640x360_2mbps_30fps.info" /> + <option name="push-file" key="bbb_vp8_640x360_2mbps_30fps.vp8" value="/data/local/tmp/media/bbb_vp8_640x360_2mbps_30fps.vp8" /> + <option name="push-file" key="bbb_vp9_176x144_285kbps_60fps.info" value="/data/local/tmp/media/bbb_vp9_176x144_285kbps_60fps.info" /> + <option name="push-file" key="bbb_vp9_176x144_285kbps_60fps.vp9" value="/data/local/tmp/media/bbb_vp9_176x144_285kbps_60fps.vp9" /> + <option name="push-file" key="bbb_vp9_640x360_1600kbps_30fps.info" value="/data/local/tmp/media/bbb_vp9_640x360_1600kbps_30fps.info" /> + <option name="push-file" key="bbb_vp9_640x360_1600kbps_30fps.vp9" value="/data/local/tmp/media/bbb_vp9_640x360_1600kbps_30fps.vp9" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="vts_hal_media_omx_v1_0_video_enc_test" /> + <option name="native-test-flag" value="-P /data/local/tmp/media/" /> + </test> +</configuration>
\ No newline at end of file diff --git a/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.cpp b/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.cpp index e1b6022f9d..5e2c10733b 100644 --- a/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.cpp +++ b/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.cpp @@ -44,7 +44,6 @@ using ::android::hardware::hidl_vec; using ::android::hardware::hidl_string; using ::android::sp; -#include <VtsHalHidlTargetTestBase.h> #include <hidlmemory/mapping.h> #include <media/hardware/HardwareAPI.h> #include <media_hidl_test_common.h> diff --git a/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.h b/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.h index 55de125877..e8f5172801 100644 --- a/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.h +++ b/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.h @@ -17,6 +17,8 @@ #ifndef MEDIA_VIDEO_HIDL_TEST_COMMON_H #define MEDIA_VIDEO_HIDL_TEST_COMMON_H +#include <media_hidl_test_common.h> + /* * Common video utils */ diff --git a/memtrack/1.0/vts/functional/Android.bp b/memtrack/1.0/vts/functional/Android.bp index 9e5cf6dc37..445770ad9b 100644 --- a/memtrack/1.0/vts/functional/Android.bp +++ b/memtrack/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalMemtrackV1_0TargetTest.cpp"], static_libs: ["android.hardware.memtrack@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/neuralnetworks/1.0/vts/functional/Android.bp b/neuralnetworks/1.0/vts/functional/Android.bp index 03af671086..87e851930d 100644 --- a/neuralnetworks/1.0/vts/functional/Android.bp +++ b/neuralnetworks/1.0/vts/functional/Android.bp @@ -88,5 +88,5 @@ cc_test { header_libs: [ "libneuralnetworks_headers", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/neuralnetworks/1.1/vts/functional/Android.bp b/neuralnetworks/1.1/vts/functional/Android.bp index 9ba192518a..9afa0af35b 100644 --- a/neuralnetworks/1.1/vts/functional/Android.bp +++ b/neuralnetworks/1.1/vts/functional/Android.bp @@ -47,5 +47,5 @@ cc_test { header_libs: [ "libneuralnetworks_headers", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/neuralnetworks/1.2/vts/functional/Android.bp b/neuralnetworks/1.2/vts/functional/Android.bp index 7c1faeef68..481eb80258 100644 --- a/neuralnetworks/1.2/vts/functional/Android.bp +++ b/neuralnetworks/1.2/vts/functional/Android.bp @@ -72,6 +72,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/neuralnetworks/1.3/vts/functional/Android.bp b/neuralnetworks/1.3/vts/functional/Android.bp index 545a5be74e..2c1be0b008 100644 --- a/neuralnetworks/1.3/vts/functional/Android.bp +++ b/neuralnetworks/1.3/vts/functional/Android.bp @@ -77,5 +77,8 @@ cc_test { header_libs: [ "libneuralnetworks_headers", ], - test_suites: ["general-tests"], + test_suites: [ + "general-tests", + "vts", + ], } diff --git a/nfc/1.0/vts/functional/Android.bp b/nfc/1.0/vts/functional/Android.bp index 40b82bbf98..40ba22ee2f 100644 --- a/nfc/1.0/vts/functional/Android.bp +++ b/nfc/1.0/vts/functional/Android.bp @@ -21,5 +21,5 @@ cc_test { static_libs: [ "android.hardware.nfc@1.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/nfc/1.1/vts/functional/Android.bp b/nfc/1.1/vts/functional/Android.bp index 8da0ce3a78..1c18418514 100644 --- a/nfc/1.1/vts/functional/Android.bp +++ b/nfc/1.1/vts/functional/Android.bp @@ -22,5 +22,5 @@ cc_test { "android.hardware.nfc@1.0", "android.hardware.nfc@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/nfc/1.2/vts/functional/Android.bp b/nfc/1.2/vts/functional/Android.bp index 7b50a36d74..83e7a8e58e 100644 --- a/nfc/1.2/vts/functional/Android.bp +++ b/nfc/1.2/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.nfc@1.1", "android.hardware.nfc@1.2", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/oemlock/1.0/vts/functional/Android.bp b/oemlock/1.0/vts/functional/Android.bp index 90de347562..4dd92b53d6 100644 --- a/oemlock/1.0/vts/functional/Android.bp +++ b/oemlock/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalOemLockV1_0TargetTest.cpp"], static_libs: ["android.hardware.oemlock@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/power/1.0/vts/functional/Android.bp b/power/1.0/vts/functional/Android.bp index 5d5676d36b..27b945651c 100644 --- a/power/1.0/vts/functional/Android.bp +++ b/power/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalPowerV1_0TargetTest.cpp"], static_libs: ["android.hardware.power@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/power/1.1/vts/functional/Android.bp b/power/1.1/vts/functional/Android.bp index d9a32df9ab..2860fdb10a 100644 --- a/power/1.1/vts/functional/Android.bp +++ b/power/1.1/vts/functional/Android.bp @@ -22,5 +22,5 @@ cc_test { "android.hardware.power@1.0", "android.hardware.power@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/power/1.2/vts/functional/Android.bp b/power/1.2/vts/functional/Android.bp index 5385faa8a8..5d1b2a4973 100644 --- a/power/1.2/vts/functional/Android.bp +++ b/power/1.2/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.power@1.1", "android.hardware.power@1.2", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/power/1.3/vts/functional/Android.bp b/power/1.3/vts/functional/Android.bp index 77e86197a0..d8e1c050ad 100644 --- a/power/1.3/vts/functional/Android.bp +++ b/power/1.3/vts/functional/Android.bp @@ -24,5 +24,5 @@ cc_test { "android.hardware.power@1.2", "android.hardware.power@1.3", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/power/aidl/vts/Android.bp b/power/aidl/vts/Android.bp index 7726fd8a73..28b08c7c4e 100644 --- a/power/aidl/vts/Android.bp +++ b/power/aidl/vts/Android.bp @@ -26,6 +26,6 @@ cc_test { "android.hardware.power-cpp", ], test_suites: [ - "vts-core", + "vts", ], } diff --git a/power/stats/1.0/vts/functional/Android.bp b/power/stats/1.0/vts/functional/Android.bp index ab47061461..d5f1da2d9d 100644 --- a/power/stats/1.0/vts/functional/Android.bp +++ b/power/stats/1.0/vts/functional/Android.bp @@ -33,5 +33,5 @@ cc_test { "libfmq", "libutils", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp index 2351d903fa..13fc5425ac 100644 --- a/radio/1.0/vts/functional/Android.bp +++ b/radio/1.0/vts/functional/Android.bp @@ -34,7 +34,7 @@ cc_test { "android.hardware.radio@1.0", ], test_config: "vts_hal_radio_target_test.xml", - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } cc_test { @@ -49,7 +49,7 @@ cc_test { "android.hardware.radio@1.0", ], test_config: "vts_hal_sap_target_test.xml", - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } cc_library_static { diff --git a/radio/1.1/vts/functional/Android.bp b/radio/1.1/vts/functional/Android.bp index 58aa67e0f9..e1278b926a 100644 --- a/radio/1.1/vts/functional/Android.bp +++ b/radio/1.1/vts/functional/Android.bp @@ -30,5 +30,5 @@ cc_test { header_libs: [ "radio.util.header@1.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/1.2/vts/functional/Android.bp b/radio/1.2/vts/functional/Android.bp index f7189a8cbd..56f2d5fb49 100644 --- a/radio/1.2/vts/functional/Android.bp +++ b/radio/1.2/vts/functional/Android.bp @@ -34,5 +34,5 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/1.3/vts/functional/Android.bp b/radio/1.3/vts/functional/Android.bp index 2301732331..e32258f5d3 100644 --- a/radio/1.3/vts/functional/Android.bp +++ b/radio/1.3/vts/functional/Android.bp @@ -32,5 +32,5 @@ cc_test { "android.hardware.radio@1.0", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/1.4/vts/functional/Android.bp b/radio/1.4/vts/functional/Android.bp index 82844048b6..369b55b7a2 100644 --- a/radio/1.4/vts/functional/Android.bp +++ b/radio/1.4/vts/functional/Android.bp @@ -35,5 +35,5 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"] + test_suites: ["general-tests", "vts"] } diff --git a/radio/1.5/vts/functional/Android.bp b/radio/1.5/vts/functional/Android.bp index cd30f7dd39..cd54d274fd 100644 --- a/radio/1.5/vts/functional/Android.bp +++ b/radio/1.5/vts/functional/Android.bp @@ -36,5 +36,5 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"] + test_suites: ["general-tests", "vts"] } diff --git a/radio/config/1.0/vts/functional/Android.bp b/radio/config/1.0/vts/functional/Android.bp index 859b24bde9..330209eed0 100644 --- a/radio/config/1.0/vts/functional/Android.bp +++ b/radio/config/1.0/vts/functional/Android.bp @@ -29,5 +29,5 @@ cc_test { "android.hardware.radio.config@1.0", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/config/1.1/vts/functional/Android.bp b/radio/config/1.1/vts/functional/Android.bp index 8cf7b629a5..f60331d1c3 100644 --- a/radio/config/1.1/vts/functional/Android.bp +++ b/radio/config/1.1/vts/functional/Android.bp @@ -29,5 +29,5 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/config/1.2/vts/functional/Android.bp b/radio/config/1.2/vts/functional/Android.bp index 2c2073a214..fdc83b73fc 100644 --- a/radio/config/1.2/vts/functional/Android.bp +++ b/radio/config/1.2/vts/functional/Android.bp @@ -31,5 +31,5 @@ cc_test { "android.hardware.radio.config@1.2", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/rebootescrow/aidl/vts/functional/Android.bp b/rebootescrow/aidl/vts/functional/Android.bp index 5d51a53f06..2cc00685d6 100644 --- a/rebootescrow/aidl/vts/functional/Android.bp +++ b/rebootescrow/aidl/vts/functional/Android.bp @@ -28,7 +28,7 @@ cc_test { "android.hardware.rebootescrow-cpp", ], test_suites: [ - "vts-core", + "vts", ], require_root: true, } diff --git a/renderscript/1.0/vts/functional/Android.bp b/renderscript/1.0/vts/functional/Android.bp index e3716e01b1..327c09edb5 100644 --- a/renderscript/1.0/vts/functional/Android.bp +++ b/renderscript/1.0/vts/functional/Android.bp @@ -28,5 +28,5 @@ cc_test { "android.hardware.renderscript@1.0", "libnativewindow", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/secure_element/1.0/vts/functional/Android.bp b/secure_element/1.0/vts/functional/Android.bp index 6dbd027747..d428c6f771 100644 --- a/secure_element/1.0/vts/functional/Android.bp +++ b/secure_element/1.0/vts/functional/Android.bp @@ -21,5 +21,5 @@ cc_test { static_libs: [ "android.hardware.secure_element@1.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/secure_element/1.1/vts/functional/Android.bp b/secure_element/1.1/vts/functional/Android.bp index a2c39dc973..200aed829d 100644 --- a/secure_element/1.1/vts/functional/Android.bp +++ b/secure_element/1.1/vts/functional/Android.bp @@ -22,5 +22,5 @@ cc_test { "android.hardware.secure_element@1.0", "android.hardware.secure_element@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/secure_element/1.2/vts/functional/Android.bp b/secure_element/1.2/vts/functional/Android.bp index a1732108ab..9a7ca45b54 100644 --- a/secure_element/1.2/vts/functional/Android.bp +++ b/secure_element/1.2/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.secure_element@1.1", "android.hardware.secure_element@1.2", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/sensors/1.0/vts/functional/Android.bp b/sensors/1.0/vts/functional/Android.bp index aaefccbe19..31424abb79 100644 --- a/sensors/1.0/vts/functional/Android.bp +++ b/sensors/1.0/vts/functional/Android.bp @@ -33,6 +33,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/sensors/2.0/vts/functional/Android.bp b/sensors/2.0/vts/functional/Android.bp index 08c59b6378..598ad15923 100644 --- a/sensors/2.0/vts/functional/Android.bp +++ b/sensors/2.0/vts/functional/Android.bp @@ -40,6 +40,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/sensors/2.1/vts/functional/Android.bp b/sensors/2.1/vts/functional/Android.bp index c4f5e9d2d7..3f01a3ec84 100644 --- a/sensors/2.1/vts/functional/Android.bp +++ b/sensors/2.1/vts/functional/Android.bp @@ -42,6 +42,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/soundtrigger/2.0/vts/functional/Android.bp b/soundtrigger/2.0/vts/functional/Android.bp index 13dcdec69e..86697bda3d 100644 --- a/soundtrigger/2.0/vts/functional/Android.bp +++ b/soundtrigger/2.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalSoundtriggerV2_0TargetTest.cpp"], static_libs: ["android.hardware.soundtrigger@2.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/soundtrigger/2.1/vts/functional/Android.bp b/soundtrigger/2.1/vts/functional/Android.bp index 7830fe2602..9de913b641 100644 --- a/soundtrigger/2.1/vts/functional/Android.bp +++ b/soundtrigger/2.1/vts/functional/Android.bp @@ -25,5 +25,5 @@ cc_test { "android.hardware.soundtrigger@2.1", "libhidlmemory" ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/soundtrigger/2.2/vts/functional/Android.bp b/soundtrigger/2.2/vts/functional/Android.bp index b5d241d263..b7967d966f 100644 --- a/soundtrigger/2.2/vts/functional/Android.bp +++ b/soundtrigger/2.2/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.soundtrigger@2.1", "android.hardware.soundtrigger@2.2", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/soundtrigger/2.3/vts/functional/Android.bp b/soundtrigger/2.3/vts/functional/Android.bp index e3855fc372..2c1b9e594e 100644 --- a/soundtrigger/2.3/vts/functional/Android.bp +++ b/soundtrigger/2.3/vts/functional/Android.bp @@ -26,6 +26,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/tetheroffload/config/1.0/vts/functional/Android.bp b/tetheroffload/config/1.0/vts/functional/Android.bp index 7b472e3e79..ad5a1b1af4 100644 --- a/tetheroffload/config/1.0/vts/functional/Android.bp +++ b/tetheroffload/config/1.0/vts/functional/Android.bp @@ -17,5 +17,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalTetheroffloadConfigV1_0TargetTest.cpp"], static_libs: ["android.hardware.tetheroffload.config@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/tetheroffload/control/1.0/vts/functional/Android.bp b/tetheroffload/control/1.0/vts/functional/Android.bp index 4af59b66ed..c51dd8b08d 100644 --- a/tetheroffload/control/1.0/vts/functional/Android.bp +++ b/tetheroffload/control/1.0/vts/functional/Android.bp @@ -20,5 +20,5 @@ cc_test { "android.hardware.tetheroffload.config@1.0", "android.hardware.tetheroffload.control@1.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/thermal/1.0/vts/functional/Android.bp b/thermal/1.0/vts/functional/Android.bp index d183bd8a0e..5ccf07af17 100644 --- a/thermal/1.0/vts/functional/Android.bp +++ b/thermal/1.0/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalThermalV1_0TargetTest.cpp"], static_libs: ["android.hardware.thermal@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/thermal/1.1/vts/functional/Android.bp b/thermal/1.1/vts/functional/Android.bp index 2c43d79766..b869ece290 100644 --- a/thermal/1.1/vts/functional/Android.bp +++ b/thermal/1.1/vts/functional/Android.bp @@ -22,5 +22,5 @@ cc_test { "android.hardware.thermal@1.0", "android.hardware.thermal@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/thermal/2.0/vts/functional/Android.bp b/thermal/2.0/vts/functional/Android.bp index 09405763a2..026cb62577 100644 --- a/thermal/2.0/vts/functional/Android.bp +++ b/thermal/2.0/vts/functional/Android.bp @@ -22,6 +22,6 @@ cc_test { "android.hardware.thermal@1.0", "android.hardware.thermal@2.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/tv/input/1.0/vts/functional/Android.bp b/tv/input/1.0/vts/functional/Android.bp index 5d20bceeed..29d4e21de2 100644 --- a/tv/input/1.0/vts/functional/Android.bp +++ b/tv/input/1.0/vts/functional/Android.bp @@ -21,7 +21,7 @@ cc_test { static_libs: ["android.hardware.tv.input@1.0"], test_suites: [ "general-tests", - "vts-core", + "vts", ], require_root: true, } diff --git a/tv/tuner/1.0/vts/functional/Android.bp b/tv/tuner/1.0/vts/functional/Android.bp index 3637708a6a..641e16a937 100644 --- a/tv/tuner/1.0/vts/functional/Android.bp +++ b/tv/tuner/1.0/vts/functional/Android.bp @@ -32,7 +32,7 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], require_root: true, diff --git a/usb/1.0/vts/functional/Android.bp b/usb/1.0/vts/functional/Android.bp index 1a3b56b99c..ae31bd2d30 100644 --- a/usb/1.0/vts/functional/Android.bp +++ b/usb/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalUsbV1_0TargetTest.cpp"], static_libs: ["android.hardware.usb@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/usb/1.1/vts/functional/Android.bp b/usb/1.1/vts/functional/Android.bp index 32c470b096..5bec94af66 100644 --- a/usb/1.1/vts/functional/Android.bp +++ b/usb/1.1/vts/functional/Android.bp @@ -22,6 +22,6 @@ cc_test { "android.hardware.usb@1.0", "android.hardware.usb@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/vibrator/1.0/vts/functional/Android.bp b/vibrator/1.0/vts/functional/Android.bp index 10ec2cbab6..4ec1aa8064 100644 --- a/vibrator/1.0/vts/functional/Android.bp +++ b/vibrator/1.0/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalVibratorV1_0TargetTest.cpp"], static_libs: ["android.hardware.vibrator@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/vibrator/1.1/vts/functional/Android.bp b/vibrator/1.1/vts/functional/Android.bp index 4cde350e79..b291e7ce50 100644 --- a/vibrator/1.1/vts/functional/Android.bp +++ b/vibrator/1.1/vts/functional/Android.bp @@ -22,6 +22,6 @@ cc_test { "android.hardware.vibrator@1.0", "android.hardware.vibrator@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/vibrator/1.2/vts/functional/Android.bp b/vibrator/1.2/vts/functional/Android.bp index e7052f2b6d..7bf69d06d3 100644 --- a/vibrator/1.2/vts/functional/Android.bp +++ b/vibrator/1.2/vts/functional/Android.bp @@ -23,6 +23,6 @@ cc_test { "android.hardware.vibrator@1.1", "android.hardware.vibrator@1.2", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/vibrator/1.3/vts/functional/Android.bp b/vibrator/1.3/vts/functional/Android.bp index 038dc5ca59..5215ed04cf 100644 --- a/vibrator/1.3/vts/functional/Android.bp +++ b/vibrator/1.3/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { "android.hardware.vibrator@1.2", "android.hardware.vibrator@1.3", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/vibrator/aidl/vts/Android.bp b/vibrator/aidl/vts/Android.bp index d1e135e4a3..28cb4d9856 100644 --- a/vibrator/aidl/vts/Android.bp +++ b/vibrator/aidl/vts/Android.bp @@ -13,6 +13,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/vr/1.0/vts/functional/Android.bp b/vr/1.0/vts/functional/Android.bp index bd0336cc15..6bfa05cad7 100644 --- a/vr/1.0/vts/functional/Android.bp +++ b/vr/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalVrV1_0TargetTest.cpp"], static_libs: ["android.hardware.vr@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/weaver/1.0/vts/functional/Android.bp b/weaver/1.0/vts/functional/Android.bp index 3942deb166..b20f127647 100644 --- a/weaver/1.0/vts/functional/Android.bp +++ b/weaver/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalWeaverV1_0TargetTest.cpp"], static_libs: ["android.hardware.weaver@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index 2242510933..793dd8cc7c 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -51,7 +51,7 @@ cc_test { "android.hardware.wifi@1.3", "libwifi-system-iface" ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } // These tests are split out so that they can be conditioned on presence of the @@ -68,7 +68,7 @@ cc_test { "android.hardware.wifi@1.0", "libwifi-system-iface" ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } // These tests are split out so that they can be conditioned on presence of @@ -85,5 +85,5 @@ cc_test { "android.hardware.wifi@1.0", "libwifi-system-iface" ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.1/vts/functional/Android.bp b/wifi/1.1/vts/functional/Android.bp index d34ae222d9..eb68bc0ddc 100644 --- a/wifi/1.1/vts/functional/Android.bp +++ b/wifi/1.1/vts/functional/Android.bp @@ -27,5 +27,5 @@ cc_test { "android.hardware.wifi@1.3", "libwifi-system-iface" ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.2/vts/functional/Android.bp b/wifi/1.2/vts/functional/Android.bp index d3de5cfc67..90bcac1d33 100644 --- a/wifi/1.2/vts/functional/Android.bp +++ b/wifi/1.2/vts/functional/Android.bp @@ -30,7 +30,7 @@ cc_test { "libwifi-system-iface" ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } cc_test { @@ -47,5 +47,5 @@ cc_test { "libwifi-system-iface" ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.3/vts/functional/Android.bp b/wifi/1.3/vts/functional/Android.bp index 457de2973a..3568330845 100644 --- a/wifi/1.3/vts/functional/Android.bp +++ b/wifi/1.3/vts/functional/Android.bp @@ -30,5 +30,5 @@ cc_test { "libwifi-system-iface" ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.4/default/android.hardware.wifi@1.0-service.rc b/wifi/1.4/default/android.hardware.wifi@1.0-service.rc index 2317bac546..64a51b0ae8 100644 --- a/wifi/1.4/default/android.hardware.wifi@1.0-service.rc +++ b/wifi/1.4/default/android.hardware.wifi@1.0-service.rc @@ -2,6 +2,8 @@ service vendor.wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service interface android.hardware.wifi@1.0::IWifi default interface android.hardware.wifi@1.1::IWifi default interface android.hardware.wifi@1.2::IWifi default + interface android.hardware.wifi@1.3::IWifi default + interface android.hardware.wifi@1.4::IWifi default class hal capabilities NET_ADMIN NET_RAW SYS_MODULE user wifi diff --git a/wifi/1.4/vts/functional/Android.bp b/wifi/1.4/vts/functional/Android.bp index 7e74cbd5de..3824c3aecf 100644 --- a/wifi/1.4/vts/functional/Android.bp +++ b/wifi/1.4/vts/functional/Android.bp @@ -35,6 +35,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp b/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp index 726470cf3b..295c86e1a7 100644 --- a/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp +++ b/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp @@ -140,6 +140,18 @@ TEST_P(WifiRttControllerHidlTest, RegisterEventCallback_1_4) { * rangeRequest_1_4 */ TEST_P(WifiRttControllerHidlTest, RangeRequest_1_4) { + std::pair<WifiStatus, RttCapabilities> status_and_caps; + + // Get the Capabilities + status_and_caps = HIDL_INVOKE(wifi_rtt_controller_, getCapabilities_1_4); + EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_caps.first.code); + // Get the highest support preamble + int preamble = 1; + status_and_caps.second.preambleSupport >>= 1; + while (status_and_caps.second.preambleSupport != 0) { + status_and_caps.second.preambleSupport >>= 1; + preamble <<= 1; + } std::vector<RttConfig> configs; RttConfig config; int cmdId = 55; @@ -148,13 +160,13 @@ TEST_P(WifiRttControllerHidlTest, RangeRequest_1_4) { config.addr[i] = i; } config.type = RttType::ONE_SIDED; - config.peer = RttPeerType::STA; + config.peer = RttPeerType::AP; config.channel.width = WifiChannelWidthInMhz::WIDTH_80; config.channel.centerFreq = 5765; config.channel.centerFreq0 = 5775; config.channel.centerFreq1 = 0; config.bw = RttBw::BW_80MHZ; - config.preamble = RttPreamble::HE; + config.preamble = (RttPreamble)preamble; config.mustRequestLci = false; config.mustRequestLcr = false; config.burstPeriod = 0; diff --git a/wifi/hostapd/1.0/vts/functional/Android.bp b/wifi/hostapd/1.0/vts/functional/Android.bp index e966d7e817..2a35f15190 100644 --- a/wifi/hostapd/1.0/vts/functional/Android.bp +++ b/wifi/hostapd/1.0/vts/functional/Android.bp @@ -48,5 +48,5 @@ cc_test { "libwifi-system", "libwifi-system-iface", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/hostapd/1.1/vts/functional/Android.bp b/wifi/hostapd/1.1/vts/functional/Android.bp index 8670f2fe97..291eceb80c 100644 --- a/wifi/hostapd/1.1/vts/functional/Android.bp +++ b/wifi/hostapd/1.1/vts/functional/Android.bp @@ -30,6 +30,6 @@ cc_test { "libwifi-system", "libwifi-system-iface", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/hostapd/1.2/vts/functional/Android.bp b/wifi/hostapd/1.2/vts/functional/Android.bp index 4f4a741bf3..cec17823fd 100644 --- a/wifi/hostapd/1.2/vts/functional/Android.bp +++ b/wifi/hostapd/1.2/vts/functional/Android.bp @@ -31,6 +31,6 @@ cc_test { "libwifi-system", "libwifi-system-iface", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/offload/1.0/vts/functional/Android.bp b/wifi/offload/1.0/vts/functional/Android.bp index 965c946764..abfefa8214 100644 --- a/wifi/offload/1.0/vts/functional/Android.bp +++ b/wifi/offload/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalWifiOffloadV1_0TargetTest.cpp"], static_libs: ["android.hardware.wifi.offload@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/supplicant/1.0/vts/functional/Android.bp b/wifi/supplicant/1.0/vts/functional/Android.bp index a05cc6bfa8..6f282bb9d7 100644 --- a/wifi/supplicant/1.0/vts/functional/Android.bp +++ b/wifi/supplicant/1.0/vts/functional/Android.bp @@ -54,7 +54,7 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } @@ -77,6 +77,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/wifi/supplicant/1.1/vts/functional/Android.bp b/wifi/supplicant/1.1/vts/functional/Android.bp index 90a3e872fb..44b020e021 100644 --- a/wifi/supplicant/1.1/vts/functional/Android.bp +++ b/wifi/supplicant/1.1/vts/functional/Android.bp @@ -55,6 +55,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/wifi/supplicant/1.2/vts/functional/Android.bp b/wifi/supplicant/1.2/vts/functional/Android.bp index 80f3658edd..c23585aaef 100644 --- a/wifi/supplicant/1.2/vts/functional/Android.bp +++ b/wifi/supplicant/1.2/vts/functional/Android.bp @@ -59,7 +59,7 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } @@ -85,6 +85,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/wifi/supplicant/1.3/vts/functional/Android.bp b/wifi/supplicant/1.3/vts/functional/Android.bp index 00a0bf7ee1..8eebed0586 100644 --- a/wifi/supplicant/1.3/vts/functional/Android.bp +++ b/wifi/supplicant/1.3/vts/functional/Android.bp @@ -62,6 +62,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } |