diff --git a/src/app/valentina/core/vcmdexport.cpp b/src/app/valentina/core/vcmdexport.cpp index f74121ac3..ac2a3181f 100644 --- a/src/app/valentina/core/vcmdexport.cpp +++ b/src/app/valentina/core/vcmdexport.cpp @@ -61,7 +61,7 @@ const static auto LONG_OPTION_GRADATIONSIZE = QStringLiteral("gsize"); const static auto SINGLE_OPTION_GRADATIONSIZE = QStringLiteral("x"); const static auto LONG_OPTION_GRADATIONHEIGHT = QStringLiteral("gheight"); -const static auto SINGLE_OPTION_GRADATIONHEIGHT = QStringLiteral("t"); +const static auto SINGLE_OPTION_GRADATIONHEIGHT = QStringLiteral("e"); //such a tricky initialization is used, because it uses static functions which relay on static variables and order of //initialization is not defined between compiled units. i.e. - segv is possible (I hit it when diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index cffd07c6e..2f81c5e57 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -196,7 +196,8 @@ TAPE_TEST_FILES += \ VALENTINA_TEST_FILES += \ tst_valentina/empty.val \ - tst_valentina/issue_372.val + tst_valentina/issue_372.val \ + tst_valentina/wrong_obj_type.val # Compilation will fail without this files after we added them to this section. OTHER_FILES += \ diff --git a/src/test/ValentinaTest/abstracttest.cpp b/src/test/ValentinaTest/abstracttest.cpp index 85a602560..c377009df 100644 --- a/src/test/ValentinaTest/abstracttest.cpp +++ b/src/test/ValentinaTest/abstracttest.cpp @@ -73,7 +73,8 @@ QString AbstractTest::TapePath() const } //--------------------------------------------------------------------------------------------------------------------- -bool AbstractTest::Run(bool showWarn, int &exitCode, const QString &program, const QStringList &arguments, int msecs) +bool AbstractTest::Run(bool showWarn, int exit, int &exitCode, const QString &program, const QStringList &arguments, + int msecs) { const QString parameters = QString("Program: %1 \nArguments: %2.").arg(program).arg(arguments.join(", ")); @@ -109,7 +110,7 @@ bool AbstractTest::Run(bool showWarn, int &exitCode, const QString &program, con if (process->exitCode() != V_EX_OK) { - if (showWarn) + if (showWarn || process->exitCode() != exit) { const QString msg = QString("\n%1").arg(QString(process->readAllStandardError())); QWARN(qUtf8Printable(msg)); diff --git a/src/test/ValentinaTest/abstracttest.h b/src/test/ValentinaTest/abstracttest.h index 078b34745..62d1fd4df 100644 --- a/src/test/ValentinaTest/abstracttest.h +++ b/src/test/ValentinaTest/abstracttest.h @@ -48,7 +48,8 @@ protected: QString ValentinaPath() const; QString TapePath() const; - bool Run(bool showWarn, int &exitCode, const QString &program, const QStringList &arguments, int msecs = 30000); + bool Run(bool showWarn, int exit, int &exitCode, const QString &program, const QStringList &arguments, + int msecs = 30000); bool CopyRecursively(const QString &srcFilePath, const QString &tgtFilePath) const; }; diff --git a/src/test/ValentinaTest/tst_tapecommandline.cpp b/src/test/ValentinaTest/tst_tapecommandline.cpp index fe0d87126..65a000292 100644 --- a/src/test/ValentinaTest/tst_tapecommandline.cpp +++ b/src/test/ValentinaTest/tst_tapecommandline.cpp @@ -112,7 +112,7 @@ void TST_TapeCommandLine::OpenMeasurements() QFETCH(int, exitCode); int exit; - const bool res = Run(result, exit, TapePath(), QStringList() << "--test" + const bool res = Run(result, exitCode, exit, TapePath(), QStringList() << "--test" << QApplication::applicationDirPath() + QLatin1Char('/') + tmpTestFolder + QLatin1Char('/') + file); QCOMPARE(res, result); diff --git a/src/test/ValentinaTest/tst_valentina/wrong_obj_type.val b/src/test/ValentinaTest/tst_valentina/wrong_obj_type.val new file mode 100644 index 000000000..4a57fafa1 --- /dev/null +++ b/src/test/ValentinaTest/tst_valentina/wrong_obj_type.val @@ -0,0 +1,21 @@ + + + + 0.2.0 + cm + + + + measurements.vit + + + + + + + + + +
+ + diff --git a/src/test/ValentinaTest/tst_valentinacommandline.cpp b/src/test/ValentinaTest/tst_valentinacommandline.cpp index def027b89..47b6d26bf 100644 --- a/src/test/ValentinaTest/tst_valentinacommandline.cpp +++ b/src/test/ValentinaTest/tst_valentinacommandline.cpp @@ -71,6 +71,10 @@ void TST_ValentinaCommandLine::OpenPatterns_data() const QTest::newRow("Measurement independent empty file") << "empty.val" << true << V_EX_OK; + + QTest::newRow("File with invalid object type") << "wrong_obj_type.val" + << false + << V_EX_NOINPUT; } //--------------------------------------------------------------------------------------------------------------------- @@ -82,7 +86,7 @@ void TST_ValentinaCommandLine::OpenPatterns() QFETCH(int, exitCode); int exit; - const bool res = Run(result, exit, ValentinaPath(), QStringList() << "--test" + const bool res = Run(result, exitCode, exit, ValentinaPath(), QStringList() << "--test" << QApplication::applicationDirPath() + QLatin1Char('/') + tmpTestFolder + QLatin1Char('/') + file); QCOMPARE(res, result); @@ -119,7 +123,7 @@ void TST_ValentinaCommandLine::ExportMode() const QStringList arg = QStringList() << QApplication::applicationDirPath() + QLatin1Char('/') + tmpTestFolder + QLatin1Char('/') + file << arguments.split(";;"); - const bool res = Run(result, exit, ValentinaPath(), arg); + const bool res = Run(result, exitCode, exit, ValentinaPath(), arg); QCOMPARE(res, result); QCOMPARE(exit, exitCode);