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

CppTools/Editor: Make sure test code is free of diagnostic messages

Browse Source 
...where applicable.

Change-Id: Ie42e1012598adf124e5f66b6a53eda01724dfb71
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Nikolai Kosjar
2014-04-03 14:37:57 -04:00
parent 8560036d96
commit 5506919233
5 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/cpptools/cppcompletion_test.cpp
View File

@@ -87,6 +87,8 @@ public:
// Get Document
waitForFileInGlobalSnapshot(fileName);
const Document::Ptr document = globalSnapshot().document(fileName);
QVERIFY(document);
QVERIFY(document->diagnosticMessages().isEmpty());
m_snapshot.insert(document);
@@ -344,7 +346,7 @@ void CppToolsPlugin::test_completion_data()
"{\n"
" Base *b = new Derived;\n"
" if (1)\n"
" @\n"
" @;\n"
"}\n"
) << _("((Derived *)b)->") << (QStringList()
<< QLatin1String("Derived")
@@ -367,7 +369,7 @@ void CppToolsPlugin::test_completion_data()
"{\n"
" Base *b = new Derived;\n"
" if (1)\n"
" @\n"
" @;\n"
"}\n"
) << _("(static_cast<Derived *>(b))->") << (QStringList()
<< QLatin1String("Derived")
@@ -1522,7 +1524,7 @@ void CppToolsPlugin::test_completion_data()
" int foo2;\n"
" };\n"
" @\n"
"};\n"
"}\n"
) << _("foo") << (QStringList()
<< QLatin1String("foo1")
<< QLatin1String("foo2"));
@@ -1704,6 +1706,7 @@ void CppToolsPlugin::test_completion_data()
" int m;\n"
" };\n"
"}\n"
"}\n"
"void foo()\n"
"{\n"
" namespace NS = NS1::NS2;\n"
@@ -1725,6 +1728,7 @@ void CppToolsPlugin::test_completion_data()
" int m;\n"
" };\n"
"}\n"
"}\n"
"void foo()\n"
"{\n"
" {\n"
@@ -1823,7 +1827,6 @@ void CppToolsPlugin::test_completion_data()
" enum E { val1, val2, val3 };\n"
" @\n"
"};\n"
"@\n"
) << _("Foo::v") << (QStringList()
<< QLatin1String("val1")
<< QLatin1String("val2")
@@ -1835,7 +1838,6 @@ void CppToolsPlugin::test_completion_data()
" enum E { val1, val2, val3 };\n"
" @\n"
"};\n"
"@\n"
) << _("Foo::E::") << (QStringList()
<< QLatin1String("E")
<< QLatin1String("val1")
@@ -1848,7 +1850,6 @@ void CppToolsPlugin::test_completion_data()
" enum { val1, val2, val3 };\n"
" @\n"
"};\n"
"@\n"
) << _("Foo::v") << (QStringList()
<< QLatin1String("val1")
<< QLatin1String("val2")
@@ -1859,8 +1860,7 @@ void CppToolsPlugin::test_completion_data()
"{\n"
" enum E { val1, val2, val3 };\n"
" @\n"
"};\n"
"@\n"
"}\n"
) << _("Ns::v") << (QStringList()
<< QLatin1String("val1")
<< QLatin1String("val2")
@@ -1871,8 +1871,7 @@ void CppToolsPlugin::test_completion_data()
"{\n"
" enum E { val1, val2, val3 };\n"
" @\n"
"};\n"
"@\n"
"}\n"
) << _("Ns::E::") << (QStringList()
<< QLatin1String("E")
<< QLatin1String("val1")
@@ -1884,8 +1883,7 @@ void CppToolsPlugin::test_completion_data()
"{\n"
" enum { val1, val2, val3 };\n"
" @\n"
"};\n"
"@\n"
"}\n"
) << _("Ns::v") << (QStringList()
<< QLatin1String("val1")
<< QLatin1String("val2")
@@ -2186,9 +2184,9 @@ void CppToolsPlugin::test_completion_data()
"void client()\n"
"{\n"
" Timer *timer = new Timer;\n"
" connect(timer, SIGNAL(@\n"
" @\n"
"}\n"
) << _() << (QStringList()
) << _("connect(timer, SIGNAL(") << (QStringList()
<< QLatin1String("timeout()"));
QTest::newRow("member_of_class_accessed_by_using_QTCREATORBUG9037_1") << _(
@@ -2230,9 +2228,9 @@ void CppToolsPlugin::test_completion_data()
"\n"
"double getValue(const QVector<V>& d) const {\n"
" typedef QVector<V>::ConstIterator Iter;\n"
" double val = @\n"
" @\n"
"}\n"
) << _("d.constBegin()->") << (QStringList());
) << _("double val = d.constBegin()->") << (QStringList());
}
void CppToolsPlugin::test_completion_member_access_operator()
@@ -2277,7 +2275,6 @@ void CppToolsPlugin::test_completion_member_access_operator_data()
"typedef S SType;\n"
"SType p;\n"
"@\n"
"}\n"
) << _("p.") << (QStringList()
<< QLatin1String("S")
<< QLatin1String("m"))
@@ -2288,7 +2285,6 @@ void CppToolsPlugin::test_completion_member_access_operator_data()
"typedef S *SType;\n"
"SType *p;\n"
"@\n"
"}\n"
) << _("p.") << (QStringList())
<< false;
@@ -2297,7 +2293,6 @@ void CppToolsPlugin::test_completion_member_access_operator_data()
"typedef S SType;\n"
"SType *p;\n"
"@\n"
"}\n"
) << _("p.") << (QStringList()
<< QLatin1String("S")
<< QLatin1String("m"))
@@ -2308,7 +2303,6 @@ void CppToolsPlugin::test_completion_member_access_operator_data()
"typedef S* SPtr;\n"
"SPtr p;\n"
"@\n"
"}\n"
) << _("p.") << (QStringList()
<< QLatin1String("S")
<< QLatin1String("m"))
@@ -2319,7 +2313,6 @@ void CppToolsPlugin::test_completion_member_access_operator_data()
"struct S { int m; };\n"
"SType *p;\n"
"@\n"
"}\n"
) << _("p.") << (QStringList()
<< QLatin1String("S")
<< QLatin1String("m"))
@@ -2330,7 +2323,6 @@ void CppToolsPlugin::test_completion_member_access_operator_data()
"struct S { int m; };\n"
"SType p;\n"
"@\n"
"}\n"
) << _("p.") << (QStringList()
<< QLatin1String("S")
<< QLatin1String("m"))
@@ -2341,7 +2333,6 @@ void CppToolsPlugin::test_completion_member_access_operator_data()
"struct S { int m; };\n"
"SType *p;\n"
"@\n"
"}\n"
) << _("p.") << (QStringList())
<< false;
@@ -2350,7 +2341,6 @@ void CppToolsPlugin::test_completion_member_access_operator_data()
"struct S { int m; };\n"
"SType p;\n"
"@\n"
"}\n"
) << _("p.") << (QStringList()
<< QLatin1String("S")
<< QLatin1String("m"))
@@ -2362,7 +2352,6 @@ void CppToolsPlugin::test_completion_member_access_operator_data()
"typedef struct SType *STypePtr;\n"
"STypePtr p;\n"
"@\n"
"}\n"
) << _("p.") << (QStringList()
<< QLatin1String("S")
<< QLatin1String("m"))
@@ -2374,7 +2363,6 @@ void CppToolsPlugin::test_completion_member_access_operator_data()
"typedef struct SType *STypePtr;\n"
"STypePtr p;\n"
"@\n"
"}\n"
) << _("p->") << (QStringList()
<< QLatin1String("S")
<< QLatin1String("m"))

9
src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
View File

@@ -99,6 +99,7 @@ public:
document->setUtf8Source(preprocessedSource);
document->parse(parseMode);
document->check();
QVERIFY(document->diagnosticMessages().isEmpty());
AST *ast = document->translationUnit()->ast();
QVERIFY(ast);
@@ -614,25 +615,25 @@ void CppToolsPlugin::test_format_pointerdeclaration_macros_data()
source = QLatin1String(
"#define FOO int*\n"
"FOO @f() {};\n");
"FOO @f() {}\n");
QTest::newRow("macro-in-function-definition-returntype")
<< source << stripCursor(source);
source = QLatin1String(
"#define FOO int*\n"
"int f(FOO @a) {};\n");
"int f(FOO @a) {}\n");
QTest::newRow("macro-in-function-definition-param")
<< source << stripCursor(source);
source = QLatin1String(
"#define FOO int*\n"
"while (FOO @s = 0);\n");
"void f() { while (FOO @s = 0) {} }\n");
QTest::newRow("macro-in-if-while-for")
<< source << stripCursor(source);
source = QLatin1String(
"#define FOO int*\n"
"foreach (FOO @s, list);\n");
"void f() { foreach (FOO @s, list) {} }\n");
QTest::newRow("macro-in-foreach")
<< source << stripCursor(source);

2
src/plugins/cpptools/typehierarchybuilder_test.cpp
View File

@@ -117,6 +117,8 @@ public:
// Get class for which to generate the hierarchy
const Document::Ptr firstDocument = snapshot.document(filePaths.first());
QVERIFY(firstDocument);
QVERIFY(firstDocument->diagnosticMessages().isEmpty());
Class *clazz = FindFirstClassInDocument()(firstDocument);
QVERIFY(clazz);