[conformanceAPI] Rename tests to new format

openvinotoolkit · Jan 8, 2024 · 90be212 · 90be212
1 parent c2347a3
commit 90be212
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 79 deletions.
diff --git a/...ional/shared_tests_instances/behavior/ov_executable_network/ov_exec_net_import_export.cpp b/...ional/shared_tests_instances/behavior/ov_executable_network/ov_exec_net_import_export.cpp
@@ -4,7 +4,7 @@
 #include <common_test_utils/test_constants.hpp>
 #include <cuda_test_constants.hpp>
 
-#include "behavior/ov_executable_network/exec_graph_info.hpp"
+#include "behavior/compiled_model/import_export.hpp"
 
 using namespace ov::test::behavior;
 namespace {
@@ -20,24 +20,24 @@ const std::vector<ov::AnyMap> multiConfigs = {{ov::device::priorities(ov::test::
 const std::vector<ov::AnyMap> heteroConfigs = {{ov::device::priorities(ov::test::utils::DEVICE_NVIDIA)}};
 
 INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
-                         OVExecGraphImportExportTest,
+                         OVCompiledGraphImportExportTest,
                          ::testing::Combine(::testing::ValuesIn(netPrecisions),
                                             ::testing::Values(ov::test::utils::DEVICE_NVIDIA),
                                             ::testing::ValuesIn(configs)),
-                         OVExecGraphImportExportTest::getTestCaseName);
+                         OVCompiledGraphImportExportTest::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests,
-                         OVExecGraphImportExportTest,
+                         OVCompiledGraphImportExportTest,
                          ::testing::Combine(::testing::ValuesIn(netPrecisions),
                                             ::testing::Values(ov::test::utils::DEVICE_AUTO),
                                             ::testing::ValuesIn(multiConfigs)),
-                         OVExecGraphImportExportTest::getTestCaseName);
+                         OVCompiledGraphImportExportTest::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests,
-                         OVExecGraphImportExportTest,
+                         OVCompiledGraphImportExportTest,
                          ::testing::Combine(::testing::ValuesIn(netPrecisions),
                                             ::testing::Values(ov::test::utils::DEVICE_HETERO),
                                             ::testing::ValuesIn(heteroConfigs)),
-                         OVExecGraphImportExportTest::getTestCaseName);
+                         OVCompiledGraphImportExportTest::getTestCaseName);
 
 }  // namespace
diff --git a/...gin/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp b/...gin/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "behavior/ov_executable_network/properties.hpp"
+#include "behavior/compiled_model/properties.hpp"
 
 #include <cuda_test_constants.hpp>
 
@@ -36,34 +36,34 @@ const std::vector<ov::AnyMap> auto_batch_inproperties = {
 };
 
 INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
-                         OVCompiledModelPropertiesIncorrectTests,
+                         OVClassCompiledModelPropertiesIncorrectTests,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA),
                                             ::testing::ValuesIn(inproperties)),
-                         OVCompiledModelPropertiesIncorrectTests::getTestCaseName);
+                         OVClassCompiledModelPropertiesIncorrectTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests,
-                         OVCompiledModelPropertiesIncorrectTests,
+                         OVClassCompiledModelPropertiesIncorrectTests,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_HETERO),
                                             ::testing::ValuesIn(hetero_inproperties)),
-                         OVCompiledModelPropertiesIncorrectTests::getTestCaseName);
+                         OVClassCompiledModelPropertiesIncorrectTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests,
-                         OVCompiledModelPropertiesIncorrectTests,
+                         OVClassCompiledModelPropertiesIncorrectTests,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_MULTI),
                                             ::testing::ValuesIn(multi_inproperties)),
-                         OVCompiledModelPropertiesIncorrectTests::getTestCaseName);
+                         OVClassCompiledModelPropertiesIncorrectTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests,
-                         OVCompiledModelPropertiesIncorrectTests,
+                         OVClassCompiledModelPropertiesIncorrectTests,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_AUTO),
                                             ::testing::ValuesIn(auto_inproperties)),
-                         OVCompiledModelPropertiesIncorrectTests::getTestCaseName);
+                         OVClassCompiledModelPropertiesIncorrectTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests,
-                         OVCompiledModelPropertiesIncorrectTests,
+                         OVClassCompiledModelPropertiesIncorrectTests,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_BATCH),
                                             ::testing::ValuesIn(auto_batch_inproperties)),
-                         OVCompiledModelPropertiesIncorrectTests::getTestCaseName);
+                         OVClassCompiledModelPropertiesIncorrectTests::getTestCaseName);
 
 const std::vector<ov::AnyMap> default_properties = {{ov::num_streams(1)},
                                                     {ov::hint::num_requests(0)},
@@ -75,10 +75,15 @@ const std::vector<ov::AnyMap> default_properties = {{ov::num_streams(1)},
                                                     {ov::nvidia_gpu::use_cuda_graph(true)}};
 
 INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
-                         OVCompiledModelPropertiesDefaultTests,
+                         OVCompiledModelPropertiesDefaultSupportedTests,
+                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA),
+                         OVCompiledModelPropertiesDefaultSupportedTests::getTestCaseName);
+
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
+                         OVClassCompiledModelPropertiesDefaultTests,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA),
                                             ::testing::ValuesIn(default_properties)),
-                         OVCompiledModelPropertiesDefaultTests::getTestCaseName);
+                         OVClassCompiledModelPropertiesDefaultTests::getTestCaseName);
 
 const std::vector<ov::AnyMap> properties = {
     {ov::num_streams(8)},
@@ -114,26 +119,26 @@ const std::vector<ov::AnyMap> auto_batch_properties = {
 };
 
 INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
-                         OVCompiledModelPropertiesTests,
+                         OVClassCompiledModelPropertiesTests,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA),
                                             ::testing::ValuesIn(properties)),
-                         OVCompiledModelPropertiesTests::getTestCaseName);
+                         OVClassCompiledModelPropertiesTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests,
-                         OVCompiledModelPropertiesTests,
+                         OVClassCompiledModelPropertiesTests,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_HETERO),
                                             ::testing::ValuesIn(hetero_properties)),
-                         OVCompiledModelPropertiesTests::getTestCaseName);
+                         OVClassCompiledModelPropertiesTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests,
-                         OVCompiledModelPropertiesTests,
+                         OVClassCompiledModelPropertiesTests,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_MULTI),
                                             ::testing::ValuesIn(multi_properties)),
-                         OVCompiledModelPropertiesTests::getTestCaseName);
+                         OVClassCompiledModelPropertiesTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests,
-                         OVCompiledModelPropertiesTests,
+                         OVClassCompiledModelPropertiesTests,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_BATCH),
                                             ::testing::ValuesIn(auto_batch_properties)),
-                         OVCompiledModelPropertiesTests::getTestCaseName);
+                         OVClassCompiledModelPropertiesTests::getTestCaseName);
 }  // namespace
diff --git a/.../tests/functional/shared_tests_instances/behavior/ov_infer_request/inference_chaining.cpp b/.../tests/functional/shared_tests_instances/behavior/ov_infer_request/inference_chaining.cpp
@@ -28,4 +28,16 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests,
                                             ::testing::ValuesIn(HeteroConfigs)),
                          OVInferenceChaining::getTestCaseName);
 
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
+                         OVInferenceChainingStatic,
+                         ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA),
+                                            ::testing::ValuesIn(configs)),
+                         OVInferenceChainingStatic::getTestCaseName);
+
+INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests,
+                         OVInferenceChainingStatic,
+                         ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_HETERO),
+                                            ::testing::ValuesIn(HeteroConfigs)),
+                         OVInferenceChainingStatic::getTestCaseName);
+
 }  // namespace
diff --git a/...ia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp b/...ia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp
@@ -2,7 +2,8 @@
 // SPDX-License-Identifcorer: Apache-2.0
 //
 
-#include "behavior/ov_plugin/core_integration.hpp"
+#include "behavior/ov_plugin/properties_tests.hpp"
+#include "behavior/ov_plugin/query_model.hpp"
 
 #include <cuda_test_constants.hpp>
 #include <string>
@@ -17,62 +18,30 @@ namespace {
 // OV Class Common tests with <pluginName, device_name params>
 //
 
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassBasicTestP,
-                         OVClassBasicTestP,
-                         ::testing::Values(std::make_pair("openvino_nvidia_gpu_plugin",
-                                                          ov::test::utils::DEVICE_NVIDIA)));
-
 INSTANTIATE_TEST_SUITE_P(smoke_OVClassNetworkTestP,
-                         OVClassNetworkTestP,
+                         OVClassModelTestP,
                          ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
 
 //
 // OV Class GetMetric
 //
 
 INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest,
-                         OVClassGetMetricTest_SUPPORTED_CONFIG_KEYS,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
-
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest,
-                         OVClassGetMetricTest_SUPPORTED_METRICS,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
-
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest,
-                         OVClassGetMetricTest_DEVICE_UUID,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
-
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest,
-                         OVClassGetMetricTest_AVAILABLE_DEVICES,
+                         OVGetMetricPropsTest,
                          ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
 
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest,
-                         OVClassGetMetricTest_FULL_DEVICE_NAME,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
-
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest,
-                         OVClassGetMetricTest_OPTIMIZATION_CAPABILITIES,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
-
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest,
-                         OVClassGetMetricTest_RANGE_FOR_ASYNC_INFER_REQUESTS,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
-
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest,
-                         OVClassGetMetricTest_ThrowUnsupported,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
-
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetConfigTest,
-                         OVClassGetConfigTest_ThrowUnsupported,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
+INSTANTIATE_TEST_SUITE_P(smoke_OVBasicPropertiesTestsP,
+                         OVBasicPropertiesTestsP,
+                         ::testing::Values(std::make_pair("openvino_nvidia_gpu_plugin",
+                                                          ov::test::utils::DEVICE_NVIDIA)));
 
 #ifdef PROXY_PLUGIN_ENABLED
 INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetAvailableDevices,
-                         OVClassGetAvailableDevices,
+                         OVGetAvailableDevicesPropsTest,
                          ::testing::Values(ov::test::utils::DEVICE_GPU));
 #else
 INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetAvailableDevices,
-                         OVClassGetAvailableDevices,
+                         OVGetAvailableDevicesPropsTest,
                          ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
 #endif
 
@@ -81,10 +50,10 @@ INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetAvailableDevices,
 //
 
 INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetConfigTest,
-                         OVClassGetConfigTest,
+                         OVPropertiesDefaultSupportedTests,
                          ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
 
-TEST(OVClassBasicTest, smoke_CUDAGetSetConfigNoThrow) {
+TEST(OVClassBasicPropsTestP, smoke_CUDAGetSetConfigNoThrow) {
     ov::Core core = createCoreWithTemplate();
 
     auto device_name = ov::test::utils::DEVICE_NVIDIA;
@@ -106,14 +75,8 @@ TEST(OVClassBasicTest, smoke_CUDAGetSetConfigNoThrow) {
 }
 
 // OV Class Query network
-
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassQueryNetworkTest,
-                         OVClassQueryNetworkTest,
+INSTANTIATE_TEST_SUITE_P(smoke_OVClassQueryModelTest,
+                         OVClassQueryModelTest,
                          ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
 
-// OV Class Load network
-
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassLoadNetworkTest,
-                         OVClassLoadNetworkTest,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
 }  // namespace