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

Test refactoring. Each fail will not stop checking QM file anymore.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-03 14:49:46 +03:00
parent a2d18c15a4
commit 3676f8eceb
7 changed files with 629 additions and 541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/test/ValentinaTest/qttestmainlambda.cpp
View File

@ -50,6 +50,8 @@
#include "tst_vabstractcurve.h" #include "tst_vabstractcurve.h"
#include "tst_vcubicbezierpath.h" #include "tst_vcubicbezierpath.h"
#include "../vmisc/def.h"
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
Q_INIT_RESOURCE(schema); Q_INIT_RESOURCE(schema);
@ -72,12 +74,27 @@ int main(int argc, char** argv)
ASSERT_TEST(new TST_VLayoutDetail()); ASSERT_TEST(new TST_VLayoutDetail());
ASSERT_TEST(new TST_VArc()); ASSERT_TEST(new TST_VArc());
ASSERT_TEST(new TST_VEllipticalArc()); ASSERT_TEST(new TST_VEllipticalArc());
ASSERT_TEST(new TST_MeasurementRegExp());
{
const QStringList locales = SupportedLocales();
for(quint32 s = 0; s < TST_MeasurementRegExp::systemCounts; ++s)
{
for(int l = 0, sz = locales.size(); l < sz; ++l)
{
ASSERT_TEST(new TST_MeasurementRegExp(s, locales.at(l)));
}
}
for(int l = 0, sz = locales.size(); l < sz; ++l)
{
ASSERT_TEST(new TST_QmuParserErrorMsg(locales.at(l)));
}
}
ASSERT_TEST(new TST_TapeCommandLine()); ASSERT_TEST(new TST_TapeCommandLine());
ASSERT_TEST(new TST_ValentinaCommandLine()); ASSERT_TEST(new TST_ValentinaCommandLine());
ASSERT_TEST(new TST_QmuTokenParser()); ASSERT_TEST(new TST_QmuTokenParser());
ASSERT_TEST(new TST_VMeasurements()); ASSERT_TEST(new TST_VMeasurements());
ASSERT_TEST(new TST_QmuParserErrorMsg());
ASSERT_TEST(new TST_VLockGuard()); ASSERT_TEST(new TST_VLockGuard());
ASSERT_TEST(new TST_Misc()); ASSERT_TEST(new TST_Misc());
ASSERT_TEST(new TST_VCommandLine()); ASSERT_TEST(new TST_VCommandLine());

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

@ -28,7 +28,7 @@
#include "tst_measurementregexp.h" #include "tst_measurementregexp.h"
#include "../qmuparser/qmudef.h" #include "../qmuparser/qmudef.h"
#include "../vmisc/def.h"
#include "../vmisc/logging.h" #include "../vmisc/logging.h"
#include "../vpatterndb/vtranslatevars.h" #include "../vpatterndb/vtranslatevars.h"
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
@ -36,9 +36,14 @@
#include <QtTest> #include <QtTest>
#include <QTranslator> #include <QTranslator>
const quint32 TST_MeasurementRegExp::systemCounts = 56; // count of pattern making systems
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
TST_MeasurementRegExp::TST_MeasurementRegExp(QObject *parent) TST_MeasurementRegExp::TST_MeasurementRegExp(quint32 systemCode, const QString &locale, QObject *parent)
: AbstractTest(parent), : AbstractTest(parent),
m_systemCode(systemCode),
m_system(),
m_locale(locale),
pmsTranslator(nullptr), pmsTranslator(nullptr),
vTranslator(nullptr), vTranslator(nullptr),
trMs(nullptr) trMs(nullptr)
@ -54,333 +59,248 @@ TST_MeasurementRegExp::~TST_MeasurementRegExp()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction void TST_MeasurementRegExp::initTestCase()
void TST_MeasurementRegExp::TestOriginalMeasurementNamesRegExp()
{ {
const QStringList originalNames = AllGroupNames(); if (m_systemCode > systemCounts)
const QRegularExpression re(NameRegExp());
foreach(const QString &str, originalNames)
{ {
QCOMPARE(re.match(str).hasMatch(), true); QFAIL("Unexpected system code.");
} }
m_system = QString("p%1").arg(m_systemCode);
if (m_locale.isEmpty())
{
QFAIL("Empty locale code.");
}
const QStringList locales = SupportedLocales();
if (not locales.contains(m_locale))
{
QFAIL("Unsupported locale code.");
}
TestCombinations(systemCounts, locales);
if (LoadMeasurements(m_system, m_locale) != NoError)
{
const QString message = QString("Couldn't load measurements. System = %1, locale = %2")
.arg(m_system)
.arg(m_locale);
QSKIP(qUtf8Printable(message));
}
if (LoadVariables(m_locale) != NoError)
{
const QString message = QString("Couldn't load variables. System = %1, locale = %2")
.arg(m_system)
.arg(m_locale);
QSKIP(qUtf8Printable(message));
}
InitTrMs();//Very important do this after loading QM files.
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction void TST_MeasurementRegExp::TestCheckNoEndLine_data()
void TST_MeasurementRegExp::TestVariableStrings_data()
{ {
PrepareMeasurementData(); PrepareMeasurementData();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction void TST_MeasurementRegExp::TestCheckNoEndLine()
void TST_MeasurementRegExp::TestVariableStrings()
{ {
QFETCH(QString, system); QFETCH(QString, originalName);
QFETCH(QString, locale);
const int res = LoadTranslation(system, locale); const QString translated = trMs->VarToUser(originalName);
if (translated.endsWith(QLatin1String("\n")))
switch(res)
{ {
case ErrorInstall: const QString message = QString("Translated string '%1' shouldn't contain new line character.")
case ErrorSize: .arg(translated);
case ErrorLoad: QFAIL(qUtf8Printable(message));
{
const QString message = QString("Can't to check translation. System = %1, locale = %2")
.arg(system)
.arg(locale);
QSKIP(qUtf8Printable(message));
break;
}
case NoError:
{
CheckRegExpNames();
CheckIsNamesUnique();
CheckNoOriginalNamesInTranslation();
CheckUnderlineExists();
CheckInternalVaribleRegExp();
RemoveTrMeasurements(system, locale);
RemoveTrVariables(locale);
break;
}
default:
QWARN("Unexpected state");
} }
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction void TST_MeasurementRegExp::TestCheckRegExpNames_data()
void TST_MeasurementRegExp::TestCorrectOrderMeasurement_data()
{ {
PrepareMeasurementData();
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::TestCheckRegExpNames()
{
QFETCH(QString, originalName);
static const QRegularExpression re(NameRegExp());
const QString translated = trMs->VarToUser(originalName);
if (not re.match(translated).hasMatch())
{
const QString message = QString("Original name:'%1', translated name:'%2'").arg(originalName).arg(translated);
QFAIL(qUtf8Printable(message));
}
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::TestCheckIsNamesUnique_data()
{
PrepareMeasurementData();
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::TestCheckIsNamesUnique()
{
QFETCH(QString, originalName);
QSet<QString> names;
const QString translated = trMs->VarToUser(originalName);
if (names.contains(translated))
{
const QString message = QString("Name is not unique. Original name:'%1', translated name:'%2'")
.arg(originalName).arg(translated);
QFAIL(qUtf8Printable(message));
}
names.insert(translated);
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::TestCheckNoOriginalNamesInTranslation_data()
{
PrepareMeasurementData();
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::TestCheckNoOriginalNamesInTranslation()
{
QFETCH(QString, originalName);
static const QStringList originalNames = AllGroupNames() + builInFunctions + builInVariables;
static const QSet<QString> names = QSet<QString>::fromList(originalNames);
const QString translated = trMs->VarToUser(originalName);
if (names.contains(translated))
{
if (originalName != translated)
{
const QString message = QString("Translation repeat original name from other place. "
"Original name:'%1', translated name:'%2'")
.arg(originalName).arg(translated);
QFAIL(qUtf8Printable(message));
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::TestCheckUnderlineExists_data()
{
QMap<QString, bool> data;
data.insert(line_, true);
data.insert(angleLine_, true);
data.insert(arc_, true);
data.insert(spl_, true);
data.insert(splPath, false);
data.insert(radius_V, false);
data.insert(radiusArc_, true);
data.insert(angle1_V, false);
data.insert(angle2_V, false);
data.insert(angle1Arc_, true);
data.insert(angle2Arc_, true);
data.insert(angle1Spl_, true);
data.insert(angle2Spl_, true);
data.insert(angle1SplPath, false);
data.insert(angle2SplPath, false);
data.insert(seg_, true);
data.insert(currentLength, false);
//Catch case when new internal variable appears.
QCOMPARE(data.size(), builInVariables.size());
QTest::addColumn<QString>("name"); QTest::addColumn<QString>("name");
QTest::addColumn<QString>("expect"); QTest::addColumn<bool>("exists");
QTest::newRow("A01") << height_M << "height"; auto i = data.constBegin();
QTest::newRow("A02") << heightNeckBack_M << "height_neck_back"; while (i != data.constEnd())
QTest::newRow("A03") << heightScapula_M << "height_scapula"; {
QTest::newRow("A04") << heightArmpit_M << "height_armpit"; const QString tag = QString("System: '%1', locale: '%2'. Name '%3'").arg(m_system).arg(m_locale).arg(i.key());
QTest::newRow("A05") << heightWaistSide_M << "height_waist_side"; QTest::newRow(qUtf8Printable(tag)) << i.key() << i.value();
QTest::newRow("A06") << heightHip_M << "height_hip"; ++i;
QTest::newRow("A07") << heightGlutealFold_M << "height_gluteal_fold"; }
QTest::newRow("A08") << heightKnee_M << "height_knee";
QTest::newRow("A09") << heightCalf_M << "height_calf";
QTest::newRow("A10") << heightAnkleHigh_M << "height_ankle_high";
QTest::newRow("A11") << heightAnkle_M << "height_ankle";
QTest::newRow("A12") << heightHighhip_M << "height_highhip";
QTest::newRow("A13") << heightWaistFront_M << "height_waist_front";
QTest::newRow("A14") << heightBustpoint_M << "height_bustpoint";
QTest::newRow("A15") << heightShoulderTip_M << "height_shoulder_tip";
QTest::newRow("A16") << heightNeckFront_M << "height_neck_front";
QTest::newRow("A17") << heightNeckSide_M << "height_neck_side";
QTest::newRow("A18") << heightNeckBackToKnee_M << "height_neck_back_to_knee";
QTest::newRow("A19") << heightWaistSideToKnee_M << "height_waist_side_to_knee";
QTest::newRow("A20") << heightWaistSideToHip_M << "height_waist_side_to_hip";
QTest::newRow("A21") << heightKneeToAnkle_M << "height_knee_to_ankle";
QTest::newRow("A22") << heightNeckBackToWaistSide_M << "height_neck_back_to_waist_side";
QTest::newRow("A23") << heightWaistBack_M << "height_waist_back";
QTest::newRow("B01") << widthShoulder_M << "width_shoulder";
QTest::newRow("B02") << widthBust_M << "width_bust";
QTest::newRow("B03") << widthWaist_M << "width_waist";
QTest::newRow("B04") << widthHip_M << "width_hip";
QTest::newRow("B05") << widthAbdomenToHip_M << "width_abdomen_to_hip";
QTest::newRow("C01") << indentNeckBack_M << "indent_neck_back";
QTest::newRow("C02") << indentWaistBack_M << "indent_waist_back";
QTest::newRow("C03") << indentAnkleHigh_M << "indent_ankle_high";
QTest::newRow("D01") << handPalmLength_M << "hand_palm_length";
QTest::newRow("D02") << handLength_M << "hand_length";
QTest::newRow("D03") << handPalmWidth_M << "hand_palm_width";
QTest::newRow("D04") << handPalmCirc_M << "hand_palm_circ";
QTest::newRow("D05") << handCirc_M << "hand_circ";
QTest::newRow("E01") << footWidth_M << "foot_width";
QTest::newRow("E02") << footLength_M << "foot_length";
QTest::newRow("E03") << footCirc_M << "foot_circ";
QTest::newRow("E04") << footInstepCirc_M << "foot_instep_circ";
QTest::newRow("F01") << headCirc_M << "head_circ";
QTest::newRow("F02") << headLength_M << "head_length";
QTest::newRow("F03") << headDepth_M << "head_depth";
QTest::newRow("F04") << headWidth_M << "head_width";
QTest::newRow("F05") << headCrownToNeckBack_M << "head_crown_to_neck_back";
QTest::newRow("F06") << headChinToNeckBack_M << "head_chin_to_neck_back";
QTest::newRow("G01") << neckMidCirc_M << "neck_mid_circ";
QTest::newRow("G02") << neckCirc_M << "neck_circ";
QTest::newRow("G03") << highbustCirc_M << "highbust_circ";
QTest::newRow("G04") << bustCirc_M << "bust_circ";
QTest::newRow("G05") << lowbustCirc_M << "lowbust_circ";
QTest::newRow("G06") << ribCirc_M << "rib_circ";
QTest::newRow("G07") << waistCirc_M << "waist_circ";
QTest::newRow("G08") << highhipCirc_M << "highhip_circ";
QTest::newRow("G09") << hipCirc_M << "hip_circ";
QTest::newRow("G10") << neckArcF_M << "neck_arc_f";
QTest::newRow("G11") << highbustArcF_M << "highbust_arc_f";
QTest::newRow("G12") << bustArcF_M << "bust_arc_f";
QTest::newRow("G13") << lowbustArcF_M << "lowbust_arc_f";
QTest::newRow("G14") << ribArcF_M << "rib_arc_f";
QTest::newRow("G15") << waistArcF_M << "waist_arc_f";
QTest::newRow("G16") << highhipArcF_M << "highhip_arc_f";
QTest::newRow("G17") << hipArcF_M << "hip_arc_f";
QTest::newRow("G18") << neckArcHalfF_M << "neck_arc_half_f";
QTest::newRow("G19") << highbustArcHalfF_M << "highbust_arc_half_f";
QTest::newRow("G20") << bustArcHalfF_M << "bust_arc_half_f";
QTest::newRow("G21") << lowbustArcHalfF_M << "lowbust_arc_half_f";
QTest::newRow("G22") << ribArcHalfF_M << "rib_arc_half_f";
QTest::newRow("G23") << waistArcHalfF_M << "waist_arc_half_f";
QTest::newRow("G24") << highhipArcHalfF_M << "highhip_arc_half_f";
QTest::newRow("G25") << hipArcHalfF_M << "hip_arc_half_f";
QTest::newRow("G26") << neckArcB_M << "neck_arc_b";
QTest::newRow("G27") << highbustArcB_M << "highbust_arc_b";
QTest::newRow("G28") << bustArcB_M << "bust_arc_b";
QTest::newRow("G29") << lowbustArcB_M << "lowbust_arc_b";
QTest::newRow("G30") << ribArcB_M << "rib_arc_b";
QTest::newRow("G31") << waistArcB_M << "waist_arc_b";
QTest::newRow("G32") << highhipArcB_M << "highhip_arc_b";
QTest::newRow("G33") << hipArcB_M << "hip_arc_b";
QTest::newRow("G34") << neckArcHalfB_M << "neck_arc_half_b";
QTest::newRow("G35") << highbustArcHalfB_M << "highbust_arc_half_b";
QTest::newRow("G36") << bustArcHalfB_M << "bust_arc_half_b";
QTest::newRow("G37") << lowbustArcHalfB_M << "lowbust_arc_half_b";
QTest::newRow("G38") << ribArcHalfB_M << "rib_arc_half_b";
QTest::newRow("G39") << waistArcHalfB_M << "waist_arc_half_b";
QTest::newRow("G40") << highhipArcHalfB_M << "highhip_arc_half_b";
QTest::newRow("G41") << hipArcHalfB_M << "hip_arc_half_b";
QTest::newRow("G42") << hipWithAbdomenArcF_M << "hip_with_abdomen_arc_f";
QTest::newRow("G43") << bodyArmfoldCirc_M << "body_armfold_circ";
QTest::newRow("G44") << bodyBustCirc_M << "body_bust_circ";
QTest::newRow("G45") << bodyTorsoCirc_M << "body_torso_circ";
QTest::newRow("G46") << hipCircWithAbdomen_M << "hip_circ_with_abdomen";
QTest::newRow("H01") << neckFrontToWaistF_M << "neck_front_to_waist_f";
QTest::newRow("H02") << neckFrontToWaistFlatF_M << "neck_front_to_waist_flat_f";
QTest::newRow("H03") << armpitToWaistSide_M << "armpit_to_waist_side";
QTest::newRow("H04") << shoulderTipToWaistSideF_M << "shoulder_tip_to_waist_side_f";
QTest::newRow("H05") << neckSideToWaistF_M << "neck_side_to_waist_f";
QTest::newRow("H06") << neckSideToWaistBustpointF_M << "neck_side_to_waist_bustpoint_f";
QTest::newRow("H07") << neckFrontToHighbustF_M << "neck_front_to_highbust_f";
QTest::newRow("H08") << highbustToWaistF_M << "highbust_to_waist_f";
QTest::newRow("H09") << neckFrontToBustF_M << "neck_front_to_bust_f";
QTest::newRow("H10") << bustToWaistF_M << "bust_to_waist_f";
QTest::newRow("H11") << lowbustToWaistF_M << "lowbust_to_waist_f";
QTest::newRow("H12") << ribToWaistSide_M << "rib_to_waist_side";
QTest::newRow("H13") << shoulderTipToArmfoldF_M << "shoulder_tip_to_armfold_f";
QTest::newRow("H14") << neckSideToBustF_M << "neck_side_to_bust_f";
QTest::newRow("H15") << neckSideToHighbustF_M << "neck_side_to_highbust_f";
QTest::newRow("H16") << shoulderCenterToHighbustF_M << "shoulder_center_to_highbust_f";
QTest::newRow("H17") << shoulderTipToWaistSideB_M << "shoulder_tip_to_waist_side_b";
QTest::newRow("H18") << neckSideToWaistB_M << "neck_side_to_waist_b";
QTest::newRow("H19") << neckBackToWaistB_M << "neck_back_to_waist_b";
QTest::newRow("H20") << neckSideToWaistScapulaB_M << "neck_side_to_waist_scapula_b";
QTest::newRow("H21") << neckBackToHighbustB_M << "neck_back_to_highbust_b";
QTest::newRow("H22") << highbustToWaistB_M << "highbust_to_waist_b";
QTest::newRow("H23") << neckBackToBustB_M << "neck_back_to_bust_b";
QTest::newRow("H24") << bustToWaistB_M << "bust_to_waist_b";
QTest::newRow("H25") << lowbustToWaistB_M << "lowbust_to_waist_b";
QTest::newRow("H26") << shoulderTipToArmfoldB_M << "shoulder_tip_to_armfold_b";
QTest::newRow("H27") << neckSideToBustB_M << "neck_side_to_bust_b";
QTest::newRow("H28") << neckSideToHighbustB_M << "neck_side_to_highbust_b";
QTest::newRow("H29") << shoulderCenterToHighbustB_M << "shoulder_center_to_highbust_b";
QTest::newRow("H30") << waistToHighhipF_M << "waist_to_highhip_f";
QTest::newRow("H31") << waistToHipF_M << "waist_to_hip_f";
QTest::newRow("H32") << waistToHighhipSide_M << "waist_to_highhip_side";
QTest::newRow("H33") << waistToHighhipB_M << "waist_to_highhip_b";
QTest::newRow("H34") << waistToHipB_M << "waist_to_hip_b";
QTest::newRow("H35") << waistToHipSide_M << "waist_to_hip_side";
QTest::newRow("H36") << shoulderSlopeNeckSideAngle_M << "shoulder_slope_neck_side_angle";
QTest::newRow("H37") << shoulderSlopeNeckSideLength_M << "shoulder_slope_neck_side_length";
QTest::newRow("H38") << shoulderSlopeNeckBackAngle_M << "shoulder_slope_neck_back_angle";
QTest::newRow("H39") << shoulderSlopeNeckBackHeight_M << "shoulder_slope_neck_back_height";
QTest::newRow("H40") << shoulderSlopeShoulderTipAngle_M << "shoulder_slope_shoulder_tip_angle";
QTest::newRow("H41") << neckBackToAcrossBack_M << "neck_back_to_across_back";
QTest::newRow("H42") << acrossBackToWaistB_M << "across_back_to_waist_b";
QTest::newRow("I01") << shoulderLength_M << "shoulder_length";
QTest::newRow("I02") << shoulderTipToShoulderTipF_M << "shoulder_tip_to_shoulder_tip_f";
QTest::newRow("I03") << acrossChestF_M << "across_chest_f";
QTest::newRow("I04") << armfoldToArmfoldF_M << "armfold_to_armfold_f";
QTest::newRow("I05") << shoulderTipToShoulderTipHalfF_M << "shoulder_tip_to_shoulder_tip_half_f";
QTest::newRow("I06") << acrossChestHalfF_M << "across_chest_half_f";
QTest::newRow("I07") << shoulderTipToShoulderTipB_M << "shoulder_tip_to_shoulder_tip_b";
QTest::newRow("I08") << acrossBackB_M << "across_back_b";
QTest::newRow("I09") << armfoldToArmfoldB_M << "armfold_to_armfold_b";
QTest::newRow("I10") << shoulderTipToShoulderTipHalfB_M << "shoulder_tip_to_shoulder_tip_half_b";
QTest::newRow("I11") << acrossBackHalfB_M << "across_back_half_b";
QTest::newRow("I12") << neckFrontToShoulderTipF_M << "neck_front_to_shoulder_tip_f";
QTest::newRow("I13") << neckBackToShoulderTipB_M << "neck_back_to_shoulder_tip_b";
QTest::newRow("I14") << neckWidth_M << "neck_width";
QTest::newRow("J01") << bustpointToBustpoint_M << "bustpoint_to_bustpoint";
QTest::newRow("J02") << bustpointToNeckSide_M << "bustpoint_to_neck_side";
QTest::newRow("J03") << bustpointToLowbust_M << "bustpoint_to_lowbust";
QTest::newRow("J04") << bustpointToWaist_M << "bustpoint_to_waist";
QTest::newRow("J05") << bustpointToBustpointHalf_M << "bustpoint_to_bustpoint_half";
QTest::newRow("J06") << bustpointNeckSideToWaist_M << "bustpoint_neck_side_to_waist";
QTest::newRow("J07") << bustpointToShoulderTip_M << "bustpoint_to_shoulder_tip";
QTest::newRow("J08") << bustpointToWaistFront_M << "bustpoint_to_waist_front";
QTest::newRow("J09") << bustpointToBustpointHalter_M << "bustpoint_to_bustpoint_halter";
QTest::newRow("J10") << bustpointToShoulderCenter_M << "bustpoint_to_shoulder_center";
QTest::newRow("K01") << shoulderTipToWaistFront_M << "shoulder_tip_to_waist_front";
QTest::newRow("K02") << neckFrontToWaistSide_M << "neck_front_to_waist_side";
QTest::newRow("K03") << neckSideToWaistSideF_M << "neck_side_to_waist_side_f";
QTest::newRow("K04") << shoulderTipToWaistBack_M << "shoulder_tip_to_waist_back";
QTest::newRow("K05") << shoulderTipToWaistB_1inOffset_M << "shoulder_tip_to_waist_b_1in_offset";
QTest::newRow("K06") << neckBackToWaistSide_M << "neck_back_to_waist_side";
QTest::newRow("K07") << neckSideToWaistSideB_M << "neck_side_to_waist_side_b";
QTest::newRow("K08") << neckSideToArmfoldF_M << "neck_side_to_armfold_f";
QTest::newRow("K09") << neckSideToArmpitF_M << "neck_side_to_armpit_f";
QTest::newRow("K10") << neckSideToBustSideF_M << "neck_side_to_bust_side_f";
QTest::newRow("K11") << neckSideToArmfoldB_M << "neck_side_to_armfold_b";
QTest::newRow("K12") << neckSideToArmpitB_M << "neck_side_to_armpit_b";
QTest::newRow("K13") << neckSideToBustSideB_M << "neck_side_to_bust_side_b";
QTest::newRow("L01") << armShoulderTipToWristBent_M << "arm_shoulder_tip_to_wrist_bent";
QTest::newRow("L02") << armShoulderTipToElbowBent_M << "arm_shoulder_tip_to_elbow_bent";
QTest::newRow("L03") << armElbowToWristBent_M << "arm_elbow_to_wrist_bent";
QTest::newRow("L04") << armElbowCircBent_M << "arm_elbow_circ_bent";
QTest::newRow("L05") << armShoulderTipToWrist_M << "arm_shoulder_tip_to_wrist";
QTest::newRow("L06") << armShoulderTipToElbow_M << "arm_shoulder_tip_to_elbow";
QTest::newRow("L07") << armElbowToWrist_M << "arm_elbow_to_wrist";
QTest::newRow("L08") << armArmpitToWrist_M << "arm_armpit_to_wrist";
QTest::newRow("L09") << armArmpitToElbow_M << "arm_armpit_to_elbow";
QTest::newRow("L10") << armElbowToWristInside_M << "arm_elbow_to_wrist_inside";
QTest::newRow("L11") << armUpperCirc_M << "arm_upper_circ";
QTest::newRow("L12") << armAboveElbowCirc_M << "arm_above_elbow_circ";
QTest::newRow("L13") << armElbowCirc_M << "arm_elbow_circ";
QTest::newRow("L14") << armLowerCirc_M << "arm_lower_circ";
QTest::newRow("L15") << armWristCirc_M << "arm_wrist_circ";
QTest::newRow("L16") << armShoulderTipToArmfoldLine_M << "arm_shoulder_tip_to_armfold_line";
QTest::newRow("L17") << armNeckSideToWrist_M << "arm_neck_side_to_wrist";
QTest::newRow("L18") << armNeckSideToFingerTip_M << "arm_neck_side_to_finger_tip";
QTest::newRow("L19") << armscyeCirc_M << "armscye_circ";
QTest::newRow("L20") << armscyeLength_M << "armscye_length";
QTest::newRow("L21") << armscyeWidth_M << "armscye_width";
QTest::newRow("L22") << armNeckSideToOuterElbow_M << "arm_neck_side_to_outer_elbow";
QTest::newRow("M01") << legCrotchToFloor_M << "leg_crotch_to_floor";
QTest::newRow("M02") << legWaistSideToFloor_M << "leg_waist_side_to_floor";
QTest::newRow("M03") << legThighUpperCirc_M << "leg_thigh_upper_circ";
QTest::newRow("M04") << legThighMidCirc_M << "leg_thigh_mid_circ";
QTest::newRow("M05") << legKneeCirc_M << "leg_knee_circ";
QTest::newRow("M06") << legKneeSmallCirc_M << "leg_knee_small_circ";
QTest::newRow("M07") << legCalfCirc_M << "leg_calf_circ";
QTest::newRow("M08") << legAnkleHighCirc_M << "leg_ankle_high_circ";
QTest::newRow("M09") << legAnkleCirc_M << "leg_ankle_circ";
QTest::newRow("M10") << legKneeCircBent_M << "leg_knee_circ_bent";
QTest::newRow("M11") << legAnkleDiagCirc_M << "leg_ankle_diag_circ";
QTest::newRow("M12") << legCrotchToAnkle_M << "leg_crotch_to_ankle";
QTest::newRow("M13") << legWaistSideToAnkle_M << "leg_waist_side_to_ankle";
QTest::newRow("M14") << legWaistSideToKnee_M << "leg_waist_side_to_knee";
QTest::newRow("N01") << crotchLength_M << "crotch_length";
QTest::newRow("N02") << crotchLengthB_M << "crotch_length_b";
QTest::newRow("N03") << crotchLengthF_M << "crotch_length_f";
QTest::newRow("N04") << riseLengthSideSitting_M << "rise_length_side_sitting";
QTest::newRow("N05") << riseLengthDiag_M << "rise_length_diag";
QTest::newRow("N06") << riseLengthB_M << "rise_length_b";
QTest::newRow("N07") << riseLengthF_M << "rise_length_f";
QTest::newRow("N08") << riseLengthSide_M << "rise_length_side";
QTest::newRow("O01") << neckBackToWaistFront_M << "neck_back_to_waist_front";
QTest::newRow("O02") << waistToWaistHalter_M << "waist_to_waist_halter";
QTest::newRow("O03") << waistNaturalCirc_M << "waist_natural_circ";
QTest::newRow("O04") << waistNaturalArcF_M << "waist_natural_arc_f";
QTest::newRow("O05") << waistNaturalArcB_M << "waist_natural_arc_b";
QTest::newRow("O06") << waistToNaturalWaistF_M << "waist_to_natural_waist_f";
QTest::newRow("O07") << waistToNaturalWaistB_M << "waist_to_natural_waist_b";
QTest::newRow("O08") << armNeckBackToElbowBent_M << "arm_neck_back_to_elbow_bent";
QTest::newRow("O09") << armNeckBackToWristBent_M << "arm_neck_back_to_wrist_bent";
QTest::newRow("O10") << armNeckSideToElbowBent_M << "arm_neck_side_to_elbow_bent";
QTest::newRow("O11") << armNeckSideToWristBent_M << "arm_neck_side_to_wrist_bent";
QTest::newRow("O12") << armAcrossBackCenterToElbowBent_M << "arm_across_back_center_to_elbow_bent";
QTest::newRow("O13") << armAcrossBackCenterToWristBent_M << "arm_across_back_center_to_wrist_bent";
QTest::newRow("O14") << armArmscyeBackCenterToWristBent_M << "arm_armscye_back_center_to_wrist_bent";
QTest::newRow("P01") << neckBackToBustFront_M << "neck_back_to_bust_front";
QTest::newRow("P02") << neckBackToArmfoldFront_M << "neck_back_to_armfold_front";
QTest::newRow("P03") << neckBackToArmfoldFrontToWaistSide_M << "neck_back_to_armfold_front_to_waist_side";
QTest::newRow("P04") << highbustBackOverShoulderToArmfoldFront_M << "highbust_back_over_shoulder_to_armfold_front";
QTest::newRow("P05") << highbustBackOverShoulderToWaistFront_M << "highbust_back_over_shoulder_to_waist_front";
QTest::newRow("P06") << neckBackToArmfoldFrontToNeckBack_M << "neck_back_to_armfold_front_to_neck_back";
QTest::newRow("P07") << acrossBackCenterToArmfoldFrontToAcrossBackCenter_M
<< "across_back_center_to_armfold_front_to_across_back_center";
QTest::newRow("P08") << neckBackToArmfoldFrontToHighbustBack_M << "neck_back_to_armfold_front_to_highbust_back";
QTest::newRow("P09") << armfoldToArmfoldBust_M << "armfold_to_armfold_bust";
QTest::newRow("P10") << armfoldToBustFront_M << "armfold_to_bust_front";
QTest::newRow("P11") << highbustBOverShoulderToHighbustF_M << "highbust_b_over_shoulder_to_highbust_f";
QTest::newRow("P12") << armscyeArc_M << "armscye_arc";
QTest::newRow("Q01") << dartWidthShoulder_M << "dart_width_shoulder";
QTest::newRow("Q02") << dartWidthBust_M << "dart_width_bust";
QTest::newRow("Q03") << dartWidthWaist_M << "dart_width_waist";
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction void TST_MeasurementRegExp::TestCheckUnderlineExists()
void TST_MeasurementRegExp::TestCorrectOrderMeasurement()
{ {
QFETCH(QString, name); QFETCH(QString, name);
QFETCH(QString, expect); QFETCH(bool, exists);
QCOMPARE(name, expect); const QString translated = trMs->InternalVarToUser(name);
if ((translated.right(1) == QLatin1String("_")) != exists)
{
const QString message = QString("String '%1' doesn't contain underline. Original string is '%2'")
.arg(translated).arg(name);
QFAIL(qUtf8Printable(message));
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::PrepareMeasurementData() void TST_MeasurementRegExp::TestCheckInternalVaribleRegExp_data()
{ {
const int systemCounts = 56; QTest::addColumn<QString>("var");
const QStringList locales = SupportedLocales(); QTest::addColumn<QString>("originalName");
foreach(const QString &var, builInVariables)
{
const QString tag = QString("System: '%1', locale: '%2'. Var '%3'").arg(m_system).arg(m_locale).arg(var);
const QStringList originalNames = AllGroupNames() + builInFunctions + builInVariables;
foreach(const QString &str, originalNames)
{
QTest::newRow(qUtf8Printable(tag)) << var << str;
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::TestCheckInternalVaribleRegExp()
{
QFETCH(QString, var);
QFETCH(QString, originalName);
static const QString regex = QStringLiteral("(.){1,}_(.){1,}$");
const QString sourceRegex = QLatin1String("^") + var + regex;
const QRegularExpression sourceRe(sourceRegex);
const QString translated = trMs->InternalVarToUser(var);
const QString translationRegex = QLatin1String("^") + translated + regex;
const QRegularExpression translationRe(translationRegex);
{
if (sourceRe.match(originalName).hasMatch() || translationRe.match(originalName).hasMatch())
{
const QString message = QString("Invalid original string '%1'").arg(originalName);
QFAIL(qUtf8Printable(message));
}
const QString translated = trMs->VarToUser(originalName);
if (sourceRe.match(translated).hasMatch() || translationRe.match(translated).hasMatch())
{
const QString message = QString("Invalid translation string '%1'").arg(translated);
QFAIL(qUtf8Printable(message));
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::cleanupTestCase()
{
RemoveTrMeasurements(m_system, m_locale);
RemoveTrVariables(m_locale);
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::TestCombinations(int systemCounts, const QStringList &locales) const
{ {
const int combinations = systemCounts * locales.size(); const int combinations = systemCounts * locales.size();
@ -390,39 +310,18 @@ void TST_MeasurementRegExp::PrepareMeasurementData()
QVERIFY2(combinations == fileNames.size(), "Unexpected count of files."); QVERIFY2(combinations == fileNames.size(), "Unexpected count of files.");
} }
QTest::addColumn<QString>("system");
QTest::addColumn<QString>("locale");
for(int s = 0; s < systemCounts; ++s)
{
for(int l = 0, sz = locales.size(); l < sz; ++l)
{
const QString system = QString("p%1").arg(s);
const QString locale = locales.at(l);
const QString tag = QString("Check translation system %1, locale %2").arg(system).arg(locale);
QTest::newRow(qUtf8Printable(tag)) << system << locale;
}
}
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
int TST_MeasurementRegExp::LoadTranslation(const QString &checkedSystem, const QString &checkedLocale) void TST_MeasurementRegExp::PrepareMeasurementData()
{ {
int state = LoadMeasurements(checkedSystem, checkedLocale); static const QStringList originalNames = AllGroupNames() + builInFunctions + builInVariables;
if (state != NoError)
QTest::addColumn<QString>("originalName");
foreach(const QString &str, originalNames)
{ {
return state; const QString tag = QString("System: '%1', locale: '%2'. Name '%3'").arg(m_system).arg(m_locale).arg(str);
QTest::newRow(qUtf8Printable(tag)) << str;
} }
state = LoadVariables(checkedLocale);
if (state != NoError)
{
return state;
}
InitTrMs();//Very important do this after loading QM files.
return NoError;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -443,6 +342,7 @@ int TST_MeasurementRegExp::LoadMeasurements(const QString &checkedSystem, const
return ErrorSize; return ErrorSize;
} }
delete pmsTranslator;
pmsTranslator = new QTranslator(this); pmsTranslator = new QTranslator(this);
if (not pmsTranslator->load(file, path)) if (not pmsTranslator->load(file, path))
@ -571,133 +471,3 @@ void TST_MeasurementRegExp::InitTrMs()
trMs = new VTranslateVars(); trMs = new VTranslateVars();
} }
} }
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::CheckRegExpNames() const
{
const QStringList originalNames = AllGroupNames() + builInFunctions + builInVariables;
const QRegularExpression re(NameRegExp());
foreach(const QString &str, originalNames)
{
const QString translated = trMs->VarToUser(str);
if (not re.match(translated).hasMatch())
{
const QString message = QString("Original name:'%1', translated name:'%2'").arg(str).arg(translated);
QFAIL(qUtf8Printable(message));
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::CheckIsNamesUnique() const
{
const QStringList originalNames = AllGroupNames() + builInFunctions + builInVariables;
QSet<QString> names;
foreach(const QString &str, originalNames)
{
const QString translated = trMs->VarToUser(str);
if (names.contains(translated))
{
const QString message = QString("Name is not unique. Original name:'%1', translated name:'%2'")
.arg(str).arg(translated);
QFAIL(qUtf8Printable(message));
}
names.insert(translated);
}
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::CheckNoOriginalNamesInTranslation() const
{
const QStringList originalNames = AllGroupNames() + builInFunctions + builInVariables;
QSet<QString> names = QSet<QString>::fromList(originalNames);
foreach(const QString &str, originalNames)
{
const QString translated = trMs->VarToUser(str);
if (names.contains(translated))
{
if (str != translated)
{
const QString message = QString("Translation repeat original name from other place. "
"Original name:'%1', translated name:'%2'")
.arg(str).arg(translated);
QFAIL(qUtf8Printable(message));
}
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::CheckUnderlineExists() const
{
QMap<QString, bool> data;
data.insert(line_, true);
data.insert(angleLine_, true);
data.insert(arc_, true);
data.insert(spl_, true);
data.insert(splPath, false);
data.insert(radius_V, false);
data.insert(radiusArc_, true);
data.insert(angle1_V, false);
data.insert(angle2_V, false);
data.insert(angle1Arc_, true);
data.insert(angle2Arc_, true);
data.insert(angle1Spl_, true);
data.insert(angle2Spl_, true);
data.insert(angle1SplPath, false);
data.insert(angle2SplPath, false);
data.insert(seg_, true);
data.insert(currentLength, false);
//Catch case when new internal variable appears.
QCOMPARE(data.size(), builInVariables.size());
auto i = data.constBegin();
while (i != data.constEnd())
{
const QString translated = trMs->InternalVarToUser(i.key());
if ((translated.right(1) == QLatin1String("_")) != i.value())
{
const QString message = QString("String '%1' doesn't contain underline. Original string is '%2'")
.arg(translated).arg(i.key());
QFAIL(qUtf8Printable(message));
}
++i;
}
}
//---------------------------------------------------------------------------------------------------------------------
void TST_MeasurementRegExp::CheckInternalVaribleRegExp() const
{
const QString regex = QStringLiteral("(.){1,}_(.){1,}$");
foreach(const QString &var, builInVariables)
{
const QString sourceRegex = QLatin1String("^") + var + regex;
const QRegularExpression sourceRe(sourceRegex);
const QString translated = trMs->InternalVarToUser(var);
const QString translationRegex = QLatin1String("^") + translated + regex;
const QRegularExpression translationRe(translationRegex);
const QStringList originalNames = AllGroupNames() + builInFunctions + builInVariables;
foreach(const QString &str, originalNames)
{
if (sourceRe.match(str).hasMatch() || translationRe.match(str).hasMatch())
{
const QString message = QString("Invalid original string '%1'").arg(str);
QFAIL(qUtf8Printable(message));
}
const QString translated = trMs->VarToUser(str);
if (sourceRe.match(translated).hasMatch() || translationRe.match(translated).hasMatch())
{
const QString message = QString("Invalid translation string '%1'").arg(translated);
QFAIL(qUtf8Printable(message));
}
}
}
}

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

@ -40,26 +40,40 @@ class TST_MeasurementRegExp : public AbstractTest
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit TST_MeasurementRegExp(QObject *parent = nullptr); TST_MeasurementRegExp(quint32 systemCode, const QString &locale, QObject *parent = nullptr);
virtual ~TST_MeasurementRegExp() Q_DECL_OVERRIDE; virtual ~TST_MeasurementRegExp() Q_DECL_OVERRIDE;
static const quint32 systemCounts;
private slots: private slots:
void TestOriginalMeasurementNamesRegExp(); void initTestCase();
void TestVariableStrings_data(); void TestCheckNoEndLine_data();
void TestVariableStrings(); void TestCheckNoEndLine();
void TestCorrectOrderMeasurement_data(); void TestCheckRegExpNames_data();
void TestCorrectOrderMeasurement(); void TestCheckRegExpNames();
void TestCheckIsNamesUnique_data();
void TestCheckIsNamesUnique();
void TestCheckNoOriginalNamesInTranslation_data();
void TestCheckNoOriginalNamesInTranslation();
void TestCheckUnderlineExists_data();
void TestCheckUnderlineExists();
void TestCheckInternalVaribleRegExp_data();
void TestCheckInternalVaribleRegExp();
void cleanupTestCase();
private: private:
Q_DISABLE_COPY(TST_MeasurementRegExp) Q_DISABLE_COPY(TST_MeasurementRegExp)
quint32 m_systemCode;
QString m_system;
QString m_locale;
QPointer<QTranslator> pmsTranslator; QPointer<QTranslator> pmsTranslator;
QPointer<QTranslator> vTranslator; QPointer<QTranslator> vTranslator;
VTranslateVars *trMs; VTranslateVars *trMs;
void TestCombinations(int systemCounts, const QStringList &locales) const;
void PrepareMeasurementData(); void PrepareMeasurementData();
int LoadTranslation(const QString &checkedSystem, const QString &checkedLocale);
int LoadMeasurements(const QString &checkedSystem, const QString &checkedLocale); int LoadMeasurements(const QString &checkedSystem, const QString &checkedLocale);
int LoadVariables(const QString &checkedLocale); int LoadVariables(const QString &checkedLocale);
@ -67,11 +81,6 @@ private:
void RemoveTrVariables(const QString &checkedLocale); void RemoveTrVariables(const QString &checkedLocale);
void InitTrMs(); void InitTrMs();
void CheckRegExpNames() const;
void CheckIsNamesUnique() const;
void CheckNoOriginalNamesInTranslation() const;
void CheckUnderlineExists() const;
void CheckInternalVaribleRegExp() const;
}; };
#endif // TST_MEASUREMENTREGEXP_H #endif // TST_MEASUREMENTREGEXP_H

289
src/test/ValentinaTest/tst_nameregexp.cpp
View File

@ -28,6 +28,8 @@
#include "tst_nameregexp.h" #include "tst_nameregexp.h"
#include "../qmuparser/qmudef.h" #include "../qmuparser/qmudef.h"
#include "../vmisc/def.h"
#include "../vmisc/logging.h"
#include <QtTest> #include <QtTest>
@ -108,3 +110,290 @@ void TST_NameRegExp::TestNameRegExp()
QCOMPARE(re.match(name).hasMatch(), result); QCOMPARE(re.match(name).hasMatch(), result);
} }
//---------------------------------------------------------------------------------------------------------------------
void TST_NameRegExp::TestOriginalMeasurementNamesRegExp_data()
{
QTest::addColumn<QString>("str");
const QStringList originalNames = AllGroupNames();
foreach(const QString &str, originalNames)
{
const QString name = QString("Measurement '%1'").arg(str);
QTest::newRow(qUtf8Printable(name)) << str;
}
}
//---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction
void TST_NameRegExp::TestOriginalMeasurementNamesRegExp()
{
QFETCH(QString, str);
static const QRegularExpression re(NameRegExp());
QCOMPARE(re.match(str).hasMatch(), true);
}
//---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction
void TST_NameRegExp::TestCorrectOrderMeasurement_data()
{
QTest::addColumn<QString>("name");
QTest::addColumn<QString>("expect");
QTest::newRow("A01") << height_M << "height";
QTest::newRow("A02") << heightNeckBack_M << "height_neck_back";
QTest::newRow("A03") << heightScapula_M << "height_scapula";
QTest::newRow("A04") << heightArmpit_M << "height_armpit";
QTest::newRow("A05") << heightWaistSide_M << "height_waist_side";
QTest::newRow("A06") << heightHip_M << "height_hip";
QTest::newRow("A07") << heightGlutealFold_M << "height_gluteal_fold";
QTest::newRow("A08") << heightKnee_M << "height_knee";
QTest::newRow("A09") << heightCalf_M << "height_calf";
QTest::newRow("A10") << heightAnkleHigh_M << "height_ankle_high";
QTest::newRow("A11") << heightAnkle_M << "height_ankle";
QTest::newRow("A12") << heightHighhip_M << "height_highhip";
QTest::newRow("A13") << heightWaistFront_M << "height_waist_front";
QTest::newRow("A14") << heightBustpoint_M << "height_bustpoint";
QTest::newRow("A15") << heightShoulderTip_M << "height_shoulder_tip";
QTest::newRow("A16") << heightNeckFront_M << "height_neck_front";
QTest::newRow("A17") << heightNeckSide_M << "height_neck_side";
QTest::newRow("A18") << heightNeckBackToKnee_M << "height_neck_back_to_knee";
QTest::newRow("A19") << heightWaistSideToKnee_M << "height_waist_side_to_knee";
QTest::newRow("A20") << heightWaistSideToHip_M << "height_waist_side_to_hip";
QTest::newRow("A21") << heightKneeToAnkle_M << "height_knee_to_ankle";
QTest::newRow("A22") << heightNeckBackToWaistSide_M << "height_neck_back_to_waist_side";
QTest::newRow("A23") << heightWaistBack_M << "height_waist_back";
QTest::newRow("B01") << widthShoulder_M << "width_shoulder";
QTest::newRow("B02") << widthBust_M << "width_bust";
QTest::newRow("B03") << widthWaist_M << "width_waist";
QTest::newRow("B04") << widthHip_M << "width_hip";
QTest::newRow("B05") << widthAbdomenToHip_M << "width_abdomen_to_hip";
QTest::newRow("C01") << indentNeckBack_M << "indent_neck_back";
QTest::newRow("C02") << indentWaistBack_M << "indent_waist_back";
QTest::newRow("C03") << indentAnkleHigh_M << "indent_ankle_high";
QTest::newRow("D01") << handPalmLength_M << "hand_palm_length";
QTest::newRow("D02") << handLength_M << "hand_length";
QTest::newRow("D03") << handPalmWidth_M << "hand_palm_width";
QTest::newRow("D04") << handPalmCirc_M << "hand_palm_circ";
QTest::newRow("D05") << handCirc_M << "hand_circ";
QTest::newRow("E01") << footWidth_M << "foot_width";
QTest::newRow("E02") << footLength_M << "foot_length";
QTest::newRow("E03") << footCirc_M << "foot_circ";
QTest::newRow("E04") << footInstepCirc_M << "foot_instep_circ";
QTest::newRow("F01") << headCirc_M << "head_circ";
QTest::newRow("F02") << headLength_M << "head_length";
QTest::newRow("F03") << headDepth_M << "head_depth";
QTest::newRow("F04") << headWidth_M << "head_width";
QTest::newRow("F05") << headCrownToNeckBack_M << "head_crown_to_neck_back";
QTest::newRow("F06") << headChinToNeckBack_M << "head_chin_to_neck_back";
QTest::newRow("G01") << neckMidCirc_M << "neck_mid_circ";
QTest::newRow("G02") << neckCirc_M << "neck_circ";
QTest::newRow("G03") << highbustCirc_M << "highbust_circ";
QTest::newRow("G04") << bustCirc_M << "bust_circ";
QTest::newRow("G05") << lowbustCirc_M << "lowbust_circ";
QTest::newRow("G06") << ribCirc_M << "rib_circ";
QTest::newRow("G07") << waistCirc_M << "waist_circ";
QTest::newRow("G08") << highhipCirc_M << "highhip_circ";
QTest::newRow("G09") << hipCirc_M << "hip_circ";
QTest::newRow("G10") << neckArcF_M << "neck_arc_f";
QTest::newRow("G11") << highbustArcF_M << "highbust_arc_f";
QTest::newRow("G12") << bustArcF_M << "bust_arc_f";
QTest::newRow("G13") << lowbustArcF_M << "lowbust_arc_f";
QTest::newRow("G14") << ribArcF_M << "rib_arc_f";
QTest::newRow("G15") << waistArcF_M << "waist_arc_f";
QTest::newRow("G16") << highhipArcF_M << "highhip_arc_f";
QTest::newRow("G17") << hipArcF_M << "hip_arc_f";
QTest::newRow("G18") << neckArcHalfF_M << "neck_arc_half_f";
QTest::newRow("G19") << highbustArcHalfF_M << "highbust_arc_half_f";
QTest::newRow("G20") << bustArcHalfF_M << "bust_arc_half_f";
QTest::newRow("G21") << lowbustArcHalfF_M << "lowbust_arc_half_f";
QTest::newRow("G22") << ribArcHalfF_M << "rib_arc_half_f";
QTest::newRow("G23") << waistArcHalfF_M << "waist_arc_half_f";
QTest::newRow("G24") << highhipArcHalfF_M << "highhip_arc_half_f";
QTest::newRow("G25") << hipArcHalfF_M << "hip_arc_half_f";
QTest::newRow("G26") << neckArcB_M << "neck_arc_b";
QTest::newRow("G27") << highbustArcB_M << "highbust_arc_b";
QTest::newRow("G28") << bustArcB_M << "bust_arc_b";
QTest::newRow("G29") << lowbustArcB_M << "lowbust_arc_b";
QTest::newRow("G30") << ribArcB_M << "rib_arc_b";
QTest::newRow("G31") << waistArcB_M << "waist_arc_b";
QTest::newRow("G32") << highhipArcB_M << "highhip_arc_b";
QTest::newRow("G33") << hipArcB_M << "hip_arc_b";
QTest::newRow("G34") << neckArcHalfB_M << "neck_arc_half_b";
QTest::newRow("G35") << highbustArcHalfB_M << "highbust_arc_half_b";
QTest::newRow("G36") << bustArcHalfB_M << "bust_arc_half_b";
QTest::newRow("G37") << lowbustArcHalfB_M << "lowbust_arc_half_b";
QTest::newRow("G38") << ribArcHalfB_M << "rib_arc_half_b";
QTest::newRow("G39") << waistArcHalfB_M << "waist_arc_half_b";
QTest::newRow("G40") << highhipArcHalfB_M << "highhip_arc_half_b";
QTest::newRow("G41") << hipArcHalfB_M << "hip_arc_half_b";
QTest::newRow("G42") << hipWithAbdomenArcF_M << "hip_with_abdomen_arc_f";
QTest::newRow("G43") << bodyArmfoldCirc_M << "body_armfold_circ";
QTest::newRow("G44") << bodyBustCirc_M << "body_bust_circ";
QTest::newRow("G45") << bodyTorsoCirc_M << "body_torso_circ";
QTest::newRow("G46") << hipCircWithAbdomen_M << "hip_circ_with_abdomen";
QTest::newRow("H01") << neckFrontToWaistF_M << "neck_front_to_waist_f";
QTest::newRow("H02") << neckFrontToWaistFlatF_M << "neck_front_to_waist_flat_f";
QTest::newRow("H03") << armpitToWaistSide_M << "armpit_to_waist_side";
QTest::newRow("H04") << shoulderTipToWaistSideF_M << "shoulder_tip_to_waist_side_f";
QTest::newRow("H05") << neckSideToWaistF_M << "neck_side_to_waist_f";
QTest::newRow("H06") << neckSideToWaistBustpointF_M << "neck_side_to_waist_bustpoint_f";
QTest::newRow("H07") << neckFrontToHighbustF_M << "neck_front_to_highbust_f";
QTest::newRow("H08") << highbustToWaistF_M << "highbust_to_waist_f";
QTest::newRow("H09") << neckFrontToBustF_M << "neck_front_to_bust_f";
QTest::newRow("H10") << bustToWaistF_M << "bust_to_waist_f";
QTest::newRow("H11") << lowbustToWaistF_M << "lowbust_to_waist_f";
QTest::newRow("H12") << ribToWaistSide_M << "rib_to_waist_side";
QTest::newRow("H13") << shoulderTipToArmfoldF_M << "shoulder_tip_to_armfold_f";
QTest::newRow("H14") << neckSideToBustF_M << "neck_side_to_bust_f";
QTest::newRow("H15") << neckSideToHighbustF_M << "neck_side_to_highbust_f";
QTest::newRow("H16") << shoulderCenterToHighbustF_M << "shoulder_center_to_highbust_f";
QTest::newRow("H17") << shoulderTipToWaistSideB_M << "shoulder_tip_to_waist_side_b";
QTest::newRow("H18") << neckSideToWaistB_M << "neck_side_to_waist_b";
QTest::newRow("H19") << neckBackToWaistB_M << "neck_back_to_waist_b";
QTest::newRow("H20") << neckSideToWaistScapulaB_M << "neck_side_to_waist_scapula_b";
QTest::newRow("H21") << neckBackToHighbustB_M << "neck_back_to_highbust_b";
QTest::newRow("H22") << highbustToWaistB_M << "highbust_to_waist_b";
QTest::newRow("H23") << neckBackToBustB_M << "neck_back_to_bust_b";
QTest::newRow("H24") << bustToWaistB_M << "bust_to_waist_b";
QTest::newRow("H25") << lowbustToWaistB_M << "lowbust_to_waist_b";
QTest::newRow("H26") << shoulderTipToArmfoldB_M << "shoulder_tip_to_armfold_b";
QTest::newRow("H27") << neckSideToBustB_M << "neck_side_to_bust_b";
QTest::newRow("H28") << neckSideToHighbustB_M << "neck_side_to_highbust_b";
QTest::newRow("H29") << shoulderCenterToHighbustB_M << "shoulder_center_to_highbust_b";
QTest::newRow("H30") << waistToHighhipF_M << "waist_to_highhip_f";
QTest::newRow("H31") << waistToHipF_M << "waist_to_hip_f";
QTest::newRow("H32") << waistToHighhipSide_M << "waist_to_highhip_side";
QTest::newRow("H33") << waistToHighhipB_M << "waist_to_highhip_b";
QTest::newRow("H34") << waistToHipB_M << "waist_to_hip_b";
QTest::newRow("H35") << waistToHipSide_M << "waist_to_hip_side";
QTest::newRow("H36") << shoulderSlopeNeckSideAngle_M << "shoulder_slope_neck_side_angle";
QTest::newRow("H37") << shoulderSlopeNeckSideLength_M << "shoulder_slope_neck_side_length";
QTest::newRow("H38") << shoulderSlopeNeckBackAngle_M << "shoulder_slope_neck_back_angle";
QTest::newRow("H39") << shoulderSlopeNeckBackHeight_M << "shoulder_slope_neck_back_height";
QTest::newRow("H40") << shoulderSlopeShoulderTipAngle_M << "shoulder_slope_shoulder_tip_angle";
QTest::newRow("H41") << neckBackToAcrossBack_M << "neck_back_to_across_back";
QTest::newRow("H42") << acrossBackToWaistB_M << "across_back_to_waist_b";
QTest::newRow("I01") << shoulderLength_M << "shoulder_length";
QTest::newRow("I02") << shoulderTipToShoulderTipF_M << "shoulder_tip_to_shoulder_tip_f";
QTest::newRow("I03") << acrossChestF_M << "across_chest_f";
QTest::newRow("I04") << armfoldToArmfoldF_M << "armfold_to_armfold_f";
QTest::newRow("I05") << shoulderTipToShoulderTipHalfF_M << "shoulder_tip_to_shoulder_tip_half_f";
QTest::newRow("I06") << acrossChestHalfF_M << "across_chest_half_f";
QTest::newRow("I07") << shoulderTipToShoulderTipB_M << "shoulder_tip_to_shoulder_tip_b";
QTest::newRow("I08") << acrossBackB_M << "across_back_b";
QTest::newRow("I09") << armfoldToArmfoldB_M << "armfold_to_armfold_b";
QTest::newRow("I10") << shoulderTipToShoulderTipHalfB_M << "shoulder_tip_to_shoulder_tip_half_b";
QTest::newRow("I11") << acrossBackHalfB_M << "across_back_half_b";
QTest::newRow("I12") << neckFrontToShoulderTipF_M << "neck_front_to_shoulder_tip_f";
QTest::newRow("I13") << neckBackToShoulderTipB_M << "neck_back_to_shoulder_tip_b";
QTest::newRow("I14") << neckWidth_M << "neck_width";
QTest::newRow("J01") << bustpointToBustpoint_M << "bustpoint_to_bustpoint";
QTest::newRow("J02") << bustpointToNeckSide_M << "bustpoint_to_neck_side";
QTest::newRow("J03") << bustpointToLowbust_M << "bustpoint_to_lowbust";
QTest::newRow("J04") << bustpointToWaist_M << "bustpoint_to_waist";
QTest::newRow("J05") << bustpointToBustpointHalf_M << "bustpoint_to_bustpoint_half";
QTest::newRow("J06") << bustpointNeckSideToWaist_M << "bustpoint_neck_side_to_waist";
QTest::newRow("J07") << bustpointToShoulderTip_M << "bustpoint_to_shoulder_tip";
QTest::newRow("J08") << bustpointToWaistFront_M << "bustpoint_to_waist_front";
QTest::newRow("J09") << bustpointToBustpointHalter_M << "bustpoint_to_bustpoint_halter";
QTest::newRow("J10") << bustpointToShoulderCenter_M << "bustpoint_to_shoulder_center";
QTest::newRow("K01") << shoulderTipToWaistFront_M << "shoulder_tip_to_waist_front";
QTest::newRow("K02") << neckFrontToWaistSide_M << "neck_front_to_waist_side";
QTest::newRow("K03") << neckSideToWaistSideF_M << "neck_side_to_waist_side_f";
QTest::newRow("K04") << shoulderTipToWaistBack_M << "shoulder_tip_to_waist_back";
QTest::newRow("K05") << shoulderTipToWaistB_1inOffset_M << "shoulder_tip_to_waist_b_1in_offset";
QTest::newRow("K06") << neckBackToWaistSide_M << "neck_back_to_waist_side";
QTest::newRow("K07") << neckSideToWaistSideB_M << "neck_side_to_waist_side_b";
QTest::newRow("K08") << neckSideToArmfoldF_M << "neck_side_to_armfold_f";
QTest::newRow("K09") << neckSideToArmpitF_M << "neck_side_to_armpit_f";
QTest::newRow("K10") << neckSideToBustSideF_M << "neck_side_to_bust_side_f";
QTest::newRow("K11") << neckSideToArmfoldB_M << "neck_side_to_armfold_b";
QTest::newRow("K12") << neckSideToArmpitB_M << "neck_side_to_armpit_b";
QTest::newRow("K13") << neckSideToBustSideB_M << "neck_side_to_bust_side_b";
QTest::newRow("L01") << armShoulderTipToWristBent_M << "arm_shoulder_tip_to_wrist_bent";
QTest::newRow("L02") << armShoulderTipToElbowBent_M << "arm_shoulder_tip_to_elbow_bent";
QTest::newRow("L03") << armElbowToWristBent_M << "arm_elbow_to_wrist_bent";
QTest::newRow("L04") << armElbowCircBent_M << "arm_elbow_circ_bent";
QTest::newRow("L05") << armShoulderTipToWrist_M << "arm_shoulder_tip_to_wrist";
QTest::newRow("L06") << armShoulderTipToElbow_M << "arm_shoulder_tip_to_elbow";
QTest::newRow("L07") << armElbowToWrist_M << "arm_elbow_to_wrist";
QTest::newRow("L08") << armArmpitToWrist_M << "arm_armpit_to_wrist";
QTest::newRow("L09") << armArmpitToElbow_M << "arm_armpit_to_elbow";
QTest::newRow("L10") << armElbowToWristInside_M << "arm_elbow_to_wrist_inside";
QTest::newRow("L11") << armUpperCirc_M << "arm_upper_circ";
QTest::newRow("L12") << armAboveElbowCirc_M << "arm_above_elbow_circ";
QTest::newRow("L13") << armElbowCirc_M << "arm_elbow_circ";
QTest::newRow("L14") << armLowerCirc_M << "arm_lower_circ";
QTest::newRow("L15") << armWristCirc_M << "arm_wrist_circ";
QTest::newRow("L16") << armShoulderTipToArmfoldLine_M << "arm_shoulder_tip_to_armfold_line";
QTest::newRow("L17") << armNeckSideToWrist_M << "arm_neck_side_to_wrist";
QTest::newRow("L18") << armNeckSideToFingerTip_M << "arm_neck_side_to_finger_tip";
QTest::newRow("L19") << armscyeCirc_M << "armscye_circ";
QTest::newRow("L20") << armscyeLength_M << "armscye_length";
QTest::newRow("L21") << armscyeWidth_M << "armscye_width";
QTest::newRow("L22") << armNeckSideToOuterElbow_M << "arm_neck_side_to_outer_elbow";
QTest::newRow("M01") << legCrotchToFloor_M << "leg_crotch_to_floor";
QTest::newRow("M02") << legWaistSideToFloor_M << "leg_waist_side_to_floor";
QTest::newRow("M03") << legThighUpperCirc_M << "leg_thigh_upper_circ";
QTest::newRow("M04") << legThighMidCirc_M << "leg_thigh_mid_circ";
QTest::newRow("M05") << legKneeCirc_M << "leg_knee_circ";
QTest::newRow("M06") << legKneeSmallCirc_M << "leg_knee_small_circ";
QTest::newRow("M07") << legCalfCirc_M << "leg_calf_circ";
QTest::newRow("M08") << legAnkleHighCirc_M << "leg_ankle_high_circ";
QTest::newRow("M09") << legAnkleCirc_M << "leg_ankle_circ";
QTest::newRow("M10") << legKneeCircBent_M << "leg_knee_circ_bent";
QTest::newRow("M11") << legAnkleDiagCirc_M << "leg_ankle_diag_circ";
QTest::newRow("M12") << legCrotchToAnkle_M << "leg_crotch_to_ankle";
QTest::newRow("M13") << legWaistSideToAnkle_M << "leg_waist_side_to_ankle";
QTest::newRow("M14") << legWaistSideToKnee_M << "leg_waist_side_to_knee";
QTest::newRow("N01") << crotchLength_M << "crotch_length";
QTest::newRow("N02") << crotchLengthB_M << "crotch_length_b";
QTest::newRow("N03") << crotchLengthF_M << "crotch_length_f";
QTest::newRow("N04") << riseLengthSideSitting_M << "rise_length_side_sitting";
QTest::newRow("N05") << riseLengthDiag_M << "rise_length_diag";
QTest::newRow("N06") << riseLengthB_M << "rise_length_b";
QTest::newRow("N07") << riseLengthF_M << "rise_length_f";
QTest::newRow("N08") << riseLengthSide_M << "rise_length_side";
QTest::newRow("O01") << neckBackToWaistFront_M << "neck_back_to_waist_front";
QTest::newRow("O02") << waistToWaistHalter_M << "waist_to_waist_halter";
QTest::newRow("O03") << waistNaturalCirc_M << "waist_natural_circ";
QTest::newRow("O04") << waistNaturalArcF_M << "waist_natural_arc_f";
QTest::newRow("O05") << waistNaturalArcB_M << "waist_natural_arc_b";
QTest::newRow("O06") << waistToNaturalWaistF_M << "waist_to_natural_waist_f";
QTest::newRow("O07") << waistToNaturalWaistB_M << "waist_to_natural_waist_b";
QTest::newRow("O08") << armNeckBackToElbowBent_M << "arm_neck_back_to_elbow_bent";
QTest::newRow("O09") << armNeckBackToWristBent_M << "arm_neck_back_to_wrist_bent";
QTest::newRow("O10") << armNeckSideToElbowBent_M << "arm_neck_side_to_elbow_bent";
QTest::newRow("O11") << armNeckSideToWristBent_M << "arm_neck_side_to_wrist_bent";
QTest::newRow("O12") << armAcrossBackCenterToElbowBent_M << "arm_across_back_center_to_elbow_bent";
QTest::newRow("O13") << armAcrossBackCenterToWristBent_M << "arm_across_back_center_to_wrist_bent";
QTest::newRow("O14") << armArmscyeBackCenterToWristBent_M << "arm_armscye_back_center_to_wrist_bent";
QTest::newRow("P01") << neckBackToBustFront_M << "neck_back_to_bust_front";
QTest::newRow("P02") << neckBackToArmfoldFront_M << "neck_back_to_armfold_front";
QTest::newRow("P03") << neckBackToArmfoldFrontToWaistSide_M << "neck_back_to_armfold_front_to_waist_side";
QTest::newRow("P04") << highbustBackOverShoulderToArmfoldFront_M << "highbust_back_over_shoulder_to_armfold_front";
QTest::newRow("P05") << highbustBackOverShoulderToWaistFront_M << "highbust_back_over_shoulder_to_waist_front";
QTest::newRow("P06") << neckBackToArmfoldFrontToNeckBack_M << "neck_back_to_armfold_front_to_neck_back";
QTest::newRow("P07") << acrossBackCenterToArmfoldFrontToAcrossBackCenter_M
<< "across_back_center_to_armfold_front_to_across_back_center";
QTest::newRow("P08") << neckBackToArmfoldFrontToHighbustBack_M << "neck_back_to_armfold_front_to_highbust_back";
QTest::newRow("P09") << armfoldToArmfoldBust_M << "armfold_to_armfold_bust";
QTest::newRow("P10") << armfoldToBustFront_M << "armfold_to_bust_front";
QTest::newRow("P11") << highbustBOverShoulderToHighbustF_M << "highbust_b_over_shoulder_to_highbust_f";
QTest::newRow("P12") << armscyeArc_M << "armscye_arc";
QTest::newRow("Q01") << dartWidthShoulder_M << "dart_width_shoulder";
QTest::newRow("Q02") << dartWidthBust_M << "dart_width_bust";
QTest::newRow("Q03") << dartWidthWaist_M << "dart_width_waist";
}
//---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction
void TST_NameRegExp::TestCorrectOrderMeasurement()
{
QFETCH(QString, name);
QFETCH(QString, expect);
QCOMPARE(name, expect);
}

5
src/test/ValentinaTest/tst_nameregexp.h
View File

@ -42,7 +42,10 @@ signals:
private slots: private slots:
void TestNameRegExp_data(); void TestNameRegExp_data();
void TestNameRegExp(); void TestNameRegExp();
void TestOriginalMeasurementNamesRegExp_data();
void TestOriginalMeasurementNamesRegExp();
void TestCorrectOrderMeasurement_data();
void TestCorrectOrderMeasurement();
}; };
#endif // TST_NAMEREGEXP_H #endif // TST_NAMEREGEXP_H

99
src/test/ValentinaTest/tst_qmuparsererrormsg.cpp
View File

@ -33,8 +33,9 @@
#include <QtTest> #include <QtTest>
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
TST_QmuParserErrorMsg::TST_QmuParserErrorMsg(QObject *parent) : TST_QmuParserErrorMsg::TST_QmuParserErrorMsg(const QString &locale, QObject *parent)
AbstractTest(parent), : AbstractTest(parent),
m_locale(locale),
appTranslator(nullptr), appTranslator(nullptr),
msg(nullptr) msg(nullptr)
{ {
@ -48,17 +49,35 @@ TST_QmuParserErrorMsg::~TST_QmuParserErrorMsg()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void TST_QmuParserErrorMsg::TestEErrorCodes_data() void TST_QmuParserErrorMsg::initTestCase()
{ {
if (m_locale.isEmpty())
{ {
QDir dir(TranslationsPath()); QFAIL("Empty locale code.");
const QStringList fileNames = dir.entryList(QStringList("valentina_*.qm"));
QVERIFY2(SupportedLocales().size() == fileNames.size(), "Unexpected count of files.");
} }
const QStringList locales = SupportedLocales();
if (not locales.contains(m_locale))
{
QFAIL("Unsupported locale code.");
}
QDir dir(TranslationsPath());
const QStringList fileNames = dir.entryList(QStringList("valentina_*.qm"));
QVERIFY2(locales.size() == fileNames.size(), "Unexpected count of files.");
if (LoadTranslation(m_locale) != NoError)
{
const QString message = QString("Couldn't load variables. Locale = %1").arg(m_locale);
QSKIP(qUtf8Printable(message));
}
}
//---------------------------------------------------------------------------------------------------------------------
void TST_QmuParserErrorMsg::TestEErrorCodes_data()
{
QTest::addColumn<int>("code"); QTest::addColumn<int>("code");
QTest::addColumn<QString>("locale");
QTest::addColumn<bool>("tok"); QTest::addColumn<bool>("tok");
QTest::addColumn<bool>("pos"); QTest::addColumn<bool>("pos");
@ -104,55 +123,27 @@ void TST_QmuParserErrorMsg::TestEErrorCodes_data()
void TST_QmuParserErrorMsg::TestEErrorCodes() void TST_QmuParserErrorMsg::TestEErrorCodes()
{ {
QFETCH(int, code); QFETCH(int, code);
QFETCH(QString, locale);
QFETCH(bool, tok); QFETCH(bool, tok);
QFETCH(bool, pos); QFETCH(bool, pos);
const int res = LoadTranslation(locale); const QString translated = (*msg)[code];
const QString message = QString("String: '%1'.").arg(translated);
switch(res) QVERIFY2((translated.indexOf(QLatin1String("$TOK$")) != -1) == tok, qUtf8Printable(message));
{ QVERIFY2((translated.indexOf(QLatin1String("$POS$")) != -1) == pos, qUtf8Printable(message));
case ErrorInstall:
case ErrorSize:
case ErrorLoad:
{
const QString message = QString("Failed to check translation for locale = %1").arg(locale);
QSKIP(qUtf8Printable(message));
break;
} }
case NoError:
{
CheckStrings(code, tok, pos);
if (not appTranslator.isNull()) //---------------------------------------------------------------------------------------------------------------------
void TST_QmuParserErrorMsg::cleanupTestCase()
{ {
const bool result = QCoreApplication::removeTranslator(appTranslator); RemoveTranslation();
if (result == false)
{
const QString message = QString("Can't remove translation for locale = %1").arg(locale);
QWARN(qUtf8Printable(message));
}
delete appTranslator;
}
break;
}
default:
QWARN("Unexpected state");
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void TST_QmuParserErrorMsg::AddCase(int code, bool tok, bool pos) void TST_QmuParserErrorMsg::AddCase(int code, bool tok, bool pos)
{ {
const QStringList locales = SupportedLocales(); const QString tag = QString("Check translation code=%1 in file valentina_%2.qm").arg(code).arg(m_locale);
QTest::newRow(qUtf8Printable(tag)) << code << tok << pos;
for(int l = 0, sz = locales.size(); l < sz; ++l)
{
const QString locale = locales.at(l);
const QString tag = QString("Check translation code=%1 in file valentina_%2.qm").arg(code).arg(locale);
QTest::newRow(qUtf8Printable(tag)) << code << locale << tok << pos;
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -161,7 +152,7 @@ int TST_QmuParserErrorMsg::LoadTranslation(const QString &checkedLocale)
const QString path = TranslationsPath(); const QString path = TranslationsPath();
const QString file = QString("valentina_%1.qm").arg(checkedLocale); const QString file = QString("valentina_%1.qm").arg(checkedLocale);
if (QFileInfo(path+"/"+file).size() <= 34) if (QFileInfo(path+QLatin1String("/")+file).size() <= 34)
{ {
const QString message = QString("Translation for locale = %1 is empty. \nFull path: %2/%3") const QString message = QString("Translation for locale = %1 is empty. \nFull path: %2/%3")
.arg(checkedLocale) .arg(checkedLocale)
@ -207,11 +198,17 @@ int TST_QmuParserErrorMsg::LoadTranslation(const QString &checkedLocale)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void TST_QmuParserErrorMsg::CheckStrings(int code, bool tok, bool pos) void TST_QmuParserErrorMsg::RemoveTranslation()
{ {
const QString translated = (*msg)[code]; if (not appTranslator.isNull())
const QString message = QString("String: '%1'.").arg(translated); {
const bool result = QCoreApplication::removeTranslator(appTranslator);
QVERIFY2((translated.indexOf(QLatin1String("$TOK$")) != -1) == tok, qUtf8Printable(message)); if (result == false)
QVERIFY2((translated.indexOf(QLatin1String("$POS$")) != -1) == pos, qUtf8Printable(message)); {
const QString message = QString("Can't remove translation for locale = %1").arg(m_locale);
QWARN(qUtf8Printable(message));
}
delete appTranslator;
}
} }

7
src/test/ValentinaTest/tst_qmuparsererrormsg.h
View File

@ -39,22 +39,25 @@ class TST_QmuParserErrorMsg : public AbstractTest
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit TST_QmuParserErrorMsg(QObject *parent = nullptr); explicit TST_QmuParserErrorMsg(const QString &locale, QObject *parent = nullptr);
virtual ~TST_QmuParserErrorMsg() Q_DECL_OVERRIDE; virtual ~TST_QmuParserErrorMsg() Q_DECL_OVERRIDE;
private slots: private slots:
void initTestCase();
void TestEErrorCodes_data(); void TestEErrorCodes_data();
void TestEErrorCodes(); void TestEErrorCodes();
void cleanupTestCase();
private: private:
Q_DISABLE_COPY(TST_QmuParserErrorMsg) Q_DISABLE_COPY(TST_QmuParserErrorMsg)
QString m_locale;
QPointer<QTranslator> appTranslator; QPointer<QTranslator> appTranslator;
qmu::QmuParserErrorMsg *msg; qmu::QmuParserErrorMsg *msg;
void AddCase(int code, bool tok, bool pos); void AddCase(int code, bool tok, bool pos);
int LoadTranslation(const QString &checkedLocale); int LoadTranslation(const QString &checkedLocale);
void CheckStrings(int code, bool tok, bool pos); void RemoveTranslation();
}; };
#endif // TST_QMUPARSERERRORMSG_H #endif // TST_QMUPARSERERRORMSG_H