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

Refactoring. More optimized run a test.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-12-16 14:52:00 +02:00
parent e39d42146c
commit 24c6eed4a7
2 changed files with 15 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/test/ValentinaTest/tst_measurementregexp.cpp
View File

@ -65,14 +65,14 @@ void TST_MeasurementRegExp::TestOriginalMeasurementNamesRegExp()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction // cppcheck-suppress unusedFunction
void TST_MeasurementRegExp::TestMeasurementRegExp_data() void TST_MeasurementRegExp::TestVariableStrings_data()
{ {
PrepareMeasurementData(); PrepareMeasurementData();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction // cppcheck-suppress unusedFunction
void TST_MeasurementRegExp::TestMeasurementRegExp() void TST_MeasurementRegExp::TestVariableStrings()
{ {
QFETCH(QString, system); QFETCH(QString, system);
QFETCH(QString, locale); QFETCH(QString, locale);
@ -94,6 +94,7 @@ void TST_MeasurementRegExp::TestMeasurementRegExp()
case NoError: case NoError:
{ {
CheckRegExpNames(); CheckRegExpNames();
CheckIsNamesUnique();
if (not pmsTranslator.isNull()) if (not pmsTranslator.isNull())
{ {
@ -377,56 +378,6 @@ void TST_MeasurementRegExp::TestCorrectOrderMeasurement()
QCOMPARE(name, expect); QCOMPARE(name, expect);
} }
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::TestAllTranslatedMeasurementsIsUnique_data()
{
PrepareMeasurementData();
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::TestAllTranslatedMeasurementsIsUnique()
{
QFETCH(QString, system);
QFETCH(QString, locale);
const int res = LoadTranslation(system, locale);
switch(res)
{
case ErrorInstall:
case ErrorSize:
case ErrorLoad:
{
const QString message = QString("Can't to check translation for system = %1 and locale = %2")
.arg(system)
.arg(locale);
QSKIP(qUtf8Printable(message));
break;
}
case NoError:
{
CheckIsNamesUnique();
if (not pmsTranslator.isNull())
{
const bool result = QCoreApplication::removeTranslator(pmsTranslator);
if (result == false)
{
const QString message = QString("Can't remove translation for system = %1 and locale = %2")
.arg(system)
.arg(locale);
QWARN(qUtf8Printable(message));
}
delete pmsTranslator;
}
break;
}
default:
QWARN("Unexpected state");
}
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::PrepareMeasurementData() void TST_MeasurementRegExp::PrepareMeasurementData()
{ {
@ -532,8 +483,11 @@ void TST_MeasurementRegExp::CheckRegExpNames() const
foreach(const QString &str, originalNames) foreach(const QString &str, originalNames)
{ {
const QString translated = trMs->MToUser(str); const QString translated = trMs->MToUser(str);
const QString message = QString("Original name:'%1', translated name:'%2'").arg(str).arg(translated); if (not re.match(translated).hasMatch())
QVERIFY2(re.match(translated).hasMatch(), qUtf8Printable(message)); {
const QString message = QString("Original name:'%1', translated name:'%2'").arg(str).arg(translated);
QFAIL(qUtf8Printable(message));
}
} }
} }
@ -546,8 +500,11 @@ void TST_MeasurementRegExp::CheckIsNamesUnique() const
foreach(const QString &str, originalNames) foreach(const QString &str, originalNames)
{ {
const QString translated = trMs->MToUser(str); const QString translated = trMs->MToUser(str);
const QString message = QString("Original name:'%1', translated name:'%2'").arg(str).arg(translated); if (names.contains(translated))
QVERIFY2(not names.contains(translated), qUtf8Printable(message)); {
const QString message = QString("Original name:'%1', translated name:'%2'").arg(str).arg(translated);
QFAIL(qUtf8Printable(message));
}
names.insert(translated); names.insert(translated);
} }
} }

6
src/test/ValentinaTest/tst_measurementregexp.h
View File

@ -45,12 +45,10 @@ public:
private slots: private slots:
void TestOriginalMeasurementNamesRegExp(); void TestOriginalMeasurementNamesRegExp();
void TestMeasurementRegExp_data(); void TestVariableStrings_data();
void TestMeasurementRegExp(); void TestVariableStrings();
void TestCorrectOrderMeasurement_data(); void TestCorrectOrderMeasurement_data();
void TestCorrectOrderMeasurement(); void TestCorrectOrderMeasurement();
void TestAllTranslatedMeasurementsIsUnique_data();
void TestAllTranslatedMeasurementsIsUnique();
private: private:
Q_DISABLE_COPY(TST_MeasurementRegExp) Q_DISABLE_COPY(TST_MeasurementRegExp)