[conformanceAPI] Rename tests to new format

openvinotoolkit · Dec 28, 2023 · be6d8d3 · be6d8d3
1 parent e430095
commit be6d8d3
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 71 deletions.
diff --git a/.github/workflows/sanitizer_cuda.yml b/.github/workflows/sanitizer_cuda.yml
@@ -31,4 +31,8 @@ jobs:
     - name: ninja
       run: echo 'all:; +NINJA_STATUS="[%u/%r/%f] " ninja -C ~/runner/build_cuda_sanitizer -v ov_nvidia_func_tests ov_nvidia_unit_tests' | make -j`nproc` -f-
     - name: functional tests
+<<<<<<< HEAD
       run: env -C ~/runner PATH=/usr/local/cuda-11.2/bin:/usr/local/cuda-11.4/bin:/usr/local/cuda-11.7/bin:$PATH ./openvino_contrib/modules/nvidia_plugin/utils/cuda-sanitizer.sh ./build_cuda_sanitizer/bin/intel64/ov_nvidia_func_tests --gtest_filter=*smoke*:-*dynamic*:*Dynamic*:smoke_GRU*:smoke_LSTM*:smoke_TensorIterator*:*ConvBiasFusion*:*smoke*OVExecGraphImportExportTest.importExportedIENetwork*:*smoke*OVClassBasicTestP.registerNewPluginNoThrows*:*smoke*OVHoldersTest.Orders*:*smoke*IEClassBasicTestP.registerNewPluginNoThrows*:*smoke*IEClassBasicTestP.smoke_registerPluginsXMLUnicodePath*
+=======
+      run: env -C ~/runner PATH=/usr/local/cuda-11.2/bin:/usr/local/cuda-11.4/bin:/usr/local/cuda-11.7/bin:$PATH ./openvino_contrib/modules/nvidia_plugin/utils/cuda-sanitizer.sh ./build_cuda_sanitizer/bin/intel64/CudaFuncTests --gtest_filter=*smoke*:-*dynamic*:*Dynamic*:smoke_GRU*:smoke_LSTM*:smoke_TensorIterator*:*ConvBiasFusion*:*smoke*OVCompiledGraphImportExportTest.importExportedIENetwork*:*smoke*OVClassBasicTestP.registerNewPluginNoThrows*:*smoke*OVHoldersTest.Orders*:*smoke*IEClassBasicTestP.registerNewPluginNoThrows*:*smoke*IEClassBasicTestP.smoke_registerPluginsXMLUnicodePath*
+>>>>>>> c7f458ab ([conformanceAPI] Rename tests to new format)
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"
 #include "ie_plugin_config.hpp"
 
 using namespace ov::test::behavior;
@@ -21,24 +21,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)},
@@ -114,26 +114,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
@@ -26,6 +26,18 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests,
                          OVInferenceChaining,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_HETERO),
                                             ::testing::ValuesIn(HeteroConfigs)),
-                         OVInferenceChaining::getTestCaseName);
+                         OVInferenceChainingStatic::getTestCaseName);
+
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
+                         OVInferenceChainingStatic,
+                         ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA),
+                                            ::testing::ValuesIn(configs)),
+                         OVInferenceChainingStatic::getTestCaseName);
+
+INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests,
+                         OVInferenceChainingStatic,
+                         ::testing::Combine(::testing::Values(CommonTestUtils::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
@@ -3,6 +3,7 @@
 //
 
 #include "behavior/ov_plugin/core_integration.hpp"
+#include "behavior/ov_plugin/properties_tests.hpp"
 
 #include <cuda_test_constants.hpp>
 #include <string>
@@ -18,61 +19,33 @@ namespace {
 //
 
 INSTANTIATE_TEST_SUITE_P(smoke_OVClassBasicTestP,
-                         OVClassBasicTestP,
+                         OVClassBasicPropsTestP,
                          ::testing::Values(std::make_pair("openvino_nvidia_gpu_plugin",
                                                           ov::test::utils::DEVICE_NVIDIA)));
 
 INSTANTIATE_TEST_SUITE_P(smoke_OVClassNetworkTestP,
-                         OVClassNetworkTestP,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
+                         OVClassModelTestP,
+                         ::testing::Values(CommonTestUtils::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,
-                         ::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));
+                         OVGetMetricPropsTest,
+                         ::testing::Values(CommonTestUtils::DEVICE_NVIDIA));
 
 INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetConfigTest,
-                         OVClassGetConfigTest_ThrowUnsupported,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
+                         OVGetConfigTest_ThrowUnsupported,
+                         ::testing::Values(CommonTestUtils::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 +54,10 @@ INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetAvailableDevices,
 //
 
 INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetConfigTest,
-                         OVClassGetConfigTest,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
+                         OVGetConfigTest,
+                         ::testing::Values(CommonTestUtils::DEVICE_NVIDIA));
 
-TEST(OVClassBasicTest, smoke_CUDAGetSetConfigNoThrow) {
+TEST(OVClassBasicPropsTestP, smoke_CUDAGetSetConfigNoThrow) {
     ov::Core core = createCoreWithTemplate();
 
     auto device_name = ov::test::utils::DEVICE_NVIDIA;
@@ -106,10 +79,9 @@ TEST(OVClassBasicTest, smoke_CUDAGetSetConfigNoThrow) {
 }
 
 // OV Class Query network
-
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassQueryNetworkTest,
-                         OVClassQueryNetworkTest,
-                         ::testing::Values(ov::test::utils::DEVICE_NVIDIA));
+INSTANTIATE_TEST_SUITE_P(smoke_OVClassQueryModelTest,
+                         OVClassQueryModelTest,
+                         ::testing::Values(CommonTestUtils::DEVICE_NVIDIA));
 
 // OV Class Load network