From 4432ba4949647917d0fc3fb2ef73f9737a7c2431 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 24 Oct 2017 10:50:33 -0700 Subject: STL compatibility: use empty() instead of isEmpty() This is a simple find and replace with manual sanity check. Change-Id: Iab6d46dcc3be246d1650aae2b1730f933b717be8 Reviewed-by: Christian Kandeler --- tests/auto/api/tst_api.cpp | 30 +++++++++++++-------------- tests/auto/blackbox/tst_blackbox.cpp | 12 +++++------ tests/auto/blackbox/tst_blackboxandroid.cpp | 6 +++--- tests/auto/blackbox/tst_blackboxjava.cpp | 4 ++-- tests/auto/language/tst_language.cpp | 10 ++++----- tests/auto/shared.h | 2 +- tests/auto/tools/tst_tools.cpp | 32 ++++++++++++++--------------- tests/benchmarker/valgrindrunner.cpp | 2 +- tests/fuzzy-test/commandlineparser.cpp | 6 +++--- 9 files changed, 52 insertions(+), 52 deletions(-) (limited to 'tests') diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 2e8cba574..cf254fee4 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -974,7 +974,7 @@ void TestApi::commandExtraction() const qbs::RuleCommand command = commands.front(); QCOMPARE(command.type(), qbs::RuleCommand::ProcessCommandType); QVERIFY(!command.executable().isEmpty()); - QVERIFY(!command.arguments().isEmpty()); + QVERIFY(!command.arguments().empty()); } void TestApi::changeDependentLib() @@ -1820,7 +1820,7 @@ void TestApi::multiplexing() product = takeMatchingProduct(products, selector); QVERIFY(product.isValid()); QVERIFY(!product.isMultiplexed()); - QVERIFY(product.dependencies().isEmpty()); + QVERIFY(product.dependencies().empty()); selector.clear(); selector.name = "multiplex-without-aggregator-2"; @@ -1828,13 +1828,13 @@ void TestApi::multiplexing() product = takeMatchingProduct(products, selector); QVERIFY(product.isValid()); QVERIFY(product.isMultiplexed()); - QVERIFY(product.dependencies().isEmpty()); + QVERIFY(product.dependencies().empty()); selector.qbsProperties["architecture"] = "C64"; product = takeMatchingProduct(products, selector); QVERIFY(product.isValid()); QVERIFY(product.isMultiplexed()); - QVERIFY(product.dependencies().isEmpty()); + QVERIFY(product.dependencies().empty()); selector.clear(); selector.name = "multiplex-with-export"; @@ -1842,27 +1842,27 @@ void TestApi::multiplexing() product = takeMatchingProduct(products, selector); QVERIFY(product.isValid()); QVERIFY(product.isMultiplexed()); - QVERIFY(product.dependencies().isEmpty()); + QVERIFY(product.dependencies().empty()); selector.qbsProperties["architecture"] = "C64"; product = takeMatchingProduct(products, selector); QVERIFY(product.isValid()); QVERIFY(product.isMultiplexed()); - QVERIFY(product.dependencies().isEmpty()); + QVERIFY(product.dependencies().empty()); selector.clear(); selector.name = "nonmultiplex-with-export"; product = takeMatchingProduct(products, selector); QVERIFY(product.isValid()); QVERIFY(!product.isMultiplexed()); - QVERIFY(product.dependencies().isEmpty()); + QVERIFY(product.dependencies().empty()); selector.clear(); selector.name = "nonmultiplex-exporting-aggregation"; product = takeMatchingProduct(products, selector); QVERIFY(product.isValid()); QVERIFY(!product.isMultiplexed()); - QVERIFY(product.dependencies().isEmpty()); + QVERIFY(product.dependencies().empty()); selector.clear(); selector.name = "multiplex-using-export"; @@ -1899,23 +1899,23 @@ void TestApi::multiplexing() product = takeMatchingProduct(products, selector); QVERIFY(product.isValid()); QVERIFY(product.isMultiplexed()); - QVERIFY(product.dependencies().isEmpty()); + QVERIFY(product.dependencies().empty()); selector.qbsProperties["buildVariant"] = "release"; product = takeMatchingProduct(products, selector); QVERIFY(product.isValid()); QVERIFY(product.isMultiplexed()); - QVERIFY(product.dependencies().isEmpty()); + QVERIFY(product.dependencies().empty()); selector.qbsProperties["architecture"] = "TRS-80"; selector.qbsProperties["buildVariant"] = "debug"; product = takeMatchingProduct(products, selector); QVERIFY(product.isValid()); QVERIFY(product.isMultiplexed()); - QVERIFY(product.dependencies().isEmpty()); + QVERIFY(product.dependencies().empty()); selector.qbsProperties["buildVariant"] = "release"; product = takeMatchingProduct(products, selector); QVERIFY(product.isValid()); QVERIFY(product.isMultiplexed()); - QVERIFY(product.dependencies().isEmpty()); + QVERIFY(product.dependencies().empty()); selector.clear(); selector.name = "multiplex-with-aggregator-2"; @@ -1988,7 +1988,7 @@ void TestApi::multiplexing() QVERIFY(product.isMultiplexed()); QCOMPARE(product.dependencies().size(), 4); - QVERIFY(products.isEmpty()); + QVERIFY(products.empty()); } void TestApi::newOutputArtifactInDependency() @@ -2095,13 +2095,13 @@ void TestApi::projectDataAfterProductInvalidation() qbs::Project project = setupJob->project(); QVERIFY(project.isValid()); QCOMPARE(project.projectData().products().size(), 1); - QVERIFY(project.projectData().products().front().generatedArtifacts().isEmpty()); + QVERIFY(project.projectData().products().front().generatedArtifacts().empty()); std::unique_ptr buildJob(project.buildAllProducts(qbs::BuildOptions())); waitForFinished(buildJob.get()); QVERIFY2(!buildJob->error().hasError(), qPrintable(buildJob->error().toString())); QCOMPARE(project.projectData().products().size(), 1); const qbs::ProductData productAfterBulding = project.projectData().products().front(); - QVERIFY(!productAfterBulding.generatedArtifacts().isEmpty()); + QVERIFY(!productAfterBulding.generatedArtifacts().empty()); QFile projectFile(setupParams.projectFilePath()); WAIT_FOR_NEW_TIMESTAMP(); QVERIFY2(projectFile.open(QIODevice::ReadWrite), qPrintable(projectFile.errorString())); diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 283f24431..0bfc5a5e1 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -688,9 +688,9 @@ void TestBlackbox::dependenciesProperty() QCOMPARE(product2_type.first().toString(), QLatin1String("application")); QCOMPARE(product2.value(QLatin1String("narf")).toString(), QLatin1String("zort")); QJsonArray product2_deps = product2.value(QLatin1String("dependencies")).toArray(); - QVERIFY(!product2_deps.isEmpty()); + QVERIFY(!product2_deps.empty()); QJsonObject product2_qbs = findByName(product2_deps, QStringLiteral("qbs")); - QVERIFY(!product2_qbs.isEmpty()); + QVERIFY(!product2_qbs.empty()); QJsonObject product2_cpp = findByName(product2_deps, QStringLiteral("cpp")); QJsonArray product2_cpp_defines = product2_cpp.value(QLatin1String("defines")).toArray(); QCOMPARE(product2_cpp_defines.size(), 1); @@ -1545,7 +1545,7 @@ void TestBlackbox::separateDebugInfo() Profile buildProfile(profileName(), s.get()); QStringList toolchain = buildProfile.value("qbs.toolchain").toStringList(); QStringList targetOS = buildProfile.value("qbs.targetOS").toStringList(); - if (targetOS.contains("darwin") || (targetOS.isEmpty() && HostOsInfo::isMacosHost())) { + if (targetOS.contains("darwin") || (targetOS.empty() && HostOsInfo::isMacosHost())) { QVERIFY(directoryExists(relativeProductBuildDir("app1") + "/app1.app.dSYM")); QVERIFY(regularFileExists(relativeProductBuildDir("app1") + "/app1.app.dSYM/Contents/Info.plist")); @@ -4245,7 +4245,7 @@ void TestBlackbox::productDependenciesByType() const QString cleanLine = QString::fromLocal8Bit(line.trimmed()); QVERIFY2(apps.removeOne(cleanLine), qPrintable(cleanLine)); } - QVERIFY(apps.isEmpty()); + QVERIFY(apps.empty()); } void TestBlackbox::properQuoting() @@ -4599,9 +4599,9 @@ void TestBlackbox::assembly() return QJsonDocument::fromJson(propertiesFile.readAll()).toVariant().toMap(); return QVariantMap(); })(); - QVERIFY(!properties.isEmpty()); + QVERIFY(!properties.empty()); const auto toolchain = properties.value("qbs.toolchain").toStringList(); - QVERIFY(!toolchain.isEmpty()); + QVERIFY(!toolchain.empty()); const bool haveGcc = toolchain.contains("gcc"); const bool haveMSVC = toolchain.contains("msvc"); diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index 673feb54b..8fba0d78e 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -122,9 +122,9 @@ void TestBlackboxAndroid::android() } missingExpectedFiles << expectedFile; } - if (!missingExpectedFiles.isEmpty()) + if (!missingExpectedFiles.empty()) QFAIL(QByteArray("missing expected files:\n") + missingExpectedFiles.join('\n')); - if (!actualFiles.isEmpty()) { + if (!actualFiles.empty()) { QByteArray msg = "unexpected files encountered:\n" + actualFiles.join('\n'); auto it = std::find_if(std::begin(actualFiles), std::end(actualFiles), [](const QByteArray &f) { @@ -160,7 +160,7 @@ void TestBlackboxAndroid::android_data() const SettingsPtr s = settings(); const Profile p("qbs_autotests-android", s.get()); QStringList archsStringList = p.value(QLatin1String("qbs.architectures")).toStringList(); - if (archsStringList.isEmpty()) + if (archsStringList.empty()) archsStringList << QStringLiteral("armv7a"); // must match default in common.qbs QByteArrayList archs; std::transform(archsStringList.begin(), archsStringList.end(), std::back_inserter(archs), diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp index 9e2664e84..20f3f0050 100644 --- a/tests/auto/blackbox/tst_blackboxjava.cpp +++ b/tests/auto/blackbox/tst_blackboxjava.cpp @@ -203,7 +203,7 @@ void TestBlackboxJava::javaDependencyTracking_data() if (!jdkVersion.isEmpty()) seenJdkVersions << jdkVersion; - if (!seenJdkVersions.isEmpty()) { + if (!seenJdkVersions.empty()) { const auto javaVersions = QStringList() << knownJdkVersions.mid(0, knownJdkVersions.indexOf(seenJdkVersions.last()) + 1) << QString(); // also test with no explicitly specified source version @@ -221,7 +221,7 @@ void TestBlackboxJava::javaDependencyTracking_data() } } - if (seenJdkVersions.isEmpty()) + if (seenJdkVersions.empty()) QSKIP("No JDKs installed"); } diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp index 134516553..457523185 100644 --- a/tests/auto/language/tst_language.cpp +++ b/tests/auto/language/tst_language.cpp @@ -882,13 +882,13 @@ void TestLanguage::exports() QVERIFY(product->dependencies.contains(products.value("D"))); product = products.value("B"); QVERIFY(!!product); - QVERIFY(product->dependencies.isEmpty()); + QVERIFY(product->dependencies.empty()); product = products.value("C"); QVERIFY(!!product); - QVERIFY(product->dependencies.isEmpty()); + QVERIFY(product->dependencies.empty()); product = products.value("D"); QVERIFY(!!product); - QVERIFY(product->dependencies.isEmpty()); + QVERIFY(product->dependencies.empty()); product = products.value("myapp2"); QVERIFY(!!product); @@ -2713,9 +2713,9 @@ void TestLanguage::wildcards() } if (!prefix.isEmpty()) s << " prefix: " << toJSLiteral(prefix) << endl; - if (!patterns.isEmpty()) + if (!patterns.empty()) s << " files: " << toJSLiteral(patterns) << endl; - if (!excludePatterns.isEmpty()) + if (!excludePatterns.empty()) s << " excludeFiles: " << toJSLiteral(excludePatterns) << endl; if (useGroup) s << " }" << endl; diff --git a/tests/auto/shared.h b/tests/auto/shared.h index 60bb3f64d..f2bda8591 100644 --- a/tests/auto/shared.h +++ b/tests/auto/shared.h @@ -213,7 +213,7 @@ inline qbs::Internal::HostOsInfo::HostOs targetOs() return qbs::Internal::HostOsInfo::HostOsMacos; if (targetOS.contains("unix")) return qbs::Internal::HostOsInfo::HostOsOtherUnix; - if (!targetOS.isEmpty()) + if (!targetOS.empty()) return qbs::Internal::HostOsInfo::HostOsOther; return qbs::Internal::HostOsInfo::hostOs(); } diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp index 84d9caad3..4f2dcd6b4 100644 --- a/tests/auto/tools/tst_tools.cpp +++ b/tests/auto/tools/tst_tools.cpp @@ -283,10 +283,10 @@ void TestTools::testProfiles() QVERIFY(!childProfile.value("blubb", QString(), &errorInfo).isValid()); QVERIFY(errorInfo.hasError()); - QVERIFY(!childProfile.allKeys(Profile::KeySelectionNonRecursive).isEmpty()); + QVERIFY(!childProfile.allKeys(Profile::KeySelectionNonRecursive).empty()); errorInfo.clear(); - QVERIFY(childProfile.allKeys(Profile::KeySelectionRecursive, &errorInfo).isEmpty()); + QVERIFY(childProfile.allKeys(Profile::KeySelectionRecursive, &errorInfo).empty()); QVERIFY(errorInfo.hasError()); } @@ -302,7 +302,7 @@ void TestTools::testSettingsMigration() settings.baseDirectory() + "/qbs/" QBS_VERSION "/profilesright"); } else { QVERIFY(!QFileInfo(settings.baseDirectory() + "/qbs/" QBS_VERSION "/profiles").exists()); - QVERIFY(settings.allKeys().isEmpty()); + QVERIFY(settings.allKeys().empty()); } } @@ -514,37 +514,37 @@ void TestTools::set_size() { Set set; QVERIFY(set.size() == 0); - QVERIFY(set.isEmpty()); + QVERIFY(set.empty()); QVERIFY(set.size() == set.size()); set.insert(1); QVERIFY(set.size() == 1); - QVERIFY(!set.isEmpty()); + QVERIFY(!set.empty()); QVERIFY(set.size() == set.size()); set.insert(1); QVERIFY(set.size() == 1); - QVERIFY(!set.isEmpty()); + QVERIFY(!set.empty()); QVERIFY(set.size() == set.size()); set.insert(2); QVERIFY(set.size() == 2); - QVERIFY(!set.isEmpty()); + QVERIFY(!set.empty()); QVERIFY(set.size() == set.size()); set.remove(1); QVERIFY(set.size() == 1); - QVERIFY(!set.isEmpty()); + QVERIFY(!set.empty()); QVERIFY(set.size() == set.size()); set.remove(1); QVERIFY(set.size() == 1); - QVERIFY(!set.isEmpty()); + QVERIFY(!set.empty()); QVERIFY(set.size() == set.size()); set.remove(2); QVERIFY(set.size() == 0); - QVERIFY(set.isEmpty()); + QVERIFY(set.empty()); QVERIFY(set.size() == set.size()); } @@ -898,8 +898,8 @@ void TestTools::set_stlMutableIterator() while (i != set2.end()) { i = set2.erase(i); } - QVERIFY(set2.isEmpty()); - QVERIFY(!set3.isEmpty()); + QVERIFY(set2.empty()); + QVERIFY(!set3.empty()); j = set3.end(); while (j != set3.begin()) { @@ -910,8 +910,8 @@ void TestTools::set_stlMutableIterator() if (set3.begin() != set3.end()) set3.erase(set3.begin()); - QVERIFY(set2.isEmpty()); - QVERIFY(set3.isEmpty()); + QVERIFY(set2.empty()); + QVERIFY(set3.empty()); i = set2.insert("foo").first; QCOMPARE(*i, QLatin1String("foo")); @@ -1052,10 +1052,10 @@ void TestTools::set_initializerList() QCOMPARE(set2.find(searchKey)->id, 0); Set emptySet{}; - QVERIFY(emptySet.isEmpty()); + QVERIFY(emptySet.empty()); Set set3{{}, {}, {}}; - QVERIFY(!set3.isEmpty()); + QVERIFY(!set3.empty()); } void TestTools::set_intersects() diff --git a/tests/benchmarker/valgrindrunner.cpp b/tests/benchmarker/valgrindrunner.cpp index 945011db1..5d218d2c7 100644 --- a/tests/benchmarker/valgrindrunner.cpp +++ b/tests/benchmarker/valgrindrunner.cpp @@ -63,7 +63,7 @@ void ValgrindRunner::run() futures << QtConcurrent::run(this, &ValgrindRunner::traceRuleExecution); if (m_activities & ActivityNullBuild) futures << QtConcurrent::run(this, &ValgrindRunner::traceNullBuild); - while (!futures.isEmpty()) + while (!futures.empty()) futures.takeFirst().waitForFinished(); } diff --git a/tests/fuzzy-test/commandlineparser.cpp b/tests/fuzzy-test/commandlineparser.cpp index 21961540f..86f498dec 100644 --- a/tests/fuzzy-test/commandlineparser.cpp +++ b/tests/fuzzy-test/commandlineparser.cpp @@ -49,9 +49,9 @@ void CommandLineParser::parse(const QStringList &commandLine) m_jobCount = 0; m_log = false; m_commandLine = commandLine; - Q_ASSERT(!m_commandLine.isEmpty()); + Q_ASSERT(!m_commandLine.empty()); m_command = m_commandLine.takeFirst(); - while (!m_commandLine.isEmpty()) { + while (!m_commandLine.empty()) { const QString arg = m_commandLine.takeFirst(); if (arg == profileOption()) assignOptionArgument(arg, m_profile); @@ -82,7 +82,7 @@ QString CommandLineParser::usageString() const void CommandLineParser::assignOptionArgument(const QString &option, QString &argument) { - if (m_commandLine.isEmpty()) + if (m_commandLine.empty()) throw ParseException(QString::fromLatin1("Option '%1' needs an argument.").arg(option)); argument = m_commandLine.takeFirst(); if (argument.isEmpty()) { -- cgit v1.2.3