diff --git a/src/plugins/hetero/tests/functional/skip_tests_config.cpp b/src/plugins/hetero/tests/functional/skip_tests_config.cpp index 28dd6da43e385b..eabe59bd5cc80e 100644 --- a/src/plugins/hetero/tests/functional/skip_tests_config.cpp +++ b/src/plugins/hetero/tests/functional/skip_tests_config.cpp @@ -14,6 +14,6 @@ std::vector disabledTestPatterns() { R"(.*smoke_(Multi|Auto|Hetero)_BehaviorTests.*OVPropertiesTests.*SetCorrectProperties.*)", R"(.*smoke_(Multi|Auto|Hetero)_BehaviorTests.*OVPropertiesTests.*canSetPropertyAndCheckGetProperty.*)", R"(.*OVInferRequestCheckTensorPrecision.*get(Input|Output|Inputs|Outputs)From.*FunctionWith(Single|Several).*type=(u4|u1|i4|boolean).*)", - }; + R"(.*OVGetMetricPropsTest.*OVGetMetricPropsTest.*GetMetricAndPrintNoThrow_AVAILABLE_DEVICES.*)"}; return retVector; } diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index 9259c1e852a809..7f0f0d43ecfae0 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -6,6 +6,8 @@ #include "behavior/ov_plugin/query_model.hpp" #include "openvino/runtime/core.hpp" #include "ov_api_conformance_helpers.hpp" +#include "behavior/ov_plugin/properties_tests.hpp" +#include "base/ov_behavior_test_utils.hpp" using namespace ov::test::behavior; using namespace ov::test::conformance; @@ -15,9 +17,7 @@ namespace { // OV Class Common tests with // -INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, - OVClassModelTestP, - ::testing::Values(ov::test::utils::target_device)); +INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVClassModelTestP, ::testing::Values(ov::test::utils::target_device)); INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassModelOptionalTestP, @@ -25,7 +25,9 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, // OV Class Query network -INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, +static std::string (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; +INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassQueryModelTest, - ::testing::Values(ov::test::utils::target_device)); + ::testing::Values(ov::test::utils::target_device), + MARK_MANDATORY_API_FOR_HW_DEVICE(NULL_getTestCaseName)); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp index 2ca9df779c4295..01c94259eb9d69 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp @@ -4,6 +4,7 @@ #include "behavior/ov_plugin/life_time.hpp" #include "ov_api_conformance_helpers.hpp" +#include "base/ov_behavior_test_utils.hpp" using namespace ov::test::behavior; using namespace ov::test::conformance; @@ -14,7 +15,8 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVHoldersTest, ::testing::Values(ov::test::utils::target_device), OVHoldersTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVHoldersTestOnImportedNetwork, - ::testing::Values(ov::test::utils::target_device), - OVHoldersTestOnImportedNetwork::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(ov_plugin, + OVHoldersTestOnImportedNetwork, + ::testing::Values(ov::test::utils::target_device), + MARK_MANDATORY_API_FOR_HW_DEVICE(OVHoldersTestOnImportedNetwork::getTestCaseName)); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp index 5343b4a99bfb37..07e2952a5df831 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp @@ -105,17 +105,20 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckMetricsPropsTests_ModelDependceProps, // OV Class GetMetric // -INSTANTIATE_TEST_SUITE_P( - ov_plugin_mandatory, OVGetMetricPropsTest, - ::testing::Values(ov::test::utils::target_device)); +static std::string (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; +INSTANTIATE_TEST_SUITE_P(ov_plugin, + OVGetMetricPropsTest, + ::testing::Values(ov::test::utils::target_device), + MARK_MANDATORY_API_FOR_HW_DEVICE(NULL_getTestCaseName)); INSTANTIATE_TEST_SUITE_P( ov_plugin, OVGetMetricPropsOptionalTest, ::testing::Values(ov::test::utils::target_device)); -INSTANTIATE_TEST_SUITE_P( - ov_plugin_mandatory, OVGetAvailableDevicesPropsTest, - ::testing::Values(ov::test::utils::target_device)); +INSTANTIATE_TEST_SUITE_P(ov_plugin, + OVGetAvailableDevicesPropsTest, + ::testing::Values(ov::test::utils::target_device), + MARK_MANDATORY_API_FOR_HW_DEVICE(NULL_getTestCaseName)); // // OV Class GetConfig diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index b84ea192757fdd..a4f3b57d65bd5d 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -30,9 +30,17 @@ #include "common_test_utils/subgraph_builders/concat_with_params.hpp" #include "common_test_utils/subgraph_builders/split_concat.hpp" -#define MARK_MANDATORY_PROPERTY_FOR_HW_DEVICE(GET_TEST_NAME) \ - [](const testing::TestParamInfo& info) { \ - std::string name = GET_TEST_NAME(info); \ +#define MARK_MANDATORY_PROPERTY_FOR_HW_DEVICE(GET_TEST_NAME) \ + [](const testing::TestParamInfo& info) { \ + std::string name = GET_TEST_NAME(info); \ + return (sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_") + name; \ + } + +#define MARK_MANDATORY_API_FOR_HW_DEVICE(GET_TEST_NAME) \ + [](const testing::TestParamInfo& info) { \ + std::string name = ""; \ + if (NULL != GET_TEST_NAME) \ + name += GET_TEST_NAME(info); \ return (sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_") + name; \ } diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp index a8a5a7c4a299c7..7d1a3084fe6717 100644 --- a/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp @@ -76,9 +76,6 @@ TEST_P(OVClassQueryModelTest, QueryModelWithMatMul) { } TEST_P(OVClassQueryModelTest, QueryModelHETEROWithDeviceIDNoThrow) { - if (sw_plugin_in_target_device(target_device)) { - return; - } ov::Core ie = ov::test::utils::create_core(); auto deviceIDs = ie.get_property(target_device, ov::available_devices); diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/life_time.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/life_time.cpp index d465941ac0246f..23d161f7ec16a3 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/life_time.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/life_time.cpp @@ -148,9 +148,6 @@ void OVHoldersTestOnImportedNetwork::TearDown() { } TEST_P(OVHoldersTestOnImportedNetwork, LoadedTensor) { - if (sw_plugin_in_target_device(target_device)) { - return; - } ov::Core core = ov::test::utils::create_core(); std::stringstream stream; { @@ -163,9 +160,6 @@ TEST_P(OVHoldersTestOnImportedNetwork, LoadedTensor) { } TEST_P(OVHoldersTestOnImportedNetwork, CreateRequestWithCoreRemoved) { - if (sw_plugin_in_target_device(target_device)) { - return; - } ov::Core core = ov::test::utils::create_core(); std::stringstream stream; { diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp index 91a464df65daf7..2c70ec46079994 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp @@ -588,9 +588,6 @@ TEST_P(OVCheckMetricsPropsTests_ModelDependceProps, ChangeCorrectDevicePropertie TEST_P(OVClassSetDefaultDeviceIDPropTest, SetDefaultDeviceIDNoThrow) { ov::Core ie = ov::test::utils::create_core(); // sw plugins are not requested to support `ov::available_devices` and ` ov::device::id` property - if (sw_plugin_in_target_device(target_device)) { - return; - } auto deviceIDs = ie.get_property(target_device, ov::available_devices); if (std::find(deviceIDs.begin(), deviceIDs.end(), deviceID) == deviceIDs.end()) { GTEST_FAIL(); @@ -613,9 +610,6 @@ TEST_P(OVSpecificDeviceSetConfigTest, GetConfigSpecificDeviceNoThrow) { deviceID = target_device.substr(pos + 1, target_device.size()); } // sw plugins are not requested to support `ov::available_devices`, `ov::device::id` and `ov::num_streams` property - if (sw_plugin_in_target_device(target_device)) { - return; - } auto deviceIDs = ie.get_property(clear_target_device, ov::available_devices); if (std::find(deviceIDs.begin(), deviceIDs.end(), deviceID) == deviceIDs.end()) { GTEST_FAIL() << "No DeviceID" << std::endl; @@ -672,9 +666,6 @@ TEST_P(OVSpecificDeviceGetConfigTest, GetConfigSpecificDeviceNoThrow) { } TEST_P(OVGetAvailableDevicesPropsTest, GetAvailableDevicesNoThrow) { - if (sw_plugin_in_target_device(target_device)) { - return; - } ov::Core ie = ov::test::utils::create_core(); std::vector devices; @@ -727,9 +718,6 @@ TEST_P(OVClassSetDevicePriorityConfigPropsTest, SetConfigAndCheckGetConfigNoThro } TEST_P(OVGetMetricPropsTest, GetMetricAndPrintNoThrow_AVAILABLE_DEVICES) { - if (sw_plugin_in_target_device(target_device)) { - return; - } ov::Core ie = ov::test::utils::create_core(); std::vector device_ids;