diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-08 12:03:11 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-09 14:09:07 +0200 |
| commit | cc951e2a0186bba5eb541ce7a3ddfbfa03510065 (patch) | |
| tree | 083e02e184659f18d0d271278df6baac649710ff /tests | |
| parent | dc4485e709eae5a3f5412f53e740710ca077d2cf (diff) | |
| download | qbs-cc951e2a0186bba5eb541ce7a3ddfbfa03510065.tar.gz | |
Factor out common code in API test.
Change-Id: I596bd943000b41fdd46cbbf33a91a66b57dc3513
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/api/tst_api.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 79582ad2a..8b5021b1e 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -63,6 +63,13 @@ TestApi::~TestApi() delete m_logSink; } +static void waitForFinished(qbs::AbstractJob *job) +{ + QEventLoop loop; + QObject::connect(job, SIGNAL(finished(bool,qbs::AbstractJob*)), &loop, SLOT(quit())); + loop.exec(); +} + void TestApi::disabledInstallGroup() { qbs::SetupProjectParameters setupParams = defaultSetupParameters(); @@ -70,9 +77,7 @@ void TestApi::disabledInstallGroup() "/disabled_install_group/project.qbs"))); QScopedPointer<qbs::SetupProjectJob> job(qbs::Project::setupProject(setupParams, m_logSink, 0)); - QEventLoop loop; - connect(job.data(), SIGNAL(finished(bool,qbs::AbstractJob*)), &loop, SLOT(quit())); - loop.exec(); + waitForFinished(job.data()); QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString())); qbs::Project project = job->project(); qbs::ProjectData projectData = project.projectData(); @@ -94,9 +99,7 @@ void TestApi::installableFiles() "/installed_artifact/installed_artifact.qbs"))); QScopedPointer<qbs::SetupProjectJob> job(qbs::Project::setupProject(setupParams, m_logSink, 0)); - QEventLoop loop; - connect(job.data(), SIGNAL(finished(bool,qbs::AbstractJob*)), &loop, SLOT(quit())); - loop.exec(); + waitForFinished(job.data()); QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString())); qbs::Project project = job->project(); qbs::ProjectData projectData = project.projectData(); @@ -117,8 +120,7 @@ void TestApi::installableFiles() setupParams.setProjectFilePath(QDir::cleanPath(QLatin1String(SRCDIR "/../blackbox/testdata" "/recursive_wildcards/recursive_wildcards.qbs"))); job.reset(qbs::Project::setupProject(setupParams, m_logSink, 0)); - connect(job.data(), SIGNAL(finished(bool,qbs::AbstractJob*)), &loop, SLOT(quit())); - loop.exec(); + waitForFinished(job.data()); QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString())); project = job->project(); projectData = project.projectData(); |