Removed messages in non-interactive mode.

This commit is contained in:
NissimHadar 2018-05-24 13:29:02 -07:00
parent 163b72a4ec
commit 802cedf1bc
2 changed files with 5 additions and 5 deletions

View file

@ -71,7 +71,7 @@ bool Test::compareImageLists(bool isInteractiveMode, QProgressBar* progressBar)
QImage resultImage(resultImagesFullFilenames[i]); QImage resultImage(resultImagesFullFilenames[i]);
QImage expectedImage(expectedImagesFullFilenames[i]); QImage expectedImage(expectedImagesFullFilenames[i]);
if (resultImage.width() != expectedImage.width() || resultImage.height() != expectedImage.height()) { if (isInteractiveMode && (resultImage.width() != expectedImage.width() || resultImage.height() != expectedImage.height())) {
QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__), "Images are not the same size"); QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__), "Images are not the same size");
exit(-1); exit(-1);
} }
@ -131,7 +131,7 @@ void Test::appendTestResultsToFile(const QString& testResultsFolderPath, TestFai
exit(-1); exit(-1);
} }
QString failureFolderPath { testResultsFolderPath + "/" + "Failure_" + QString::number(index) }; QString failureFolderPath { testResultsFolderPath + "/" + "Failure_" + QString::number(index) + "--" + testFailure._actualImageFilename.left(testFailure._actualImageFilename.length() - 4) };
if (!QDir().mkdir(failureFolderPath)) { if (!QDir().mkdir(failureFolderPath)) {
QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__), "Failed to create folder " + failureFolderPath); QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__), "Failed to create folder " + failureFolderPath);
exit(-1); exit(-1);
@ -248,7 +248,7 @@ void Test::startTestsEvaluation(const QString& testFolder) {
void Test::finishTestsEvaluation(bool isRunningFromCommandline, bool interactiveMode, QProgressBar* progressBar) { void Test::finishTestsEvaluation(bool isRunningFromCommandline, bool interactiveMode, QProgressBar* progressBar) {
bool success = compareImageLists((!isRunningFromCommandline && interactiveMode), progressBar); bool success = compareImageLists((!isRunningFromCommandline && interactiveMode), progressBar);
if (!isRunningFromCommandline) { if (interactiveMode && !isRunningFromCommandline) {
if (success) { if (success) {
QMessageBox::information(0, "Success", "All images are as expected"); QMessageBox::information(0, "Success", "All images are as expected");
} else { } else {

View file

@ -102,9 +102,9 @@ private:
QStringList resultImagesFullFilenames; QStringList resultImagesFullFilenames;
// Used for accessing GitHub // Used for accessing GitHub
const QString GIT_HUB_USER{ "NissimHadar" }; const QString GIT_HUB_USER{ "highfidelity" };
const QString GIT_HUB_REPOSITORY{ "hifi_tests" }; const QString GIT_HUB_REPOSITORY{ "hifi_tests" };
const QString GIT_HUB_BRANCH{ "newAvatar" }; const QString GIT_HUB_BRANCH{ "master" };
const QString DATETIME_FORMAT{ "yyyy-MM-dd_hh-mm-ss" }; const QString DATETIME_FORMAT{ "yyyy-MM-dd_hh-mm-ss" };