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

CppTools: Fix tests test_mixed{1,2}

Browse Source 
Change-Id: I573b6d1aa4f8abb3be0205f6467ed088c805bb6e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-12-13 14:34:31 +01:00
parent 43dbed9919
commit 249b55323d
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/genericprojectmanager/genericprojectplugin_test.cpp
View File

@@ -112,29 +112,26 @@ void GenericProjectPlugin::test_mixed1()
const QStringList part1files = simplify(parts[1]->files, dirPathWithSlash); const QStringList part1files = simplify(parts[1]->files, dirPathWithSlash);
const QStringList part2files = simplify(parts[2]->files, dirPathWithSlash); const QStringList part2files = simplify(parts[2]->files, dirPathWithSlash);
QCOMPARE(parts[0]->displayName, _("mixedproject1 (C++11)")); QCOMPARE(parts[0]->displayName, _("mixedproject1 (C++)"));
QCOMPARE(parts[0]->files.size(), 4); QCOMPARE(parts[0]->files.size(), 4);
QVERIFY(part0files.contains(_("main.cpp"))); QVERIFY(part0files.contains(_("main.cpp")));
QVERIFY(part0files.contains(_("header.h"))); QVERIFY(part0files.contains(_("header.h")));
QVERIFY(part0files.contains(_("MyViewController.h"))); QVERIFY(part0files.contains(_("MyViewController.h")));
QVERIFY(part0files.contains(_("Glue.h"))); QVERIFY(part0files.contains(_("Glue.h")));
QCOMPARE(parts[1]->displayName, _("mixedproject1 (Obj-C++11)")); QCOMPARE(parts[1]->displayName, _("mixedproject1 (Obj-C)"));
QCOMPARE(parts[1]->files.size(), 4); QCOMPARE(parts[1]->files.size(), 4);
QVERIFY(part1files.contains(_("Glue.mm"))); QVERIFY(part1files.contains(_("MyViewController.m")));
QVERIFY(part1files.contains(_("header.h"))); QVERIFY(part1files.contains(_("header.h")));
QVERIFY(part1files.contains(_("MyViewController.h"))); QVERIFY(part1files.contains(_("MyViewController.h")));
QVERIFY(part1files.contains(_("Glue.h"))); QVERIFY(part1files.contains(_("Glue.h")));
QCOMPARE(parts[2]->displayName, _("mixedproject1 (Obj-C11)")); QCOMPARE(parts[2]->displayName, _("mixedproject1 (Obj-C++)"));
QCOMPARE(parts[2]->files.size(), 1); QCOMPARE(parts[2]->files.size(), 4);
QVERIFY(part2files.contains(_("MyViewController.m"))); QVERIFY(part2files.contains(_("Glue.mm")));
// No .h files here, because the mime-type for .h files is..... QVERIFY(part2files.contains(_("header.h")));
// QVERIFY(part2files.contains(_("MyViewController.h")));
// wait for it... QVERIFY(part2files.contains(_("Glue.h")));
//
// C++!
// (See 1c7da3d83c9bb35064ae6b9052cbf1c6bff1395e.)
} }
void GenericProjectPlugin::test_mixed2() void GenericProjectPlugin::test_mixed2()
@@ -160,12 +157,12 @@ void GenericProjectPlugin::test_mixed2()
const QStringList part0files = simplify(parts[0]->files, dirPathWithSlash); const QStringList part0files = simplify(parts[0]->files, dirPathWithSlash);
const QStringList part1files = simplify(parts[1]->files, dirPathWithSlash); const QStringList part1files = simplify(parts[1]->files, dirPathWithSlash);
QCOMPARE(parts[0]->displayName, _("mixedproject2 (C++11)")); QCOMPARE(parts[0]->displayName, _("mixedproject2 (C)"));
QCOMPARE(parts[0]->files.size(), 2); QCOMPARE(parts[0]->files.size(), 1);
QVERIFY(part0files.contains(_("main.cpp"))); QVERIFY(part0files.contains(_("impl.c")));
QVERIFY(part0files.contains(_("header.hpp")));
QCOMPARE(parts[1]->displayName, _("mixedproject2 (C11)")); QCOMPARE(parts[1]->displayName, _("mixedproject2 (C++)"));
QCOMPARE(parts[1]->files.size(), 1); QCOMPARE(parts[1]->files.size(), 2);
QVERIFY(part1files.contains(_("impl.c"))); QVERIFY(part1files.contains(_("main.cpp")));
QVERIFY(part1files.contains(_("header.hpp")));
} }