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

AutoTest: Fix flaky unit test

Browse Source 
Since parsing and updating the tree model has been changed the
respective tests became flaky.

Change-Id: I82fcde51493bc86e2315018b21e9bacd8e8409a9
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Christian Stenger
2016-02-10 10:43:31 +01:00
parent 25d63d8556
commit a4b747307e
4 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/autotest/autotestunittests.cpp
View File

@@ -96,7 +96,9 @@ void AutoTestUnitTests::testCodeParser()
QVERIFY(projectInfo.isValid()); QVERIFY(projectInfo.isValid());
QSignalSpy parserSpy(m_model->parser(), SIGNAL(parsingFinished())); QSignalSpy parserSpy(m_model->parser(), SIGNAL(parsingFinished()));
QSignalSpy modelUpdateSpy(m_model, SIGNAL(sweepingDone()));
QVERIFY(parserSpy.wait(20000)); QVERIFY(parserSpy.wait(20000));
QVERIFY(modelUpdateSpy.wait());
if (m_isQt4) if (m_isQt4)
expectedNamedQuickTestsCount = expectedUnnamedQuickTestsCount = 0; expectedNamedQuickTestsCount = expectedUnnamedQuickTestsCount = 0;
@@ -148,7 +150,9 @@ void AutoTestUnitTests::testCodeParserSwitchStartup()
QVERIFY(projectInfo.isValid()); QVERIFY(projectInfo.isValid());
QSignalSpy parserSpy(m_model->parser(), SIGNAL(parsingFinished())); QSignalSpy parserSpy(m_model->parser(), SIGNAL(parsingFinished()));
QSignalSpy modelUpdateSpy(m_model, SIGNAL(sweepingDone()));
QVERIFY(parserSpy.wait(20000)); QVERIFY(parserSpy.wait(20000));
QVERIFY(modelUpdateSpy.wait());
QCOMPARE(m_model->autoTestsCount(), expectedAutoTestsCount.at(i)); QCOMPARE(m_model->autoTestsCount(), expectedAutoTestsCount.at(i));
QCOMPARE(m_model->namedQuickTestsCount(), QCOMPARE(m_model->namedQuickTestsCount(),
@@ -198,7 +202,9 @@ void AutoTestUnitTests::testCodeParserGTest()
QVERIFY(projectInfo.isValid()); QVERIFY(projectInfo.isValid());
QSignalSpy parserSpy(m_model->parser(), SIGNAL(parsingFinished())); QSignalSpy parserSpy(m_model->parser(), SIGNAL(parsingFinished()));
QSignalSpy modelUpdateSpy(m_model, SIGNAL(sweepingDone()));
QVERIFY(parserSpy.wait(20000)); QVERIFY(parserSpy.wait(20000));
QVERIFY(modelUpdateSpy.wait());
QCOMPARE(m_model->gtestNamesCount(), 6); QCOMPARE(m_model->gtestNamesCount(), 6);

4
src/plugins/autotest/testcodeparser.h
View File

@@ -63,6 +63,10 @@ public:
void setState(State state); void setState(State state);
State state() const { return m_parserState; } State state() const { return m_parserState; }
void setDirty() { m_dirty = true; } void setDirty() { m_dirty = true; }
#ifdef WITH_TESTS
bool furtherParsingExpected() const
{ return m_singleShotScheduled || m_fullUpdatePostponed || m_partialUpdatePostponed; }
#endif
signals: signals:
void aboutToPerformFullParse(); void aboutToPerformFullParse();

4
src/plugins/autotest/testtreemodel.cpp
View File

@@ -569,6 +569,10 @@ void TestTreeModel::sweep()
} }
if (hasChanged) if (hasChanged)
emit testTreeModelChanged(); emit testTreeModelChanged();
#ifdef WITH_TESTS
if (m_parser->state() == TestCodeParser::Idle && !m_parser->furtherParsingExpected())
emit sweepingDone();
#endif
} }
QMap<QString, QString> TestTreeModel::testCaseNamesForFiles(QStringList files) QMap<QString, QString> TestTreeModel::testCaseNamesForFiles(QStringList files)

3
src/plugins/autotest/testtreemodel.h
View File

@@ -85,6 +85,9 @@ public:
signals: signals:
void testTreeModelChanged(); void testTreeModelChanged();
#ifdef WITH_TESTS
void sweepingDone();
#endif
public slots: public slots: