Skip to content

Merge test cases in OVClassModelTestP to OVClassQueryModelTest #26197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Merge test cases in OVClassModelTestP to OVClassQueryModelTest #26197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e8b496
Merge OVClassModelTestP to OVClassQueryModelTest
peterchen-intel Aug 23, 2024
2e8e323
Merge branch 'master' into move/test/cases
peterchen-intel Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...intel_gpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)));

Expand Down
4 changes: 0 additions & 4 deletions ...gins/intel_npu/tests/functional/shared_tests_instances/behavior/ov_plugin/query_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<OVClassModelTestP>));

INSTANTIATE_TEST_SUITE_P(compatibility_smoke_BehaviorTests_OVClassQueryModelTestTests, OVClassQueryModelTest,
::testing::Values(ov::test::utils::DEVICE_NPU),
(ov::test::utils::appendPlatformTypeTestName<OVClassQueryModelTest>));
Expand Down
4 changes: 0 additions & 4 deletions .../template/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ namespace {
// OV Class Common tests with <pluginName, device_name params>
//

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));
Expand Down
4 changes: 0 additions & 4 deletions .../plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ namespace {
// OV Class Common tests with <pluginName, deviceName params>
//

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));
Expand Down
1 change: 0 additions & 1 deletion src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ class OVClassBaseTestP : public OVClassNetworkTest,
OVClassNetworkTest::SetUp();
}
};
using OVClassModelTestP = OVClassBaseTestP;
using OVClassModelOptionalTestP = OVClassBaseTestP;

class OVCompiledModelClassBaseTestP : public OVClassNetworkTest,
Expand Down
4 changes: 2 additions & 2 deletions src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down