From 8a6e4bea9ebdcc78d081f48ad1e283bf21996cd4 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 27 Jul 2023 16:13:18 +0200 Subject: [PATCH] Autotest: Simplify framework registration functions signature Change-Id: I249b73f0adf5a678145be9d00bee9a733097bfef Reviewed-by: Reviewed-by: Christian Stenger --- src/plugins/autotest/testframeworkmanager.cpp | 14 ++++++-------- src/plugins/autotest/testframeworkmanager.h | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/plugins/autotest/testframeworkmanager.cpp b/src/plugins/autotest/testframeworkmanager.cpp index b9b61b79d11..0c9ffeef616 100644 --- a/src/plugins/autotest/testframeworkmanager.cpp +++ b/src/plugins/autotest/testframeworkmanager.cpp @@ -25,22 +25,20 @@ TestFrameworkManager::~TestFrameworkManager() s_instance = nullptr; } -bool TestFrameworkManager::registerTestFramework(ITestFramework *framework) +void TestFrameworkManager::registerTestFramework(ITestFramework *framework) { - QTC_ASSERT(framework, return false); - QTC_ASSERT(!m_registeredFrameworks.contains(framework), return false); + QTC_ASSERT(framework, return); + QTC_ASSERT(!m_registeredFrameworks.contains(framework), return); // TODO check for unique priority before registering m_registeredFrameworks.append(framework); Utils::sort(m_registeredFrameworks, &ITestFramework::priority); - return true; } -bool TestFrameworkManager::registerTestTool(ITestTool *testTool) +void TestFrameworkManager::registerTestTool(ITestTool *testTool) { - QTC_ASSERT(testTool, return false); - QTC_ASSERT(!m_registeredTestTools.contains(testTool), return false); + QTC_ASSERT(testTool, return); + QTC_ASSERT(!m_registeredTestTools.contains(testTool), return); m_registeredTestTools.append(testTool); - return true; } void TestFrameworkManager::activateFrameworksAndToolsFromSettings() diff --git a/src/plugins/autotest/testframeworkmanager.h b/src/plugins/autotest/testframeworkmanager.h index e42001dc2d4..444ea3fc2fe 100644 --- a/src/plugins/autotest/testframeworkmanager.h +++ b/src/plugins/autotest/testframeworkmanager.h @@ -14,8 +14,8 @@ public: TestFrameworkManager(); ~TestFrameworkManager(); - bool registerTestFramework(ITestFramework *framework); - bool registerTestTool(ITestTool *testTool); + void registerTestFramework(ITestFramework *framework); + void registerTestTool(ITestTool *testTool); void synchronizeSettings(); static ITestFramework *frameworkForId(Utils::Id frameworkId);