aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No points to show warnings if we excpect error in test.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-10-01 21:02:14 +03:00
parent 655a297f73
commit 30cfa143fe
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/test/ValentinaTest/abstracttest.cpp
View File

@ -72,15 +72,18 @@ QString AbstractTest::TapePath() const
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool AbstractTest::Run(const QString &program, const QStringList &arguments) bool AbstractTest::Run(bool showWarn, const QString &program, const QStringList &arguments)
{ {
const QString parameters = QString("Program: %1 \nArguments: %2.").arg(program).arg(arguments.join(", ")); const QString parameters = QString("Program: %1 \nArguments: %2.").arg(program).arg(arguments.join(", "));
QFileInfo info(program); QFileInfo info(program);
if (not info.exists()) if (not info.exists())
{ {
const QString msg = QString("Can't find binary.\n%1").arg(parameters); if (showWarn)
QWARN(qUtf8Printable(msg)); {
const QString msg = QString("Can't find binary.\n%1").arg(parameters);
QWARN(qUtf8Printable(msg));
}
return false; return false;
} }
@ -90,24 +93,33 @@ bool AbstractTest::Run(const QString &program, const QStringList &arguments)
if (not process->waitForFinished())// 30 sec if (not process->waitForFinished())// 30 sec
{ {
const QString msg = QString("The operation timed out or an error occurred.\n%1").arg(parameters); if (showWarn)
QWARN(qUtf8Printable(msg)); {
const QString msg = QString("The operation timed out or an error occurred.\n%1").arg(parameters);
QWARN(qUtf8Printable(msg));
}
return false; return false;
} }
if (process->exitStatus() == QProcess::CrashExit) if (process->exitStatus() == QProcess::CrashExit)
{ {
const QString msg = QString("Program crashed.\n%1\n%2").arg(parameters) if (showWarn)
.arg(QString(process->readAllStandardError())); {
QWARN(qUtf8Printable(msg)); const QString msg = QString("Program crashed.\n%1\n%2").arg(parameters)
.arg(QString(process->readAllStandardError()));
QWARN(qUtf8Printable(msg));
}
return false; return false;
} }
if (process->exitCode() != 0) if (process->exitCode() != 0)
{ {
const QString msg = QString("Failed.\n%1\n%2").arg(parameters) if (showWarn)
.arg(QString(process->readAllStandardError())); {
QWARN(qUtf8Printable(msg)); const QString msg = QString("Failed.\n%1\n%2").arg(parameters)
.arg(QString(process->readAllStandardError()));
QWARN(qUtf8Printable(msg));
}
return false; return false;
} }

2
src/test/ValentinaTest/abstracttest.h
View File

@ -43,7 +43,7 @@ protected:
QString ValentinaPath() const; QString ValentinaPath() const;
QString TapePath() const; QString TapePath() const;
bool Run(const QString &program, const QStringList &arguments); bool Run(bool showWarn, const QString &program, const QStringList &arguments);
bool CopyRecursively(const QString &srcFilePath, const QString &tgtFilePath) const; bool CopyRecursively(const QString &srcFilePath, const QString &tgtFilePath) const;
}; };

2
src/test/ValentinaTest/tst_tapecommandline.cpp
View File

@ -70,7 +70,7 @@ void TST_TapeCommandLine::OpenMeasurements()
QFETCH(QString, file); QFETCH(QString, file);
QFETCH(bool, result); QFETCH(bool, result);
const bool res = Run(TapePath(), QStringList() << "--test" const bool res = Run(result, TapePath(), QStringList() << "--test"
<< QApplication::applicationDirPath() + QLatin1Char('/') + tmpTestFolder + QLatin1Char('/') + file); << QApplication::applicationDirPath() + QLatin1Char('/') + tmpTestFolder + QLatin1Char('/') + file);
QCOMPARE(res, result); QCOMPARE(res, result);