From 2e8b4963aba413a172b00d19be8959b7143bc1da Mon Sep 17 00:00:00 2001 From: Chen Peter Date: Fri, 23 Aug 2024 15:47:47 +0800 Subject: [PATCH] Merge OVClassModelTestP to OVClassQueryModelTest There are only 2 query_model test cases in OVClassModelTestP QueryModelActualNoThrow QueryModelWithKSO Signed-off-by: Chen Peter --- .../behavior/ov_plugin/core_integration.cpp | 3 --- .../shared_tests_instances/behavior/ov_plugin/query_model.cpp | 4 ---- .../behavior/ov_plugin/core_integration.cpp | 4 ---- .../api_conformance_runner/src/ov_plugin/core_integration.cpp | 4 ---- .../plugin/shared/include/base/ov_behavior_test_utils.hpp | 1 - .../plugin/shared/include/behavior/ov_plugin/query_model.hpp | 4 ++-- 6 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp index bad1bf6ebb0e47..64ca8ae0d4d1b8 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp @@ -10,9 +10,6 @@ using namespace ov::test::behavior; namespace { -INSTANTIATE_TEST_SUITE_P(smoke_OVClassModelTestP, OVClassModelTestP, - ::testing::Values(std::string(ov::test::utils::DEVICE_GPU))); - INSTANTIATE_TEST_SUITE_P(nightly_OVClassModelOptionalTestP, OVClassModelOptionalTestP, ::testing::Values(std::string(ov::test::utils::DEVICE_GPU))); diff --git a/src/plugins/intel_npu/tests/functional/shared_tests_instances/behavior/ov_plugin/query_model.cpp b/src/plugins/intel_npu/tests/functional/shared_tests_instances/behavior/ov_plugin/query_model.cpp index e6a70d753bac3e..57754bacd0a7c3 100644 --- a/src/plugins/intel_npu/tests/functional/shared_tests_instances/behavior/ov_plugin/query_model.cpp +++ b/src/plugins/intel_npu/tests/functional/shared_tests_instances/behavior/ov_plugin/query_model.cpp @@ -10,10 +10,6 @@ namespace ov { namespace test { namespace behavior { -INSTANTIATE_TEST_SUITE_P(compatibility_smoke_BehaviorTests_OVClassModelTestP, OVClassModelTestP, - ::testing::Values(ov::test::utils::DEVICE_NPU), - (ov::test::utils::appendPlatformTypeTestName)); - INSTANTIATE_TEST_SUITE_P(compatibility_smoke_BehaviorTests_OVClassQueryModelTestTests, OVClassQueryModelTest, ::testing::Values(ov::test::utils::DEVICE_NPU), (ov::test::utils::appendPlatformTypeTestName)); diff --git a/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp b/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp index 31095a9cdee07e..316b1ce9bacfd5 100644 --- a/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp +++ b/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp @@ -17,10 +17,6 @@ namespace { // OV Class Common tests with // -INSTANTIATE_TEST_SUITE_P(smoke_OVClassModelTestP, - OVClassModelTestP, - ::testing::Values(ov::test::utils::DEVICE_TEMPLATE)); - INSTANTIATE_TEST_SUITE_P(smoke_OVClassModelOptionalTestP, OVClassModelOptionalTestP, ::testing::Values(ov::test::utils::DEVICE_TEMPLATE)); 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..3880038ead7375 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 @@ -15,10 +15,6 @@ 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, OVClassModelOptionalTestP, ::testing::Values(ov::test::utils::target_device)); 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 686a3c797ba917..70420819b812f6 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 @@ -225,7 +225,6 @@ class OVClassBaseTestP : public OVClassNetworkTest, OVClassNetworkTest::SetUp(); } }; -using OVClassModelTestP = OVClassBaseTestP; using OVClassModelOptionalTestP = OVClassBaseTestP; class OVCompiledModelClassBaseTestP : public OVClassNetworkTest, 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..1963662d84a6c2 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 @@ -22,12 +22,12 @@ namespace behavior { using OVClassQueryModelTest = OVClassBaseTestP; -TEST_P(OVClassModelTestP, QueryModelActualNoThrow) { +TEST_P(OVClassQueryModelTest, QueryModelActualNoThrow) { ov::Core ie = ov::test::utils::create_core(); ie.query_model(actualNetwork, target_device); } -TEST_P(OVClassModelTestP, QueryModelWithKSO) { +TEST_P(OVClassQueryModelTest, QueryModelWithKSO) { ov::Core ie = ov::test::utils::create_core(); auto rl_map = ie.query_model(ksoNetwork, target_device);