From fa815edae3651563acb03acd9f76a8613c92ea98 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 13 Jul 2023 10:06:14 +0200 Subject: [PATCH] AutoTest: Use new approach for settings Avoids a couple of unneeded casts. Change-Id: Ib3361d4ad2c69e4f0e4a44c5e9b3f385cefb6084 Reviewed-by: hjk --- src/plugins/autotest/autotestunittests.cpp | 5 +---- src/plugins/autotest/boost/boosttestconfiguration.cpp | 4 ++-- src/plugins/autotest/catch/catchconfiguration.cpp | 2 +- src/plugins/autotest/ctest/ctesttreeitem.cpp | 3 +-- src/plugins/autotest/gtest/gtestconfiguration.cpp | 2 +- src/plugins/autotest/qtest/qttestconfiguration.cpp | 5 ++--- src/plugins/autotest/quick/quicktestconfiguration.cpp | 5 ++--- src/plugins/autotest/quick/quicktestparser.cpp | 3 +-- 8 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/plugins/autotest/autotestunittests.cpp b/src/plugins/autotest/autotestunittests.cpp index 94be4be5d3b..7ed1a097d48 100644 --- a/src/plugins/autotest/autotestunittests.cpp +++ b/src/plugins/autotest/autotestunittests.cpp @@ -77,10 +77,7 @@ void AutoTestUnitTests::initTestCase() } // Enable quick check for derived tests - static const Id id = Id("AutoTest.Framework.QtTest"); - static_cast( - TestFrameworkManager::frameworkForId(id)) - ->quickCheckForDerivedTests.setValue(true); + theQtTestFramework().quickCheckForDerivedTests.setValue(true); } void AutoTestUnitTests::cleanupTestCase() diff --git a/src/plugins/autotest/boost/boosttestconfiguration.cpp b/src/plugins/autotest/boost/boosttestconfiguration.cpp index 6222c974653..15cc0d8bbfe 100644 --- a/src/plugins/autotest/boost/boosttestconfiguration.cpp +++ b/src/plugins/autotest/boost/boosttestconfiguration.cpp @@ -17,7 +17,7 @@ namespace Internal { TestOutputReader *BoostTestConfiguration::createOutputReader(Process *app) const { - BoostTestFramework &settings = *static_cast(framework()); + BoostTestFramework &settings = theBoostTestFramework(); return new BoostTestOutputReader(app, buildDirectory(), projectFile(), LogLevel(settings.logLevel()), ReportLevel(settings.reportLevel())); @@ -85,7 +85,7 @@ static QStringList filterInterfering(const QStringList &provided, QStringList *o QStringList BoostTestConfiguration::argumentsForTestRunner(QStringList *omitted) const { - BoostTestFramework &boostSettings = *static_cast(framework()); + BoostTestFramework &boostSettings = theBoostTestFramework(); QStringList arguments; arguments << "-l" << BoostTestFramework::logLevelToOption(LogLevel(boostSettings.logLevel())); arguments << "-r" << BoostTestFramework::reportLevelToOption(ReportLevel(boostSettings.reportLevel())); diff --git a/src/plugins/autotest/catch/catchconfiguration.cpp b/src/plugins/autotest/catch/catchconfiguration.cpp index 37cb378e071..e1773064f77 100644 --- a/src/plugins/autotest/catch/catchconfiguration.cpp +++ b/src/plugins/autotest/catch/catchconfiguration.cpp @@ -83,7 +83,7 @@ QStringList CatchConfiguration::argumentsForTestRunner(QStringList *omitted) con ' ', Qt::SkipEmptyParts), omitted); } - CatchFramework &settings = *static_cast(framework()); + CatchFramework &settings = theCatchFramework(); if (settings.abortAfterChecked()) arguments << "-x" << QString::number(settings.abortAfter()); diff --git a/src/plugins/autotest/ctest/ctesttreeitem.cpp b/src/plugins/autotest/ctest/ctesttreeitem.cpp index c3b88ca5f08..89c06411522 100644 --- a/src/plugins/autotest/ctest/ctesttreeitem.cpp +++ b/src/plugins/autotest/ctest/ctesttreeitem.cpp @@ -88,8 +88,7 @@ QList CTestTreeItem::testConfigurationsFor(const QStringLi const ProjectExplorer::BuildSystem *buildSystem = target->buildSystem(); QStringList options{"--timeout", QString::number(testSettings().timeout() / 1000)}; - auto ctestSettings = static_cast(testBase()); - options << ctestSettings->activeSettingsAsOptions(); + options << theCTestTool().activeSettingsAsOptions(); CommandLine command = buildSystem->commandLineForTests(selected, options); if (command.executable().isEmpty()) return {}; diff --git a/src/plugins/autotest/gtest/gtestconfiguration.cpp b/src/plugins/autotest/gtest/gtestconfiguration.cpp index 0b7160d2a55..248bba0d058 100644 --- a/src/plugins/autotest/gtest/gtestconfiguration.cpp +++ b/src/plugins/autotest/gtest/gtestconfiguration.cpp @@ -66,7 +66,7 @@ QStringList GTestConfiguration::argumentsForTestRunner(QStringList *omitted) con arguments << "--gtest_filter=\"" + testSets.join(':') + '"'; } - GTestFramework &gSettings = *static_cast(framework()); + GTestFramework &gSettings = theGTestFramework(); if (gSettings.runDisabled()) arguments << "--gtest_also_run_disabled_tests"; diff --git a/src/plugins/autotest/qtest/qttestconfiguration.cpp b/src/plugins/autotest/qtest/qttestconfiguration.cpp index 8b433eebfdf..f69a76fe6ac 100644 --- a/src/plugins/autotest/qtest/qttestconfiguration.cpp +++ b/src/plugins/autotest/qtest/qttestconfiguration.cpp @@ -28,8 +28,7 @@ static QStringList quoteIfNeeded(const QStringList &testCases, bool debugMode) TestOutputReader *QtTestConfiguration::createOutputReader(Process *app) const { - QtTestFramework &qtSettings = *static_cast(framework()); - const QtTestOutputReader::OutputMode mode = qtSettings.useXMLOutput() + const QtTestOutputReader::OutputMode mode = theQtTestFramework().useXMLOutput() ? QtTestOutputReader::XML : QtTestOutputReader::PlainText; return new QtTestOutputReader(app, buildDirectory(), projectFile(), mode, TestType::QtTest); @@ -43,7 +42,7 @@ QStringList QtTestConfiguration::argumentsForTestRunner(QStringList *omitted) co runnable().command.arguments().split(' ', Qt::SkipEmptyParts), omitted, false)); } - QtTestFramework &qtSettings = *static_cast(framework()); + QtTestFramework &qtSettings = theQtTestFramework(); if (qtSettings.useXMLOutput()) arguments << "-xml"; if (!testCases().isEmpty()) diff --git a/src/plugins/autotest/quick/quicktestconfiguration.cpp b/src/plugins/autotest/quick/quicktestconfiguration.cpp index 1f686ea6e7b..ebf2c2406ea 100644 --- a/src/plugins/autotest/quick/quicktestconfiguration.cpp +++ b/src/plugins/autotest/quick/quicktestconfiguration.cpp @@ -21,8 +21,7 @@ QuickTestConfiguration::QuickTestConfiguration(ITestFramework *framework) TestOutputReader *QuickTestConfiguration::createOutputReader(Process *app) const { - QtTestFramework &qtSettings = *static_cast(framework()); - const QtTestOutputReader::OutputMode mode = qtSettings.useXMLOutput() + const QtTestOutputReader::OutputMode mode = theQtTestFramework().useXMLOutput() ? QtTestOutputReader::XML : QtTestOutputReader::PlainText; return new QtTestOutputReader(app, buildDirectory(), projectFile(), mode, TestType::QuickTest); @@ -37,7 +36,7 @@ QStringList QuickTestConfiguration::argumentsForTestRunner(QStringList *omitted) omitted, true)); } - QtTestFramework &qtSettings = *static_cast(framework()); + QtTestFramework &qtSettings = theQtTestFramework(); if (qtSettings.useXMLOutput()) arguments << "-xml"; if (!testCases().isEmpty()) diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp index 9dc92ea2eb2..eaba2299588 100644 --- a/src/plugins/autotest/quick/quicktestparser.cpp +++ b/src/plugins/autotest/quick/quicktestparser.cpp @@ -357,8 +357,7 @@ void QuickTestParser::init(const QSet &filesToParse, bool fullParse) m_mainCppFiles.clear(); } - QtTestFramework &qtSettings = *static_cast(framework()); - m_checkForDerivedTests = qtSettings.quickCheckForDerivedTests(); + m_checkForDerivedTests = theQtTestFramework().quickCheckForDerivedTests(); CppParser::init(filesToParse, fullParse); }