From f785402972cd509be5cd0710c624910f0f5da494 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 19 Feb 2014 09:05:29 -0300 Subject: [PATCH] CppTools: Cleanup test_cpppreprocessor_includes Use QCOMPARE instead of QVERIFY where appropriate. Change-Id: I7965a00fd004b8c3a20186bb692bf541f154d12b Reviewed-by: Orgad Shaneh --- src/plugins/cpptools/cpppreprocessor_test.cpp | 12 ++++++------ src/plugins/cpptools/cpptoolsplugin.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/cpptools/cpppreprocessor_test.cpp b/src/plugins/cpptools/cpppreprocessor_test.cpp index d2557e81e21..5f6729bb0c0 100644 --- a/src/plugins/cpptools/cpppreprocessor_test.cpp +++ b/src/plugins/cpptools/cpppreprocessor_test.cpp @@ -90,7 +90,8 @@ private: CppModelManager *m_cmm; }; -void CppToolsPlugin::test_cpppreprocessor_includes() +/// Check: Resolved and unresolved includes are properly tracked. +void CppToolsPlugin::test_cpppreprocessor_includes_resolvedUnresolved() { QByteArray source = "#include \"header.h\"\n" @@ -103,17 +104,16 @@ void CppToolsPlugin::test_cpppreprocessor_includes() QVERIFY(document); const QList resolvedIncludes = document->resolvedIncludes(); - QVERIFY(resolvedIncludes.size() == 1); - QVERIFY(resolvedIncludes.at(0).type() == Client::IncludeLocal); + QCOMPARE(resolvedIncludes.size(), 1); + QCOMPARE(resolvedIncludes.at(0).type(), Client::IncludeLocal); QCOMPARE(resolvedIncludes.at(0).unresolvedFileName(), QLatin1String("header.h")); const QString expectedResolvedFileName = TestIncludePaths::testFilePath(QLatin1String("header.h")); QCOMPARE(resolvedIncludes.at(0).resolvedFileName(), expectedResolvedFileName); const QList unresolvedIncludes = document->unresolvedIncludes(); - QVERIFY(unresolvedIncludes.size() == 1); - QVERIFY(unresolvedIncludes.at(0).type() == Client::IncludeLocal); + QCOMPARE(unresolvedIncludes.size(), 1); + QCOMPARE(unresolvedIncludes.at(0).type(), Client::IncludeLocal); QCOMPARE(unresolvedIncludes.at(0).unresolvedFileName(), QLatin1String("notresolvable.h")); QVERIFY(unresolvedIncludes.at(0).resolvedFileName().isEmpty()); } - diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 0f8ab1e6d17..4e9c024ad12 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -122,7 +122,7 @@ private slots: void test_format_pointerdeclaration_macros(); void test_format_pointerdeclaration_macros_data(); - void test_cpppreprocessor_includes(); + void test_cpppreprocessor_includes_resolvedUnresolved(); void test_functionutils_virtualFunctions(); void test_functionutils_virtualFunctions_data();