Mark mandatory conformance tests for HW plugins

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,17 +17,19 @@ namespace {
 // OV Class Common tests with <pluginName, deviceName params>
 //
 
-INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory,
+INSTANTIATE_TEST_SUITE_P(ov_plugin,
                          OVClassModelTestP,
-                         ::testing::Values(ov::test::utils::target_device));
+                         ::testing::Values(ov::test::utils::target_device),
+                         MARK_MANDATORY_FOR_API_HW_DEVICE());
 
 INSTANTIATE_TEST_SUITE_P(ov_plugin,
                          OVClassModelOptionalTestP,
                          ::testing::Values(ov::test::utils::target_device));
 
 // OV Class Query network
 
-INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory,
+INSTANTIATE_TEST_SUITE_P(ov_plugin,
                          OVClassQueryModelTest,
-                         ::testing::Values(ov::test::utils::target_device));
+                         ::testing::Values(ov::test::utils::target_device),
+                         MARK_MANDATORY_FOR_API_HW_DEVICE());
 }  // namespace

src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp

@@ -31,11 +31,19 @@
 #include "common_test_utils/subgraph_builders/split_concat.hpp"
 
 #define MARK_MANDATORY_FOR_HW_DEVICE(GET_TEST_NAME)                                                   \
-    [&](const testing::TestParamInfo<PropertiesParams>& info) {                                       \
-        std::string name = GET_TEST_NAME(info);                                                       \
+    [](const testing::TestParamInfo<PropertiesParams>& info) {                                        \
+        std::string name = "";                                                                        \
+        if (nullptr != GET_TEST_NAME) {                                                               \
+            name = GET_TEST_NAME(info);                                                               \
+        }                                                                                             \
         return sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_" + name; \
     }
 
+#define MARK_MANDATORY_FOR_API_HW_DEVICE()                                                     \
+    [](const testing::TestParamInfo<std::string>& info) {                                      \
+        return sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_"; \
+    }
+
 namespace ov {
 namespace test {
 namespace behavior {