From 13fbc0b8b9311b104dbc944c39ac8f983ebf657b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 9 Jan 2016 12:29:50 +0200 Subject: [PATCH] New files in collection. --HG-- branch : develop --- src/app/share/collection/TShirt_test.val | 247 ++++++++++ src/app/share/collection/TestPuzzle.val | 73 +++ src/app/share/collection/bra.val | 65 +++ src/app/share/collection/bra.vit | 130 +++++ src/app/share/collection/jacketМ1_52-176.val | 290 ++++++++++++ src/app/share/collection/jacketМ2_40-146.val | 344 ++++++++++++++ src/app/share/collection/jacketМ3_40-146.val | 266 +++++++++++ src/app/share/collection/jacketМ4_40-146.val | 445 ++++++++++++++++++ src/app/share/collection/jacketМ5_30-110.val | 402 ++++++++++++++++ src/app/share/collection/jacketМ6_30-110.val | 120 ++--- src/app/share/collection/pantsМ1_52-176.val | 134 ++++++ src/app/share/collection/pantsМ2_40-146.val | 211 +++++++++ src/app/share/collection/pantsМ7.val | 174 +++++++ src/test/ValentinaTest/ValentinaTest.pro | 14 +- .../tst_valentinacommandline.cpp | 58 +++ 15 files changed, 2913 insertions(+), 60 deletions(-) create mode 100644 src/app/share/collection/TShirt_test.val create mode 100644 src/app/share/collection/TestPuzzle.val create mode 100644 src/app/share/collection/bra.val create mode 100644 src/app/share/collection/bra.vit create mode 100644 src/app/share/collection/jacketМ1_52-176.val create mode 100644 src/app/share/collection/jacketМ2_40-146.val create mode 100644 src/app/share/collection/jacketМ3_40-146.val create mode 100644 src/app/share/collection/jacketМ4_40-146.val create mode 100644 src/app/share/collection/jacketМ5_30-110.val create mode 100644 src/app/share/collection/pantsМ1_52-176.val create mode 100644 src/app/share/collection/pantsМ2_40-146.val create mode 100644 src/app/share/collection/pantsМ7.val diff --git a/src/app/share/collection/TShirt_test.val b/src/app/share/collection/TShirt_test.val new file mode 100644 index 000000000..c13a97ab2 --- /dev/null +++ b/src/app/share/collection/TShirt_test.val @@ -0,0 +1,247 @@ + + + + 0.2.4 + cm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + +
+ + diff --git a/src/app/share/collection/TestPuzzle.val b/src/app/share/collection/TestPuzzle.val new file mode 100644 index 000000000..475f7f9c4 --- /dev/null +++ b/src/app/share/collection/TestPuzzle.val @@ -0,0 +1,73 @@ + + + + 0.2.4 + cm + + + + ../../../../../patterns/Susan.vit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/src/app/share/collection/bra.val b/src/app/share/collection/bra.val new file mode 100644 index 000000000..cffabe0bb --- /dev/null +++ b/src/app/share/collection/bra.val @@ -0,0 +1,65 @@ + + + + 0.2.4 + cm + + + + bra.vit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/src/app/share/collection/bra.vit b/src/app/share/collection/bra.vit new file mode 100644 index 000000000..1245fdc9c --- /dev/null +++ b/src/app/share/collection/bra.vit @@ -0,0 +1,130 @@ + + + + 0.3.3 + false + + cm + 998 + + + + 1900-01-01 + male + username@example.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/share/collection/jacketМ1_52-176.val b/src/app/share/collection/jacketМ1_52-176.val new file mode 100644 index 000000000..d27a8c4d9 --- /dev/null +++ b/src/app/share/collection/jacketМ1_52-176.val @@ -0,0 +1,290 @@ + + + + 0.2.4 + mm + + + + + + + + ../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + +
+ + diff --git a/src/app/share/collection/jacketМ2_40-146.val b/src/app/share/collection/jacketМ2_40-146.val new file mode 100644 index 000000000..b00bf83d5 --- /dev/null +++ b/src/app/share/collection/jacketМ2_40-146.val @@ -0,0 +1,344 @@ + + + + 0.2.4 + mm + + + + + + + + ../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + +
+ + diff --git a/src/app/share/collection/jacketМ3_40-146.val b/src/app/share/collection/jacketМ3_40-146.val new file mode 100644 index 000000000..1878f0f1f --- /dev/null +++ b/src/app/share/collection/jacketМ3_40-146.val @@ -0,0 +1,266 @@ + + + + 0.2.4 + mm + + + + + + + + ../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + diff --git a/src/app/share/collection/jacketМ4_40-146.val b/src/app/share/collection/jacketМ4_40-146.val new file mode 100644 index 000000000..00bcef18b --- /dev/null +++ b/src/app/share/collection/jacketМ4_40-146.val @@ -0,0 +1,445 @@ + + + + 0.2.4 + mm + + + + + + + + ../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 314 + 316 + 320 + 322 + 331 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 351 + 353 + 357 + 359 + 361 + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/src/app/share/collection/jacketМ5_30-110.val b/src/app/share/collection/jacketМ5_30-110.val new file mode 100644 index 000000000..30d16f963 --- /dev/null +++ b/src/app/share/collection/jacketМ5_30-110.val @@ -0,0 +1,402 @@ + + + + 0.2.4 + mm + + + + + + + + ../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + diff --git a/src/app/share/collection/jacketМ6_30-110.val b/src/app/share/collection/jacketМ6_30-110.val index 640c1eecd..079c0e1f2 100644 --- a/src/app/share/collection/jacketМ6_30-110.val +++ b/src/app/share/collection/jacketМ6_30-110.val @@ -1,12 +1,16 @@ - 0.2.2 + 0.2.4 mm - build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst + + + + + ../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst @@ -135,43 +139,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -180,7 +184,7 @@ - + @@ -282,15 +286,15 @@ - - - - - - - - - + + + + + + + + +
@@ -356,15 +360,15 @@ - - - - - - - - - + + + + + + + + +
diff --git a/src/app/share/collection/pantsМ1_52-176.val b/src/app/share/collection/pantsМ1_52-176.val new file mode 100644 index 000000000..cd83abd40 --- /dev/null +++ b/src/app/share/collection/pantsМ1_52-176.val @@ -0,0 +1,134 @@ + + + + 0.2.4 + mm + + + + + + + + ../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/src/app/share/collection/pantsМ2_40-146.val b/src/app/share/collection/pantsМ2_40-146.val new file mode 100644 index 000000000..c3f104c3f --- /dev/null +++ b/src/app/share/collection/pantsМ2_40-146.val @@ -0,0 +1,211 @@ + + + + 0.2.4 + mm + + + + + + + + ../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + +
+ + diff --git a/src/app/share/collection/pantsМ7.val b/src/app/share/collection/pantsМ7.val new file mode 100644 index 000000000..0ea8f4f3b --- /dev/null +++ b/src/app/share/collection/pantsМ7.val @@ -0,0 +1,174 @@ + + + + 0.2.4 + mm + + + + + + + + ../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index 9317c4887..583d8de3b 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -250,8 +250,18 @@ VALENTINA_TEST_FILES += \ COLLECTION_FILES += \ $${PWD}/../../app/share/tables/standard/GOST_man_ru.vst \ - $${PWD}/../../app/share/collection/jacketМ6_30-110.val - + $${PWD}/../../app/share/collection/bra.val \ + $${PWD}/../../app/share/collection/bra.vit \ + $${PWD}/../../app/share/collection/jacketМ1_52-176.val \ + $${PWD}/../../app/share/collection/jacketМ2_40-146.val \ + $${PWD}/../../app/share/collection/jacketМ3_40-146.val \ + $${PWD}/../../app/share/collection/jacketМ4_40-146.val \ + $${PWD}/../../app/share/collection/jacketМ5_30-110.val \ + $${PWD}/../../app/share/collection/jacketМ6_30-110.val \ + $${PWD}/../../app/share/collection/pantsМ1_52-176.val \ + $${PWD}/../../app/share/collection/pantsМ2_40-146.val \ + $${PWD}/../../app/share/collection/pantsМ7.val \ + $${PWD}/../../app/share/collection/TShirt_test.val # Compilation will fail without this files after we added them to this section. OTHER_FILES += \ diff --git a/src/test/ValentinaTest/tst_valentinacommandline.cpp b/src/test/ValentinaTest/tst_valentinacommandline.cpp index 81884dd00..d3e56c409 100644 --- a/src/test/ValentinaTest/tst_valentinacommandline.cpp +++ b/src/test/ValentinaTest/tst_valentinacommandline.cpp @@ -255,11 +255,69 @@ void TST_ValentinaCommandLine::TestOpenCollection_data() const const QString tmp = QApplication::applicationDirPath() + QDir::separator() + tmpTestCollectionFolder; + QTest::newRow("bra")<< "bra.val" + << QString("--test") + << true + << V_EX_OK; + + QTest::newRow("jacketМ1_52-176")<< "jacketМ1_52-176.val" + << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + + QLatin1Literal("GOST_man_ru.vst")) + << true + << V_EX_OK; + + QTest::newRow("jacketМ2_40-146")<< "jacketМ2_40-146.val" + << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + + QLatin1Literal("GOST_man_ru.vst")) + << true + << V_EX_OK; + + QTest::newRow("jacketМ3_40-146")<< "jacketМ3_40-146.val" + << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + + QLatin1Literal("GOST_man_ru.vst")) + << true + << V_EX_OK; + + QTest::newRow("jacketМ4_40-146")<< "jacketМ4_40-146.val" + << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + + QLatin1Literal("GOST_man_ru.vst")) + << true + << V_EX_OK; + + QTest::newRow("jacketМ5_30-110")<< "jacketМ5_30-110.val" + << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + + QLatin1Literal("GOST_man_ru.vst")) + << true + << V_EX_OK; + QTest::newRow("jacketМ6_30-110")<< "jacketМ6_30-110.val" << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + QLatin1Literal("GOST_man_ru.vst")) << true << V_EX_OK; + + QTest::newRow("pantsМ1_52-176")<< "pantsМ1_52-176.val" + << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + + QLatin1Literal("GOST_man_ru.vst")) + << true + << V_EX_OK; + + QTest::newRow("pantsМ2_40-146")<< "pantsМ2_40-146.val" + << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + + QLatin1Literal("GOST_man_ru.vst")) + << true + << V_EX_OK; + + QTest::newRow("pantsМ7")<< "pantsМ7.val" + << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + + QLatin1Literal("GOST_man_ru.vst")) + << true + << V_EX_OK; + + QTest::newRow("TShirt_test")<< "TShirt_test.val" + << QString("--test") + << true + << V_EX_OK; } //---------------------------------------------------------------------------------------------------------------------