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

CppEditor: Tests: Revive tests depending on loaded projects

Browse Source 
The tests were broken since the qmake project manager switched to an
asynchronous loading.

We can't simply check if there are loaded projects because at time the
tests are executed there are not any. The user has to set some
environment variable in order to make these tests run.

Change-Id: I94778578dea5562ee5dad2c565c7b877c18996a7
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-07-28 12:29:24 +02:00
parent db3dc92202
commit 953be3d3b2
2 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/cppeditor/cppeditorplugin.h
View File

@@ -213,8 +213,17 @@ private slots:
void test_includehierarchy_data();
void test_includehierarchy();
// The following tests depend on the projects that are loaded on startup
// and will be skipped in case no projects are loaded.
// The following tests operate on a project and require special invocation:
//
// Ensure that the project is properly configured for a given settings path:
// $ ./qtcreator -settingspath /your/settings/path /path/to/project
//
// ...and that it builds, which might prevent blocking dialogs for not
// existing files (e.g. ui_*.h).
//
// Run a test:
// $ export QTC_TEST_WAIT_FOR_LOADED_PROJECT=1
// $ ./qtcreator -settingspath /your/settings/path -test CppEditor,test_openEachFile /path/to/project
void test_openEachFile();
void test_switchHeaderSourceOnEachFile();
void test_moveTokenWiseThroughEveryFile();

49
src/plugins/cppeditor/fileandtokenactions_test.cpp
View File

@@ -118,17 +118,8 @@ private:
CppEditor *editor, const Actions &tokenActions);
static void undoAllChangesAndCloseAllEditors();
/// This function expects:
/// (1) Only Qt4 projects are loaded (qmake in PATH should point to Qt4/bin).
/// (2) No *.pro.user file exists for the projects.
static void configureAllProjects(const QList<QPointer<ProjectExplorer::Project> > &projects);
static bool allProjectsConfigured;
};
bool TestActionsTestCase::allProjectsConfigured = false;
typedef TestActionsTestCase::Actions Actions;
typedef TestActionsTestCase::ActionPointer ActionPointer;
@@ -137,18 +128,35 @@ Actions singleAction(const ActionPointer &action)
return Actions() << action;
}
static bool waitUntilAProjectIsLoaded(int timeOutInMs = 30000)
{
QElapsedTimer timer;
timer.start();
while (timer.elapsed() < timeOutInMs) {
if (!CppModelManager::instance()->projectInfos().isEmpty())
return true;
QCoreApplication::processEvents();
QThread::msleep(20);
}
return false;
}
TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Actions &fileActions)
: Tests::TestCase(/*runGarbageCollector=*/false)
{
QVERIFY(succeededSoFar());
if (qgetenv("QTC_TEST_WAIT_FOR_LOADED_PROJECT") != "1")
QSKIP("Environment variable QTC_TEST_WAIT_FOR_LOADED_PROJECT=1 not set.");
QVERIFY(waitUntilAProjectIsLoaded());
// Collect files to process
QStringList filesToOpen;
QList<QPointer<ProjectExplorer::Project> > projects;
const QList<ProjectInfo> projectInfos
= m_modelManager->projectInfos();
if (projectInfos.isEmpty())
QSKIP("No project(s) loaded. Test operates only on loaded projects.");
const QList<ProjectInfo> projectInfos = m_modelManager->projectInfos();
foreach (const ProjectInfo &info, projectInfos) {
QPointer<ProjectExplorer::Project> project = info.project();
@@ -160,12 +168,6 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti
filesToOpen << sourceFile;
}
// Configure all projects on first execution of this function (= very first test)
if (!TestActionsTestCase::allProjectsConfigured) {
configureAllProjects(projects);
TestActionsTestCase::allProjectsConfigured = true;
}
Utils::sort(filesToOpen);
// Process all files from the projects
@@ -311,15 +313,6 @@ void TestActionsTestCase::undoAllChangesAndCloseAllEditors()
QCOMPARE(DocumentModel::openedDocuments().size(), 0);
}
void TestActionsTestCase::configureAllProjects(const QList<QPointer<ProjectExplorer::Project> >
&projects)
{
foreach (const QPointer<ProjectExplorer::Project> &project, projects) {
qDebug() << "*** Configuring project" << project->displayName();
project->configureAsExampleProject(QStringList());
}
}
class NoOpTokenAction : public TestActionsTestCase::AbstractAction
{
public: