From 5ccc743707103d31b9cd58a68f25de9c8e5e708b Mon Sep 17 00:00:00 2001 From: Sofya Balandina Date: Thu, 6 Apr 2023 17:24:13 +0100 Subject: [PATCH] [apiConformance] Fix relative all (#16518) --- .../shared/include/base/ov_behavior_test_utils.hpp | 2 +- .../ie_test_utils/common_test_utils/test_common.cpp | 11 +++++++++++ .../ie_test_utils/common_test_utils/test_common.hpp | 1 + .../functional_test_utils/src/summary/api_summary.cpp | 3 ++- 4 files changed, 15 insertions(+), 2 deletions(-) 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 010ec941e5d..eb8afb5e1cc 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 @@ -62,7 +62,7 @@ public: void SetUp() override { set_api_entity(); - auto test_name = this->GetTestName(); + auto test_name = this->GetFullTestName(); k = test_name.find("_mandatory") != std::string::npos || test_name.find("mandatory_") != std::string::npos ? 1 : 0; std::cout << "[ CONFORMANCE ] Influence coefficient: " << k << std::endl; api_summary.updateStat(api_entity, target_device, ov::test::utils::PassRate::Statuses::CRASHED, k); diff --git a/src/tests/ie_test_utils/common_test_utils/test_common.cpp b/src/tests/ie_test_utils/common_test_utils/test_common.cpp index 028163ee21d..6aaebac03d6 100644 --- a/src/tests/ie_test_utils/common_test_utils/test_common.cpp +++ b/src/tests/ie_test_utils/common_test_utils/test_common.cpp @@ -83,4 +83,15 @@ std::string TestsCommon::GetTestName() const { return test_name; } +std::string TestsCommon::GetFullTestName() const { + std::string suite_name = + ::testing::UnitTest::GetInstance()->current_test_info()->test_suite_name(); + std::replace_if(suite_name.begin(), suite_name.end(), + [](char c) { return !std::isalnum(c); }, '_'); + + std::string test_name = GetTestName(); + + return suite_name + "_" + test_name; +} + } // namespace CommonTestUtils diff --git a/src/tests/ie_test_utils/common_test_utils/test_common.hpp b/src/tests/ie_test_utils/common_test_utils/test_common.hpp index f89364cb9d5..872bb339766 100644 --- a/src/tests/ie_test_utils/common_test_utils/test_common.hpp +++ b/src/tests/ie_test_utils/common_test_utils/test_common.hpp @@ -18,6 +18,7 @@ protected: static std::string GetTimestamp(); std::string GetTestName() const; + std::string GetFullTestName() const; }; } // namespace CommonTestUtils diff --git a/src/tests/ie_test_utils/functional_test_utils/src/summary/api_summary.cpp b/src/tests/ie_test_utils/functional_test_utils/src/summary/api_summary.cpp index 2ef03cdab04..48cb3f6e32b 100644 --- a/src/tests/ie_test_utils/functional_test_utils/src/summary/api_summary.cpp +++ b/src/tests/ie_test_utils/functional_test_utils/src/summary/api_summary.cpp @@ -69,12 +69,13 @@ void ApiSummary::updateStat(ov_entity entity, const std::string& target_device, if (isCrashReported) { cur_stat[real_device].crashed--; isCrashReported = false; + } else { + cur_stat[real_device].rel_all += rel_influence_coef; } if (isHangReported) { isHangReported = false; return; } - cur_stat[real_device].rel_all += rel_influence_coef; switch (status) { case PassRate::Statuses::SKIPPED: { cur_stat[real_device].skipped++;