From 2409b1cc8b9f666a0a0a963d4d1085fefbef65da Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 15 Dec 2015 16:38:37 +0200 Subject: [PATCH] Refactoring tests. --HG-- branch : develop --- src/test/ValentinaTest/tst_measurementregexp.cpp | 4 ++-- src/test/ValentinaTest/tst_tstranslation.cpp | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/test/ValentinaTest/tst_measurementregexp.cpp b/src/test/ValentinaTest/tst_measurementregexp.cpp index 5a5ad7ca9..25f289360 100644 --- a/src/test/ValentinaTest/tst_measurementregexp.cpp +++ b/src/test/ValentinaTest/tst_measurementregexp.cpp @@ -85,7 +85,7 @@ void TST_MeasurementRegExp::TestMeasurementRegExp() case ErrorSize: case ErrorLoad: { - const QString message = QString("Failed to check translation for system = %1 and locale = %2") + const QString message = QString("Can't to check translation for system = %1 and locale = %2") .arg(system) .arg(locale); QSKIP(qUtf8Printable(message)); @@ -397,7 +397,7 @@ void TST_MeasurementRegExp::TestAllTranslatedMeasurementsIsUnique() case ErrorSize: case ErrorLoad: { - const QString message = QString("Failed to check translation for system = %1 and locale = %2") + const QString message = QString("Can't to check translation for system = %1 and locale = %2") .arg(system) .arg(locale); QSKIP(qUtf8Printable(message)); diff --git a/src/test/ValentinaTest/tst_tstranslation.cpp b/src/test/ValentinaTest/tst_tstranslation.cpp index 30f36d08b..8015a8b2a 100644 --- a/src/test/ValentinaTest/tst_tstranslation.cpp +++ b/src/test/ValentinaTest/tst_tstranslation.cpp @@ -217,8 +217,9 @@ void TST_TSTranslation::CheckPlaceMarkerExist() ++sourceMarkCount; if (sourceMarkCount != i) { - const QString message = QString("In source string '%1' was missed place marker '%2'.") - .arg(source).arg(QLatin1Literal("%") + QString().setNum(sourceMarkCount)); + const QString message = QString("In source string '%1' was missed place marker ") + .arg(source) + QLatin1Literal("'%") + QString().setNum(sourceMarkCount) + + QLatin1Literal("'."); QFAIL(qUtf8Printable(message)); } } @@ -229,8 +230,9 @@ void TST_TSTranslation::CheckPlaceMarkerExist() ++translationMarkCount; if (translationMarkCount != i) { - const QString message = QString("In translation string '%1' was missed place marker '%2'.") - .arg(translation).arg(QLatin1Literal("%") + QString().setNum(translationMarkCount)); + const QString message = QString("In translation string '%1' was missed place marker ") + .arg(translation) + QLatin1Literal("'%") + QString().setNum(translationMarkCount) + + QLatin1Literal("'."); QFAIL(qUtf8Printable(message)); } } @@ -238,8 +240,9 @@ void TST_TSTranslation::CheckPlaceMarkerExist() if (sourceMark != translationMark) { const QString message = - QString("Compare to source string in translation string '%1' was missed place marker '%2'.") - .arg(translation).arg(marker); + QString("Compare to source string in the translation string '%1' was missed place marker ") + .arg(translation) + QLatin1Literal("'%") + QString().setNum(sourceMarkCount) + + QLatin1Literal("'."); QFAIL(qUtf8Printable(message)); } }