feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Use constant for repeated string

Browse Source 
Change-Id: I72b21c4976cabbcd454b2e9ca5cce93e57af0f20
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2018-04-12 12:44:05 +02:00
parent 96ccb95e6f
commit 7943dfb5a6
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/autotest/gtest/gtestconstants.h
View File

@@ -34,6 +34,7 @@ namespace Constants {
const char FRAMEWORK_NAME[] = "GTest"; const char FRAMEWORK_NAME[] = "GTest";
const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("GTestFramework", "Google Test"); const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("GTestFramework", "Google Test");
const unsigned FRAMEWORK_PRIORITY = 10; const unsigned FRAMEWORK_PRIORITY = 10;
const char DEFAULT_FILTER[] = "*.*";
enum GroupMode enum GroupMode
{ {

2
src/plugins/autotest/gtest/gtestframework.cpp
View File

@@ -78,7 +78,7 @@ QString GTestFramework::currentGTestFilter()
const auto manager = TestFrameworkManager::instance(); const auto manager = TestFrameworkManager::instance();
auto gSettings = qSharedPointerCast<GTestSettings>(manager->settingsForTestFramework(id)); auto gSettings = qSharedPointerCast<GTestSettings>(manager->settingsForTestFramework(id));
return gSettings.isNull() ? QString("*.*") : gSettings->gtestFilter; return gSettings.isNull() ? QString(GTest::Constants::DEFAULT_FILTER) : gSettings->gtestFilter;
} }
QString GTestFramework::groupingToolTip() const QString GTestFramework::groupingToolTip() const

4
src/plugins/autotest/gtest/gtestsettings.cpp
View File

@@ -57,9 +57,9 @@ void GTestSettings::fromFrameworkSettings(const QSettings *s)
bool ok = false; bool ok = false;
const int tmp = s->value(groupModeKey, GTest::Constants::Directory).toInt(&ok); const int tmp = s->value(groupModeKey, GTest::Constants::Directory).toInt(&ok);
groupMode = ok ? static_cast<GTest::Constants::GroupMode>(tmp) : GTest::Constants::Directory; groupMode = ok ? static_cast<GTest::Constants::GroupMode>(tmp) : GTest::Constants::Directory;
gtestFilter = s->value(gtestFilterKey, "*.*").toString(); gtestFilter = s->value(gtestFilterKey, GTest::Constants::DEFAULT_FILTER).toString();
if (!GTestUtils::isValidGTestFilter(gtestFilter)) if (!GTestUtils::isValidGTestFilter(gtestFilter))
gtestFilter = "*.*"; gtestFilter = GTest::Constants::DEFAULT_FILTER;
} }
void GTestSettings::toFrameworkSettings(QSettings *s) const void GTestSettings::toFrameworkSettings(QSettings *s) const

2
src/plugins/autotest/gtest/gtestsettings.h
View File

@@ -45,7 +45,7 @@ public:
bool throwOnFailure = false; bool throwOnFailure = false;
bool breakOnFailure = true; bool breakOnFailure = true;
GTest::Constants::GroupMode groupMode = GTest::Constants::Directory; GTest::Constants::GroupMode groupMode = GTest::Constants::Directory;
QString gtestFilter{"*.*"}; QString gtestFilter{GTest::Constants::DEFAULT_FILTER};
protected: protected:
void fromFrameworkSettings(const QSettings *s) override; void fromFrameworkSettings(const QSettings *s) override;