diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-07-15 14:10:34 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-07-15 14:10:38 +0200 |
| commit | 7e1b4ccebb7f6a0827c1937fd5f3c8fda0f39792 (patch) | |
| tree | 0b44da61c7259e25f992e4d536c2f6754d097428 /src/plugins/autotest/autotestunittests.cpp | |
| parent | 7f81c0909750893fb4556514b5fd2a3b8f434e1a (diff) | |
| parent | cc18dc3cd8ecad145ed5456ddaeae7062f271981 (diff) | |
| download | qt-creator-7e1b4ccebb7f6a0827c1937fd5f3c8fda0f39792.tar.gz | |
Merge remote-tracking branch 'origin/4.1'
Change-Id: I041b949aff8bee481a572ba6f7e2ef72b9010923
Diffstat (limited to 'src/plugins/autotest/autotestunittests.cpp')
| -rw-r--r-- | src/plugins/autotest/autotestunittests.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/autotest/autotestunittests.cpp b/src/plugins/autotest/autotestunittests.cpp index d06e916eda..481d728754 100644 --- a/src/plugins/autotest/autotestunittests.cpp +++ b/src/plugins/autotest/autotestunittests.cpp @@ -205,7 +205,7 @@ void AutoTestUnitTests::testCodeParserGTest() QVERIFY(parserSpy.wait(20000)); QVERIFY(modelUpdateSpy.wait()); - QCOMPARE(m_model->gtestNamesCount(), 6); + QCOMPARE(m_model->gtestNamesCount(), 7); QMultiMap<QString, int> expectedNamesAndSets; expectedNamesAndSets.insert(QStringLiteral("FactorialTest"), 3); @@ -214,6 +214,7 @@ void AutoTestUnitTests::testCodeParserGTest() expectedNamesAndSets.insert(QStringLiteral("QueueTest"), 2); expectedNamesAndSets.insert(QStringLiteral("DummyTest"), 1); // used as parameterized test expectedNamesAndSets.insert(QStringLiteral("DummyTest"), 1); // used as 'normal' test + expectedNamesAndSets.insert(QStringLiteral("NamespaceTest"), 1); QMultiMap<QString, int> foundNamesAndSets = m_model->gtestNamesAndSets(); QCOMPARE(expectedNamesAndSets.size(), foundNamesAndSets.size()); |