From f156429b11a5fd4d8872736af2d35a6671f268db Mon Sep 17 00:00:00 2001 From: Irina Efode Date: Thu, 24 Mar 2022 16:34:05 +0300 Subject: [PATCH] [IE TESTS] API Conformance review (#11133) * [IE TESTS] API Conformance review. Part 1 * properties * properties --- .../include/api_conformance_helpers.hpp | 51 +++++----- .../include/ov_api_conformance_helpers.hpp | 65 +++--------- .../executable_network/exec_network_base.cpp | 14 +-- .../executable_network/get_metric.cpp | 12 +-- .../behavior/executable_network/locale.cpp | 15 +++ .../src/behavior/infer_request/callback.cpp | 10 +- .../src/behavior/infer_request/io_blob.cpp | 10 +- .../behavior/infer_request/multitheading.cpp | 8 +- .../behavior/infer_request/perf_counters.cpp | 6 +- .../infer_request/set_blob_by_type.cpp | 8 +- .../src/behavior/infer_request/wait.cpp | 8 +- ..._import_export.cpp => exec_graph_info.cpp} | 8 +- .../exec_network_base.cpp | 8 +- .../ov_executable_network/properties.cpp | 98 +++++++++++++++++++ .../behavior/ov_infer_request/callback.cpp | 8 +- .../ov_infer_request/cancellation.cpp | 2 +- .../infer_request_dynamic.cpp | 10 +- .../ov_infer_request/inference_chaining.cpp | 8 +- .../behavior/ov_infer_request/io_tensor.cpp | 16 +-- .../ov_infer_request/multithreading.cpp | 8 +- .../ov_infer_request/perf_counters.cpp | 8 +- .../src/behavior/ov_infer_request/wait.cpp | 8 +- .../src/behavior/ov_plugin/life_time.cpp | 51 ++++++++++ .../src/behavior/ov_plugin/properties.cpp | 92 +++++++++++++++++ .../behavior/plugin/configuration_tests.cpp | 12 +-- .../src/behavior/plugin/core_integration.cpp | 12 +-- .../behavior/plugin/core_threading_tests.cpp | 6 +- .../src/behavior/plugin/set_preprocess.cpp | 18 ++-- 28 files changed, 401 insertions(+), 179 deletions(-) create mode 100644 src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/locale.cpp rename src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/{ov_exec_net_import_export.cpp => exec_graph_info.cpp} (84%) create mode 100644 src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/properties.cpp create mode 100644 src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/life_time.cpp create mode 100644 src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/properties.cpp diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp index bb3c3cd3f07..3007170dedc 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp @@ -11,78 +11,81 @@ namespace ov { namespace test { namespace conformance { -inline const std::string getPluginLibNameByDevice(const std::string& deviceName) { +inline const std::string get_plugin_lib_name_by_device(const std::string& deviceName) { const std::map devices{ { "AUTO", "openvino_auto_plugin" }, + { "HETERO", "openvino_hetero_plugin" }, + { "BATCH", "openvino_auto_batch_plugin" }, + { "MULTI", "openvino_auto_plugin" }, { "HDDL", "openvino_intel_hddl_plugin" }, { "VPUX", "openvino_intel_vpux_plugin" }, { "CPU", "openvino_intel_cpu_plugin" }, { "GNA", "openvino_intel_gna_plugin" }, { "GPU", "openvino_intel_gpu_plugin" }, - { "HETERO", "openvino_hetero_plugin" }, - { "BATCH", "openvino_auto_batch_plugin" }, - { "MULTI", "openvino_auto_plugin" }, { "MYRIAD", "openvino_intel_myriad_plugin" }, { "TEMPLATE", "openvino_template_plugin" }, }; if (devices.find(deviceName) == devices.end()) { + if (std::string(targetPluginName) != "") { + return targetPluginName; + } throw std::runtime_error("Incorrect device name"); } return devices.at(deviceName); } -inline const std::pair generateDefaultMultiConfig() { +inline const std::pair generate_default_multi_config() { return {MULTI_CONFIG_KEY(DEVICE_PRIORITIES), ov::test::conformance::targetDevice}; } -inline const std::pair generateDefaultHeteroConfig() { +inline const std::pair generate_default_hetero_config() { return { "TARGET_FALLBACK" , ov::test::conformance::targetDevice }; } -inline const std::pair generateDefaultBatchConfig() { +inline const std::pair generate_default_batch_config() { // auto-batching with batch 1 (no real batching in fact, but full machinery is in action) - return { CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(ov::test::conformance::targetDevice)}; + return { CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , ov::test::conformance::targetDevice }; } -inline const std::vector> generateConfigs(const std::string& targetDevice, - const std::vector>& config = {}) { - std::pair defaultConfig; - if (targetDevice == std::string(CommonTestUtils::DEVICE_MULTI) || targetDevice == std::string(CommonTestUtils::DEVICE_AUTO)) { - defaultConfig = generateDefaultMultiConfig(); - } else if (targetDevice == std::string(CommonTestUtils::DEVICE_HETERO)) { - defaultConfig = generateDefaultHeteroConfig(); - } else if (targetDevice == std::string(CommonTestUtils::DEVICE_BATCH)) { - defaultConfig = generateDefaultBatchConfig(); +inline const std::vector> generate_configs(const std::string& target_plugin, + const std::vector>& config = {}) { + std::pair default_config; + if (target_plugin == std::string(CommonTestUtils::DEVICE_MULTI) || target_plugin == std::string(CommonTestUtils::DEVICE_AUTO)) { + default_config = generate_default_multi_config(); + } else if (target_plugin == std::string(CommonTestUtils::DEVICE_HETERO)) { + default_config = generate_default_hetero_config(); + } else if (target_plugin == std::string(CommonTestUtils::DEVICE_BATCH)) { + default_config = generate_default_batch_config(); } else { - throw std::runtime_error("Incorrect target device: " + targetDevice); + throw std::runtime_error("Incorrect target device: " + target_plugin); } std::vector> resultConfig; if (config.empty()) { - return {{defaultConfig}}; + return {{default_config}}; } for (auto configItem : config) { - configItem.insert(defaultConfig); + configItem.insert(default_config); resultConfig.push_back(configItem); } return resultConfig; } -inline const std::string generateComplexDeviceName(const std::string& deviceName) { +inline const std::string generate_complex_device_name(const std::string& deviceName) { return deviceName + ":" + ov::test::conformance::targetDevice; } -inline const std::vector returnAllPossibleDeviceCombination() { +inline const std::vector return_all_possible_device_combination() { std::vector res{ov::test::conformance::targetDevice}; std::vector devices{CommonTestUtils::DEVICE_HETERO, CommonTestUtils::DEVICE_AUTO, CommonTestUtils::DEVICE_BATCH, CommonTestUtils::DEVICE_MULTI}; for (const auto& device : devices) { - res.emplace_back(generateComplexDeviceName(device)); + res.emplace_back(generate_complex_device_name(device)); } return res; } -const std::vector> emptyConfig = { +const std::vector> empty_config = { {}, }; diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp index 635bef834ce..4a650054e37 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp @@ -4,74 +4,37 @@ #pragma once -#include "conformance.hpp" -#include "common_test_utils/test_constants.hpp" - -// TODO: fix namespaces +#include "api_conformance_helpers.hpp" namespace ov { namespace test { namespace conformance { -inline const std::string get_plugin_lib_name_by_device(const std::string& deviceName) { - const std::map devices{ - { "AUTO", "openvino_auto_plugin" }, - { "HDDL", "intel_hddl_plugin" }, - { "VPUX", "openvino_intel_vpux_plugin" }, - { "AUTO", "openvino_auto_plugin" }, - { "CPU", "openvino_intel_cpu_plugin" }, - { "GNA", "openvino_intel_gna_plugin" }, - { "GPU", "openvino_intel_gpu_plugin" }, - { "HETERO", "openvino_hetero_plugin" }, - { "MULTI", "openvino_auto_plugin" }, - { "MYRIAD", "openvino_intel_myriad_plugin" }, - { "TEMPLATE", "openvino_template_plugin" }, - }; - if (devices.find(deviceName) == devices.end()) { - throw std::runtime_error("Incorrect device name"); - } - return devices.at(deviceName); -} - - -inline const std::vector generate_configs(const std::string& targetDevice, - const std::vector& config = {}) { - std::pair defaultConfig; - if (targetDevice == std::string(CommonTestUtils::DEVICE_MULTI) || targetDevice == std::string(CommonTestUtils::DEVICE_AUTO)) { - defaultConfig = ov::device::priorities(ov::test::conformance::targetDevice); - } else if (targetDevice == std::string(CommonTestUtils::DEVICE_HETERO)) { - defaultConfig = ov::device::priorities(ov::test::conformance::targetDevice); - } else if (targetDevice == std::string(CommonTestUtils::DEVICE_BATCH)) { - defaultConfig = { CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(ov::test::conformance::targetDevice)}; +inline const std::vector generate_ov_configs(const std::string& target_plugin, + const std::vector& config = {}) { + std::pair default_config; + if (target_plugin == std::string(CommonTestUtils::DEVICE_MULTI) || + target_plugin == std::string(CommonTestUtils::DEVICE_AUTO) || + target_plugin == std::string(CommonTestUtils::DEVICE_HETERO)) { + default_config = ov::device::priorities(ov::test::conformance::targetDevice); + } else if (target_plugin == std::string(CommonTestUtils::DEVICE_BATCH)) { + default_config = { CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(ov::test::conformance::targetDevice)}; } else { - throw std::runtime_error("Incorrect target device: " + targetDevice); + throw std::runtime_error("Incorrect target device: " + target_plugin); } std::vector resultConfig; if (config.empty()) { - return {{defaultConfig}}; + return {{default_config}}; } for (auto configItem : config) { - configItem.insert(defaultConfig); + configItem.insert(default_config); resultConfig.push_back(configItem); } return resultConfig; } -inline const std::string generate_complex_device_name(const std::string& deviceName) { - return deviceName + ":" + ov::test::conformance::targetDevice; -} - -inline const std::vector return_all_possible_device_combination() { - std::vector res{ov::test::conformance::targetDevice}; - std::vector devices{CommonTestUtils::DEVICE_HETERO, CommonTestUtils::DEVICE_AUTO, CommonTestUtils::DEVICE_MULTI}; - for (const auto& device : devices) { - res.emplace_back(generate_complex_device_name(device)); - } - return res; -} - -const std::vector empty_config = { +const std::vector empty_ov_config = { {}, }; diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/exec_network_base.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/exec_network_base.cpp index a8b6233a578..c6bdb647832 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/exec_network_base.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/exec_network_base.cpp @@ -14,19 +14,19 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ExecutableNetworkBaseTest, ::testing::Combine( ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(emptyConfig)), + ::testing::ValuesIn(empty_config)), ExecutableNetworkBaseTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, ExecutableNetworkBaseTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), ExecutableNetworkBaseTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, ExecutableNetworkBaseTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), ExecutableNetworkBaseTest::getTestCaseName); const std::vector execNetBaseElemTypes = { @@ -40,27 +40,27 @@ namespace { ::testing::Combine( ::testing::ValuesIn(execNetBaseElemTypes), ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(emptyConfig)), + ::testing::ValuesIn(empty_config)), ExecNetSetPrecision::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, ExecNetSetPrecision, ::testing::Combine( ::testing::ValuesIn(execNetBaseElemTypes), ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), ExecNetSetPrecision::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, ExecNetSetPrecision, ::testing::Combine( ::testing::ValuesIn(execNetBaseElemTypes), ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), ExecNetSetPrecision::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, ExecNetSetPrecision, ::testing::Combine( ::testing::ValuesIn(execNetBaseElemTypes), ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), ExecNetSetPrecision::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/get_metric.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/get_metric.cpp index 81b6afcc34d..28bc4b95f96 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/get_metric.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/get_metric.cpp @@ -13,7 +13,7 @@ namespace { INSTANTIATE_TEST_SUITE_P( smoke_IEClassImportExportTestP, IEClassImportExportTestP, - ::testing::Values(generateComplexDeviceName(CommonTestUtils::DEVICE_HETERO))); + ::testing::Values(generate_complex_device_name(CommonTestUtils::DEVICE_HETERO))); // // Executable Network GetMetric @@ -21,23 +21,23 @@ INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS, - ::testing::ValuesIn(returnAllPossibleDeviceCombination())); + ::testing::ValuesIn(return_all_possible_device_combination())); INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_METRICS, - ::testing::ValuesIn(returnAllPossibleDeviceCombination())); + ::testing::ValuesIn(return_all_possible_device_combination())); INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_NETWORK_NAME, - ::testing::ValuesIn(returnAllPossibleDeviceCombination())); + ::testing::ValuesIn(return_all_possible_device_combination())); INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_OPTIMAL_NUMBER_OF_INFER_REQUESTS, - ::testing::ValuesIn(returnAllPossibleDeviceCombination())); + ::testing::ValuesIn(return_all_possible_device_combination())); INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_ThrowsUnsupported, - ::testing::ValuesIn(returnAllPossibleDeviceCombination())); + ::testing::ValuesIn(return_all_possible_device_combination())); // // Executable Network GetConfig / SetConfig diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/locale.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/locale.cpp new file mode 100644 index 00000000000..c35afa7ca31 --- /dev/null +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/locale.cpp @@ -0,0 +1,15 @@ +// Copyright (C) 2018-2022 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/executable_network/locale.hpp" +#include "conformance.hpp" + +using namespace BehaviorTestsDefinitions; +namespace { + INSTANTIATE_TEST_SUITE_P(smoke_CustomLocaleTest, CustomLocaleTest, + ::testing::Combine( + ::testing::Values("ru_RU.UTF-8"), + ::testing::Values(ov::test::conformance::targetDevice)), + CustomLocaleTest::getTestCaseName); +} // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/callback.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/callback.cpp index e1a04c6c0b6..fd48bb536bf 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/callback.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/callback.cpp @@ -12,30 +12,30 @@ using namespace ov::test::conformance; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestCallbackTests, ::testing::Combine( ::testing::Values(targetDevice), - ::testing::ValuesIn(emptyConfig)), + ::testing::ValuesIn(empty_config)), InferRequestCallbackTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestCallbackTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), InferRequestCallbackTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestCallbackTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), InferRequestCallbackTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, InferRequestCallbackTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), InferRequestCallbackTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Batch_BehaviorTests, InferRequestCallbackTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_BATCH))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_BATCH))), InferRequestCallbackTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/io_blob.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/io_blob.cpp index 6287ca6c709..99a3705f0d7 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/io_blob.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/io_blob.cpp @@ -15,30 +15,30 @@ using namespace ov::test::conformance; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestIOBBlobTest, ::testing::Combine( ::testing::Values(targetDevice), - ::testing::ValuesIn(emptyConfig)), + ::testing::ValuesIn(empty_config)), InferRequestIOBBlobTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestIOBBlobTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), InferRequestIOBBlobTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestIOBBlobTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), InferRequestIOBBlobTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, InferRequestIOBBlobTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), InferRequestIOBBlobTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Batch_BehaviorTests, InferRequestIOBBlobTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_BATCH))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_BATCH))), InferRequestIOBBlobTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/multitheading.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/multitheading.cpp index 3cd820860da..d7999680638 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/multitheading.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/multitheading.cpp @@ -22,25 +22,25 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestMultithreadingTests, INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestMultithreadingTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), InferRequestMultithreadingTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestMultithreadingTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), InferRequestMultithreadingTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, InferRequestMultithreadingTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), InferRequestMultithreadingTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Batch_BehaviorTests, InferRequestMultithreadingTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_BATCH))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_BATCH))), InferRequestMultithreadingTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/perf_counters.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/perf_counters.cpp index b74d4379bf7..a12053ec201 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/perf_counters.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/perf_counters.cpp @@ -18,19 +18,19 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestPerfCountersTest, INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestPerfCountersTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), InferRequestPerfCountersTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestPerfCountersTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), InferRequestPerfCountersTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, InferRequestPerfCountersTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), InferRequestPerfCountersTest::getTestCaseName); diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/set_blob_by_type.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/set_blob_by_type.cpp index 2771a20c752..7f30d2e44ae 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/set_blob_by_type.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/set_blob_by_type.cpp @@ -31,24 +31,24 @@ INSTANTIATE_TEST_SUITE_P(smoke_Behavior, InferRequestSetBlobByType, INSTANTIATE_TEST_SUITE_P(smoke_Behavior_Multi, InferRequestSetBlobByType, ::testing::Combine(::testing::ValuesIn(setBlobTypes), ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), InferRequestSetBlobByType::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Behavior_Auto, InferRequestSetBlobByType, ::testing::Combine(::testing::ValuesIn(setBlobTypes), ::testing::Values(CommonTestUtils::DEVICE_AUTO + std::string(":") + targetDevice), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), InferRequestSetBlobByType::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Behavior_Hetero, InferRequestSetBlobByType, ::testing::Combine(::testing::ValuesIn(setBlobTypes), ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), InferRequestSetBlobByType::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Behavior_Batch, InferRequestSetBlobByType, ::testing::Combine(::testing::ValuesIn(setBlobTypes), ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_BATCH))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_BATCH))), InferRequestSetBlobByType::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/wait.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/wait.cpp index dc807858191..9d5276b6415 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/wait.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/infer_request/wait.cpp @@ -21,24 +21,24 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestWaitTests, INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestWaitTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), InferRequestWaitTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestWaitTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), InferRequestWaitTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, InferRequestWaitTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), InferRequestWaitTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Batch_BehaviorTests, InferRequestWaitTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_BATCH))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_BATCH))), InferRequestWaitTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/ov_exec_net_import_export.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp similarity index 84% rename from src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/ov_exec_net_import_export.cpp rename to src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp index f65db8aef94..cb98b835b29 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/ov_exec_net_import_export.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp @@ -29,7 +29,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ::testing::Combine( ::testing::ValuesIn(ovExecGraphInfoElemTypes), ::testing::Values(CommonTestUtils::DEVICE_CPU), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVExecGraphImportExportTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, @@ -37,7 +37,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, ::testing::Combine( ::testing::ValuesIn(ovExecGraphInfoElemTypes), ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_MULTI))), OVExecGraphImportExportTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, @@ -45,14 +45,14 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, ::testing::Combine( ::testing::ValuesIn(ovExecGraphInfoElemTypes), ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_AUTO))), OVExecGraphImportExportTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVExecGraphImportExportTest, ::testing::Combine(::testing::ValuesIn(ovExecGraphInfoElemTypes), ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_HETERO))), OVExecGraphImportExportTest::getTestCaseName); } // namespace \ No newline at end of file diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_network_base.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_network_base.cpp index 726ce6bbbd5..17ac6656258 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_network_base.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_network_base.cpp @@ -13,24 +13,24 @@ using namespace ov::test::conformance; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVExecutableNetworkBaseTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVExecutableNetworkBaseTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVExecutableNetworkBaseTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_MULTI))), OVExecutableNetworkBaseTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVExecutableNetworkBaseTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_AUTO))), OVExecutableNetworkBaseTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVExecutableNetworkBaseTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_HETERO))), OVExecutableNetworkBaseTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/properties.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/properties.cpp new file mode 100644 index 00000000000..af20cd224cd --- /dev/null +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/properties.cpp @@ -0,0 +1,98 @@ +// Copyright (C) 2018-2022 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_executable_network/properties.hpp" +#include "openvino/runtime/properties.hpp" +#include "ov_api_conformance_helpers.hpp" + +using namespace ov::test::behavior; + +namespace { + +const std::vector inproperties = { + {ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}, +}; + +const std::vector auto_batch_inproperties = { + {{ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}}, + {{ov::auto_batch_timeout(-1)}}, +}; + +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, + ::testing::Combine( + ::testing::Values(ov::test::conformance::targetDevice), + ::testing::ValuesIn(inproperties)), + OVCompiledModelPropertiesIncorrectTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::ValuesIn(inproperties)), + OVCompiledModelPropertiesIncorrectTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_MULTI), + ::testing::ValuesIn(inproperties)), + OVCompiledModelPropertiesIncorrectTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_AUTO), + ::testing::ValuesIn(ov::test::conformance::generate_ov_configs(CommonTestUtils::DEVICE_AUTO, auto_batch_inproperties))), + OVCompiledModelPropertiesIncorrectTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(auto_batch_inproperties)), + OVCompiledModelPropertiesIncorrectTests::getTestCaseName); + +const std::vector default_properties = { + {ov::enable_profiling(true)}, + {ov::device::id("0")}, +}; + +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesDefaultTests, + ::testing::Combine( + ::testing::Values(ov::test::conformance::targetDevice), + ::testing::ValuesIn(default_properties)), + OVCompiledModelPropertiesDefaultTests::getTestCaseName); + +const std::vector auto_batch_properties = { + {}, + {{CONFIG_KEY(AUTO_BATCH_TIMEOUT) , "1"}}, + {{ov::auto_batch_timeout(10)}}, +}; + +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesTests, + ::testing::Combine( + ::testing::Values(ov::test::conformance::targetDevice), + ::testing::ValuesIn(default_properties)), + OVCompiledModelPropertiesTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVCompiledModelPropertiesTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::ValuesIn(ov::test::conformance::generate_ov_configs(CommonTestUtils::DEVICE_HETERO, default_properties))), + OVCompiledModelPropertiesTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVCompiledModelPropertiesTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_MULTI), + ::testing::ValuesIn(ov::test::conformance::generate_ov_configs(CommonTestUtils::DEVICE_MULTI, default_properties))), + OVCompiledModelPropertiesTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVCompiledModelPropertiesTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_AUTO), + ::testing::ValuesIn(ov::test::conformance::generate_ov_configs(CommonTestUtils::DEVICE_AUTO, default_properties))), + OVCompiledModelPropertiesTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVCompiledModelPropertiesTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(ov::test::conformance::generate_ov_configs(CommonTestUtils::DEVICE_BATCH, auto_batch_properties))), + OVCompiledModelPropertiesTests::getTestCaseName); +} // namespace \ No newline at end of file diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/callback.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/callback.cpp index 1d6ea564140..8aba397c6af 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/callback.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/callback.cpp @@ -14,24 +14,24 @@ using namespace ov::test::conformance; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCallbackTests, ::testing::Combine( ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVInferRequestCallbackTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestCallbackTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_MULTI))), OVInferRequestCallbackTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestCallbackTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_AUTO))), OVInferRequestCallbackTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferRequestCallbackTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_HETERO))), OVInferRequestCallbackTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/cancellation.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/cancellation.cpp index 2ea38d1a69c..a49339c9cdc 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/cancellation.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/cancellation.cpp @@ -12,6 +12,6 @@ using namespace ov::test::conformance; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCancellationTests, ::testing::Combine( ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVInferRequestCancellationTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/infer_request_dynamic.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/infer_request_dynamic.cpp index 4b52b6faebf..94359428368 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/infer_request_dynamic.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/infer_request_dynamic.cpp @@ -61,7 +61,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_1, OVInferRequestDynamicTests, {{1, 4, 20, 20}, {1, 4, 20, 20}}, {{2, 4, 20, 20}, {2, 4, 20, 20}}}), ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVInferRequestDynamicTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_2, OVInferRequestDynamicTests, @@ -71,7 +71,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_2, OVInferRequestDynamicTests, {{1, 4, 20, 20}, {1, 2, 20, 40}}, {{2, 4, 20, 20}, {2, 2, 20, 40}}}), ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVInferRequestDynamicTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferRequestDynamicTests, @@ -81,7 +81,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferRequestDynamicTests, {{1, 4, 20, 20}, {1, 2, 20, 40}}, {{2, 4, 20, 20}, {2, 2, 20, 40}}}), ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_HETERO))), OVInferRequestDynamicTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestDynamicTests, @@ -91,7 +91,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestDynamicTests, {{1, 4, 20, 20}, {1, 2, 20, 40}}, {{2, 4, 20, 20}, {2, 2, 20, 40}}}), ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_MULTI))), OVInferRequestDynamicTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestDynamicTests, @@ -101,6 +101,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestDynamicTests, {{1, 4, 20, 20}, {1, 2, 20, 40}}, {{2, 4, 20, 20}, {2, 2, 20, 40}}}), ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_AUTO))), OVInferRequestDynamicTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/inference_chaining.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/inference_chaining.cpp index 1724b183dc7..762fe4ced61 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/inference_chaining.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/inference_chaining.cpp @@ -13,24 +13,24 @@ using namespace ov::test::conformance; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferenceChaining, ::testing::Combine( ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVInferenceChaining::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferenceChaining, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_HETERO))), OVInferenceChaining::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferenceChaining, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_MULTI))), OVInferenceChaining::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferenceChaining, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_AUTO))), OVInferenceChaining::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/io_tensor.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/io_tensor.cpp index aadfd346c86..0401447909b 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/io_tensor.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/io_tensor.cpp @@ -15,25 +15,25 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestIOTensorTest, ::testing::Combine( ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVInferRequestIOTensorTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestIOTensorTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_MULTI))), OVInferRequestIOTensorTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestIOTensorTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_AUTO))), OVInferRequestIOTensorTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferRequestIOTensorTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_HETERO))), OVInferRequestIOTensorTest::getTestCaseName); std::vector ovIOTensorElemTypes = { @@ -59,27 +59,27 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestIOTensorSetPrecision ::testing::Combine( ::testing::ValuesIn(ovIOTensorElemTypes), ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVInferRequestIOTensorSetPrecisionTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestIOTensorSetPrecisionTest, ::testing::Combine( ::testing::ValuesIn(ovIOTensorElemTypes), ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_MULTI))), OVInferRequestIOTensorSetPrecisionTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestIOTensorSetPrecisionTest, ::testing::Combine( ::testing::ValuesIn(ovIOTensorElemTypes), ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_AUTO))), OVInferRequestIOTensorSetPrecisionTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferRequestIOTensorSetPrecisionTest, ::testing::Combine( ::testing::ValuesIn(ovIOTensorElemTypes), ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_HETERO))), OVInferRequestIOTensorSetPrecisionTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/multithreading.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/multithreading.cpp index 3ae65e36c92..b17ee844ea1 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/multithreading.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/multithreading.cpp @@ -15,25 +15,25 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestMultithreadingTests, ::testing::Combine( ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVInferRequestMultithreadingTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestMultithreadingTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_MULTI))), OVInferRequestMultithreadingTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestMultithreadingTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_AUTO))), OVInferRequestMultithreadingTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferRequestMultithreadingTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_HETERO))), OVInferRequestMultithreadingTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/perf_counters.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/perf_counters.cpp index 07796fa7153..1c7621d71aa 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/perf_counters.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/perf_counters.cpp @@ -12,24 +12,24 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestPerfCountersTest, ::testing::Combine( ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVInferRequestPerfCountersTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestPerfCountersTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_MULTI))), OVInferRequestPerfCountersTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestPerfCountersTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_AUTO))), OVInferRequestPerfCountersTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferRequestPerfCountersTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_HETERO))), OVInferRequestPerfCountersTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/wait.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/wait.cpp index 538d55b0662..1690964fb0f 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/wait.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/wait.cpp @@ -15,24 +15,24 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestWaitTests, ::testing::Combine( ::testing::Values(ov::test::conformance::targetDevice), - ::testing::ValuesIn(empty_config)), + ::testing::ValuesIn(empty_ov_config)), OVInferRequestWaitTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestWaitTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_MULTI))), OVInferRequestWaitTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestWaitTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_AUTO))), OVInferRequestWaitTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferRequestWaitTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(generate_ov_configs(CommonTestUtils::DEVICE_HETERO))), OVInferRequestWaitTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/life_time.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/life_time.cpp new file mode 100644 index 00000000000..1e1fd8aeb93 --- /dev/null +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/life_time.cpp @@ -0,0 +1,51 @@ +// Copyright (C) 2018-2022 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_plugin/life_time.hpp" +#include "ov_api_conformance_helpers.hpp" + +using namespace ov::test::behavior; + +namespace { + +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVHoldersTest, + ::testing::Values(ov::test::conformance::targetDevice), + OVHoldersTest::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVHoldersTest, + ::testing::Values(ov::test::conformance::generate_complex_device_name(CommonTestUtils::DEVICE_HETERO)), + OVHoldersTest::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVHoldersTest, + ::testing::Values(ov::test::conformance::generate_complex_device_name(CommonTestUtils::DEVICE_AUTO)), + OVHoldersTest::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVHoldersTest, + ::testing::Values(ov::test::conformance::generate_complex_device_name(CommonTestUtils::DEVICE_BATCH)), + OVHoldersTest::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVHoldersTest, + ::testing::Values(ov::test::conformance::generate_complex_device_name(CommonTestUtils::DEVICE_MULTI)), + OVHoldersTest::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVHoldersTestOnImportedNetwork, + ::testing::Values(ov::test::conformance::targetDevice), + OVHoldersTestOnImportedNetwork::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVHoldersTestOnImportedNetwork, + ::testing::Values(ov::test::conformance::generate_complex_device_name(CommonTestUtils::DEVICE_HETERO)), + OVHoldersTestOnImportedNetwork::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVHoldersTestOnImportedNetwork, + ::testing::Values(ov::test::conformance::generate_complex_device_name(CommonTestUtils::DEVICE_AUTO)), + OVHoldersTestOnImportedNetwork::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVHoldersTestOnImportedNetwork, + ::testing::Values(ov::test::conformance::generate_complex_device_name(CommonTestUtils::DEVICE_BATCH)), + OVHoldersTestOnImportedNetwork::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVHoldersTestOnImportedNetwork, + ::testing::Values(ov::test::conformance::generate_complex_device_name(CommonTestUtils::DEVICE_MULTI)), + OVHoldersTestOnImportedNetwork::getTestCaseName); +} // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/properties.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/properties.cpp new file mode 100644 index 00000000000..a757f52d6a7 --- /dev/null +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/properties.cpp @@ -0,0 +1,92 @@ +// Copyright (C) 2018-2022 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_plugin/properties_tests.hpp" +#include "openvino/runtime/properties.hpp" +#include "ov_api_conformance_helpers.hpp" + +using namespace ov::test::behavior; + +namespace { + +const std::vector inproperties = { + {ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}, +}; + +const std::vector auto_batch_inproperties = { + {{ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}}, + {{ov::auto_batch_timeout(-1)}}, +}; + +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVPropertiesIncorrectTests, + ::testing::Combine( + ::testing::Values(ov::test::conformance::targetDevice), + ::testing::ValuesIn(inproperties)), + OVPropertiesIncorrectTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVPropertiesIncorrectTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::ValuesIn(inproperties)), + OVPropertiesIncorrectTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVPropertiesIncorrectTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_MULTI), + ::testing::ValuesIn(inproperties)), + OVPropertiesIncorrectTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVPropertiesIncorrectTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_AUTO), + ::testing::ValuesIn(ov::test::conformance::generate_ov_configs(CommonTestUtils::DEVICE_AUTO, auto_batch_inproperties))), + OVPropertiesIncorrectTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVPropertiesIncorrectTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(auto_batch_inproperties)), + OVPropertiesIncorrectTests::getTestCaseName); + +const std::vector default_properties = { + {ov::enable_profiling(true)}, + {ov::device::id("0")}, +}; + +const std::vector auto_batch_properties = { + {}, + {{CONFIG_KEY(AUTO_BATCH_TIMEOUT) , "1"}}, + {{ov::auto_batch_timeout(10)}}, +}; + +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVPropertiesTests, + ::testing::Combine( + ::testing::Values(ov::test::conformance::targetDevice), + ::testing::ValuesIn(default_properties)), + OVPropertiesTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVPropertiesTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::ValuesIn(ov::test::conformance::generate_ov_configs(CommonTestUtils::DEVICE_HETERO, default_properties))), + OVPropertiesTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVPropertiesTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_MULTI), + ::testing::ValuesIn(ov::test::conformance::generate_ov_configs(CommonTestUtils::DEVICE_MULTI, default_properties))), + OVPropertiesTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVPropertiesTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_AUTO), + ::testing::ValuesIn(ov::test::conformance::generate_ov_configs(CommonTestUtils::DEVICE_AUTO, default_properties))), + OVPropertiesTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVPropertiesTests, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(ov::test::conformance::generate_ov_configs(CommonTestUtils::DEVICE_BATCH, auto_batch_properties))), + OVPropertiesTests::getTestCaseName); +} // namespace \ No newline at end of file diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/configuration_tests.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/configuration_tests.cpp index 23bcd802554..aeff92b8847 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/configuration_tests.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/configuration_tests.cpp @@ -53,13 +53,13 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, CorrectConfigTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_MULTI, pluginMultiConfigs))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI, pluginMultiConfigs))), CorrectConfigTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, CorrectConfigTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_AUTO, pluginMultiConfigs))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO, pluginMultiConfigs))), CorrectConfigTests::getTestCaseName); const std::vector> inPluginConfigs = { @@ -89,13 +89,13 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, IncorrectConfigTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_MULTI, pluginMultiInConfigs))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI, pluginMultiInConfigs))), IncorrectConfigTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, IncorrectConfigTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_AUTO, pluginMultiInConfigs))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO, pluginMultiInConfigs))), IncorrectConfigTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigAPITests, @@ -107,13 +107,13 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, IncorrectConfigAPITests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_MULTI, pluginMultiInConfigs))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_MULTI, pluginMultiInConfigs))), IncorrectConfigAPITests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, IncorrectConfigAPITests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(generateConfigs(CommonTestUtils::DEVICE_AUTO, pluginMultiInConfigs))), + ::testing::ValuesIn(generate_configs(CommonTestUtils::DEVICE_AUTO, pluginMultiInConfigs))), IncorrectConfigAPITests::getTestCaseName); const std::vector> pluginConfigsCheck = { diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_integration.cpp index f543918d1ab..7fa990c554a 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_integration.cpp @@ -16,7 +16,7 @@ namespace { INSTANTIATE_TEST_SUITE_P( smoke_IEClassCommon, IEClassBasicTestP, - ::testing::Values(std::make_pair(getPluginLibNameByDevice(ov::test::conformance::targetDevice), ov::test::conformance::targetDevice))); + ::testing::Values(std::make_pair(get_plugin_lib_name_by_device(ov::test::conformance::targetDevice), ov::test::conformance::targetDevice))); INSTANTIATE_TEST_SUITE_P( smoke_IEClassNetworkTestP, IEClassNetworkTestP, @@ -28,11 +28,11 @@ INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_CONFIG_KEYS, - ::testing::ValuesIn(returnAllPossibleDeviceCombination())); + ::testing::ValuesIn(return_all_possible_device_combination())); INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_METRICS, - ::testing::ValuesIn(returnAllPossibleDeviceCombination())); + ::testing::ValuesIn(return_all_possible_device_combination())); INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_AVAILABLE_DEVICES, @@ -40,7 +40,7 @@ INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_FULL_DEVICE_NAME, - ::testing::ValuesIn(returnAllPossibleDeviceCombination())); + ::testing::ValuesIn(return_all_possible_device_combination())); INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_OPTIMIZATION_CAPABILITIES, @@ -56,11 +56,11 @@ INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_ThrowUnsupported, - ::testing::ValuesIn(returnAllPossibleDeviceCombination())); + ::testing::ValuesIn(return_all_possible_device_combination())); INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetConfigTest, IEClassGetConfigTest_ThrowUnsupported, - ::testing::ValuesIn(returnAllPossibleDeviceCombination())); + ::testing::ValuesIn(return_all_possible_device_combination())); INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetAvailableDevices, IEClassGetAvailableDevices, diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_threading_tests.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_threading_tests.cpp index f6532a8703f..f944ac769d4 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_threading_tests.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_threading_tests.cpp @@ -10,9 +10,9 @@ using namespace ov::test::conformance; namespace { const Params coreThreadingParams[] = { - std::tuple{ CommonTestUtils::DEVICE_HETERO, generateConfigs(CommonTestUtils::DEVICE_HETERO).front() }, - std::tuple{ CommonTestUtils::DEVICE_MULTI, generateConfigs(CommonTestUtils::DEVICE_MULTI).front() }, - std::tuple{ CommonTestUtils::DEVICE_AUTO, generateConfigs(CommonTestUtils::DEVICE_AUTO).front() }, + std::tuple{ CommonTestUtils::DEVICE_HETERO, generate_configs(CommonTestUtils::DEVICE_HETERO).front() }, + std::tuple{ CommonTestUtils::DEVICE_MULTI, generate_configs(CommonTestUtils::DEVICE_MULTI).front() }, + std::tuple{ CommonTestUtils::DEVICE_AUTO, generate_configs(CommonTestUtils::DEVICE_AUTO).front() }, }; INSTANTIATE_TEST_SUITE_P(Conformance_, CoreThreadingTests, testing::ValuesIn(coreThreadingParams), CoreThreadingTests::getTestCaseName); diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/set_preprocess.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/set_preprocess.cpp index d16c3a0b0a2..412b20122af 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/set_preprocess.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/set_preprocess.cpp @@ -30,21 +30,21 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, InferRequestPreprocessTest, ::testing::Combine( ::testing::ValuesIn(netPrecisionsPreprocess), ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(ov::test::conformance::generateConfigs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(ov::test::conformance::generate_configs(CommonTestUtils::DEVICE_HETERO))), InferRequestPreprocessTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestPreprocessTest, ::testing::Combine( ::testing::ValuesIn(netPrecisionsPreprocess), ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(ov::test::conformance::generateConfigs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(ov::test::conformance::generate_configs(CommonTestUtils::DEVICE_MULTI))), InferRequestPreprocessTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestPreprocessTest, ::testing::Combine( ::testing::ValuesIn(netPrecisionsPreprocess), ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(ov::test::conformance::generateConfigs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(ov::test::conformance::generate_configs(CommonTestUtils::DEVICE_AUTO))), InferRequestPreprocessTest::getTestCaseName); @@ -101,7 +101,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, InferRequestPreprocessConve ::testing::Bool(), ::testing::Bool(), ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(ov::test::conformance::generateConfigs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(ov::test::conformance::generate_configs(CommonTestUtils::DEVICE_HETERO))), InferRequestPreprocessConversionTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, InferRequestPreprocessDynamicallyInSetBlobTest, @@ -115,7 +115,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, InferRequestPreprocessDynam ::testing::Values(true), // only SetBlob ::testing::Values(true), // only SetBlob ::testing::Values(CommonTestUtils::DEVICE_HETERO), - ::testing::ValuesIn(ov::test::conformance::generateConfigs(CommonTestUtils::DEVICE_HETERO))), + ::testing::ValuesIn(ov::test::conformance::generate_configs(CommonTestUtils::DEVICE_HETERO))), InferRequestPreprocessDynamicallyInSetBlobTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestPreprocessConversionTest, @@ -129,7 +129,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestPreprocessConver ::testing::Bool(), ::testing::Bool(), ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(ov::test::conformance::generateConfigs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(ov::test::conformance::generate_configs(CommonTestUtils::DEVICE_MULTI))), InferRequestPreprocessConversionTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestPreprocessDynamicallyInSetBlobTest, @@ -143,7 +143,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestPreprocessDynami ::testing::Values(true), // only SetBlob ::testing::Values(true), // only SetBlob ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(ov::test::conformance::generateConfigs(CommonTestUtils::DEVICE_MULTI))), + ::testing::ValuesIn(ov::test::conformance::generate_configs(CommonTestUtils::DEVICE_MULTI))), InferRequestPreprocessDynamicallyInSetBlobTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestPreprocessConversionTest, @@ -157,7 +157,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestPreprocessConvers ::testing::Bool(), ::testing::Bool(), ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(ov::test::conformance::generateConfigs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(ov::test::conformance::generate_configs(CommonTestUtils::DEVICE_AUTO))), InferRequestPreprocessConversionTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestPreprocessDynamicallyInSetBlobTest, @@ -171,6 +171,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestPreprocessDynamic ::testing::Values(true), // only SetBlob ::testing::Values(true), // only SetBlob ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(ov::test::conformance::generateConfigs(CommonTestUtils::DEVICE_AUTO))), + ::testing::ValuesIn(ov::test::conformance::generate_configs(CommonTestUtils::DEVICE_AUTO))), InferRequestPreprocessDynamicallyInSetBlobTest::getTestCaseName); } // namespace