Collection unit tests moved to separate binary.

--HG--
branch : develop

src/test/CollectionTest/CollectionTest.pro

@@ -0,0 +1,273 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2016-08-04T19:29:55
+#
+#-------------------------------------------------
+
+QT       += testlib widgets
+
+QT       -= gui
+
+TARGET = CollectionTest
+
+# File with common stuff for whole project
+include(../../../common.pri)
+
+TEMPLATE = app
+
+# CONFIG += testcase adds a  'make check' which is great. But by default it also
+# adds a 'make install' that installs the test cases, which we do not want.
+# Can configure it not to do that with 'no_testcase_installs'
+# We use C++11 standard
+CONFIG += c++11 testcase no_testcase_installs
+
+# Use out-of-source builds (shadow builds)
+CONFIG -= app_bundle debug_and_release debug_and_release_target
+
+# directory for executable file
+DESTDIR = bin
+
+# Directory for files created moc
+MOC_DIR = moc
+
+# objecs files
+OBJECTS_DIR = obj
+
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+SOURCES += \
+    qttestmainlambda.cpp \
+    tst_tapecommandline.cpp \
+    tst_valentinacommandline.cpp
+
+win32-msvc*:SOURCES += stable.cpp
+
+HEADERS += \
+    stable.h \
+    tst_tapecommandline.h \
+    tst_valentinacommandline.h
+
+# Set using ccache. Function enable_ccache() defined in common.pri.
+$$enable_ccache()
+
+CONFIG(debug, debug|release){
+    # Debug mode
+    unix {
+        include(warnings.pri)
+    } else {
+        *-g++{
+            QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
+        }
+    }
+}else{
+    # Release mode
+    !win32-msvc*:CONFIG += silent
+    DEFINES += V_NO_ASSERT
+    !unix:*-g++{
+        QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
+    }
+
+    checkWarnings{
+        unix:include(warnings.pri)
+    }
+
+    noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
+        # do nothing
+    } else {
+        # Turn on debug symbols in release mode on Unix systems.
+        # On Mac OS X temporarily disabled. Need find way how to strip binary file.
+        !macx:!win32-msvc*{
+            QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3
+            QMAKE_CFLAGS_RELEASE += -g -gdwarf-3
+            QMAKE_LFLAGS_RELEASE =
+        }
+    }
+}
+
+##VTools static library (depend on VWidgets, VMisc, VPatternDB)
+#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vtools/$${DESTDIR}/ -lvtools
+
+#INCLUDEPATH += $$PWD/../../libs/vtools
+#DEPENDPATH += $$PWD/../../libs/vtools
+
+#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/vtools.lib
+#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/libvtools.a
+
+##VWidgets static library
+#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
+
+#INCLUDEPATH += $$PWD/../../libs/vwidgets
+#DEPENDPATH += $$PWD/../../libs/vwidgets
+
+#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
+#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
+
+## VFormat static library (depend on VPatternDB, IFC)
+#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vformat/$${DESTDIR}/ -lvformat
+
+#INCLUDEPATH += $$PWD/../../libs/vformat
+#DEPENDPATH += $$PWD/../../libs/vformat
+
+#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vformat/$${DESTDIR}/vformat.lib
+#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vformat/$${DESTDIR}/libvformat.a
+
+#VPatternDB static library (depend on vgeometry, vmisc, VLayout)
+#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vpatterndb/$${DESTDIR} -lvpatterndb
+
+#INCLUDEPATH += $$PWD/../../libs/vpatterndb
+#DEPENDPATH += $$PWD/../../libs/vpatterndb
+
+#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib
+#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a
+
+#VMisc static library
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vmisc/$${DESTDIR} -lvmisc
+
+INCLUDEPATH += $$PWD/../../libs/vmisc
+DEPENDPATH += $$PWD/../../libs/vmisc
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vmisc/$${DESTDIR}/vmisc.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vmisc/$${DESTDIR}/libvmisc.a
+
+## VGeometry static library (depend on ifc)
+#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vgeometry/$${DESTDIR} -lvgeometry
+
+#INCLUDEPATH += $$PWD/../../libs/vgeometry
+#DEPENDPATH += $$PWD/../../libs/vgeometry
+
+#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/vgeometry.lib
+#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/libvgeometry.a
+
+# IFC static library (depend on QMuParser)
+#unix|win32: LIBS += -L$$OUT_PWD/../../libs/ifc/$${DESTDIR}/ -lifc
+
+#INCLUDEPATH += $$PWD/../../libs/ifc
+#DEPENDPATH += $$PWD/../../libs/ifc
+
+#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/ifc.lib
+#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/libifc.a
+
+## VLayout static library
+#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR} -lvlayout
+
+#INCLUDEPATH += $$PWD/../../libs/vlayout
+#DEPENDPATH += $$PWD/../../libs/vlayout
+
+#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/vlayout.lib
+#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/libvlayout.a
+
+# QMuParser library
+#win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser2
+#else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser2
+#else:unix: LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser
+
+#INCLUDEPATH += $${PWD}/../../libs/qmuparser
+#DEPENDPATH += $${PWD}/../../libs/qmuparser
+
+## Only for adding path to LD_LIBRARY_PATH
+## VPropertyExplorer library
+#win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
+#else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
+#else:unix: LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
+
+#INCLUDEPATH += $${PWD}/../../libs/vpropertyexplorer
+#DEPENDPATH += $${PWD}/../../libs/vpropertyexplorer
+
+TAPE_TEST_FILES += \
+    tst_tape/keiko.vit \
+    tst_tape/empty.vit \
+    tst_tape/all_measurements_v0.3.0.vit \
+    tst_tape/all_measurements_v0.4.0.vst \
+    tst_tape/GOST_man_ru_v0.3.0.vst \
+    tst_tape/all_measurements_v0.3.3.vit \
+    tst_tape/all_measurements_v0.4.2.vst \
+    tst_tape/GOST_man_ru_v0.4.2.vst \
+    tst_tape/broken1.vit \
+    tst_tape/broken2.vit \
+    tst_tape/broken3.vit \
+    tst_tape/broken4.vit \
+    tst_tape/text.vit \
+    tst_tape/text.vst
+
+VALENTINA_TEST_FILES += \
+    tst_valentina/empty.val \
+    tst_valentina/issue_372.val \
+    tst_valentina/wrong_obj_type.val \
+    tst_valentina/text.val \
+    tst_valentina/glimited_no_m.val \
+    tst_valentina/glimited_vit.val \
+    tst_valentina/glimited.vit \
+    tst_valentina/glimited_vst.val \
+    tst_valentina/glimited.vst \
+    tst_valentina/issue_256.val \
+    tst_valentina/issue_256_wrong_path.val \
+    tst_valentina/issue_256_correct.vit \
+    tst_valentina/issue_256_wrong.vit \
+    tst_valentina/issue_256_correct.vst \
+    tst_valentina/issue_256_wrong.vit \
+    tst_valentina/wrong_formula.val
+
+COLLECTION_FILES += \
+    $${PWD}/../../app/share/tables/standard/GOST_man_ru.vst \
+    $${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 \
+    $${PWD}/../../app/share/collection/TestDart.val \
+    $${PWD}/../../app/share/collection/patrón_blusa.val \
+    $${PWD}/../../app/share/collection/blusa.vit \
+    $${PWD}/../../app/share/collection/PajamaTopWrap2.val \
+    $${PWD}/../../app/share/collection/Susan.vit \
+    $${PWD}/../../app/share/collection/Moulage_0.5_armhole_neckline.val \
+    $${PWD}/../../app/share/collection/0.7_Armhole_adjustment_0.10.val \
+    $${PWD}/../../app/share/collection/my_calculated_measurements_for_val.vit \
+    $${PWD}/../../app/share/collection/Keiko_skirt.val \
+    $${PWD}/../../app/share/collection/keiko.vit \
+    $${PWD}/../../app/share/collection/medidas_eli2015.vit \
+    $${PWD}/../../app/share/collection/pantalon_base_Eli.val \
+    $${PWD}/../../app/share/collection/Razmernye_priznaki_dlya_zhenskogo_zhaketa.vit \
+    $${PWD}/../../app/share/collection/IMK_Zhaketa_poluprilegayuschego_silueta.val \
+    $${PWD}/../../app/share/collection/Lara_Jil.vit \
+    $${PWD}/../../app/share/collection/modell_2.val \
+    $${PWD}/../../app/share/collection/MaleShirt/MaleShirt.val \
+    $${PWD}/../../app/share/collection/MaleShirt/MaleShirt.vit \
+    $${PWD}/../../app/share/collection/Trousers/Trousers.val \
+    $${PWD}/../../app/share/collection/Trousers/trousers.vit
+
+# Compilation will fail without this files after we added them to this section.
+OTHER_FILES += \
+    $$TAPE_TEST_FILES \
+    $$VALENTINA_TEST_FILES \
+    $$COLLECTION_FILES
+
+for(DIR, TAPE_TEST_FILES) {
+     #add these absolute paths to a variable which
+     #ends up as 'mkcommands = path1 path2 path3 ...'
+     tape_path += $${PWD}/$$DIR
+}
+
+copyToDestdir($$tape_path, $$shell_path($${OUT_PWD}/$$DESTDIR/tst_tape))
+
+for(DIR, VALENTINA_TEST_FILES) {
+     #add these absolute paths to a variable which
+     #ends up as 'mkcommands = path1 path2 path3 ...'
+     valentina_path += $${PWD}/$$DIR
+}
+
+copyToDestdir($$valentina_path, $$shell_path($${OUT_PWD}/$$DESTDIR/tst_valentina))
+
+for(DIR, COLLECTION_FILES) {
+     #add these absolute paths to a variable which
+     #ends up as 'mkcommands = path1 path2 path3 ...'
+     collection_path += $$DIR
+}
+
+copyToDestdir($$collection_path, $$shell_path($${OUT_PWD}/$$DESTDIR/tst_valentina_collection))

src/test/CollectionTest/qttestmainlambda.cpp

@@ -0,0 +1,49 @@
+/************************************************************************
+ **
+ **  @file   qttestmainlambda.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   31 3, 2015
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentine project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2015 Valentina project
+ **  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include <QtTest>
+
+#include "tst_tapecommandline.h"
+#include "tst_valentinacommandline.h"
+
+int main(int argc, char** argv)
+{
+    QApplication app( argc, argv );
+
+    int status = 0;
+    auto ASSERT_TEST = [&status, argc, argv](QObject* obj)
+    {
+        status |= QTest::qExec(obj, argc, argv);
+        delete obj;
+    };
+
+    ASSERT_TEST(new TST_TapeCommandLine());
+    ASSERT_TEST(new TST_ValentinaCommandLine());
+
+    return status;
+}

src/test/CollectionTest/stable.cpp

@@ -0,0 +1,30 @@
+/************************************************************************
+ **
+ **  @file   stable.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   November 15, 2013
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentine project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2013-2015 Valentina project
+ **  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+// Build the precompiled headers.
+#include "stable.h"

src/test/CollectionTest/stable.h

@@ -0,0 +1,80 @@
+/************************************************************************
+ **
+ **  @file   stable.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   November 15, 2013
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentine project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2013-2015 Valentina project
+ **  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef STABLE_H
+#define STABLE_H
+
+/* I like to include this pragma too, so the build log indicates if pre-compiled headers were in use. */
+#pragma message("Compiling precompiled headers for Collection Test.\n")
+
+/* Add C includes here */
+
+#if defined __cplusplus
+/* Add C++ includes here */
+#include <csignal>
+
+/*In all cases we need include core header for getting defined values*/
+#ifdef QT_CORE_LIB
+#   include <QtCore>
+#endif
+
+#ifdef QT_GUI_LIB
+#   include <QtGui>
+#endif
+
+#ifdef QT_XML_LIB
+#   include <QtXml>
+#endif
+
+//In Windows you can't use same header in all modes.
+#if !defined(Q_OS_WIN)
+#   ifdef QT_WIDGETS_LIB
+#       include <QtWidgets>
+#   endif
+
+#   ifdef QT_SVG_LIB
+#       include <QtSvg/QtSvg>
+#   endif
+
+#   ifdef QT_PRINTSUPPORT_LIB
+#       include <QtPrintSupport>
+#   endif
+
+    //Build doesn't work, if include this headers on Windows.
+#   ifdef QT_XMLPATTERNS_LIB
+#       include <QtXmlPatterns>
+#   endif
+
+#   ifdef QT_NETWORK_LIB
+#       include <QtNetwork>
+#   endif
+#endif/*Q_OS_WIN*/
+
+#endif /*__cplusplus*/
+
+#endif // STABLE_H

src/test/CollectionTest/tst_valentina/issue_256_wrong_path.val

@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pattern>
+    <!--Pattern created with Valentina (http://www.valentina-project.org/).-->
+    <version>0.2.2</version>
+    <unit>cm</unit>
+    <author/>
+    <description/>
+    <notes/>
+    <measurements>issue_256_correct.vit</measurements>
+    <increments/>
+    <draw name="Pattern piece 1">
+        <calculation>
+            <point type="single" x="1.34938" y="1.24354" id="1" name="A" mx="0.132292" my="0.264583"/>
+            <point type="endLine" typeLine="hair" id="2" name="A1" basePoint="1" mx="0.175422" lineColor="black" angle="0" my="0.27896" length="height_scapula/10"/>
+            <point type="endLine" typeLine="hair" id="3" name="A2" basePoint="1" mx="0.132292" lineColor="black" angle="269.719" my="0.264583" length="Line_A_A1"/>
+            <point type="pointOfIntersection" id="4" name="A3" firstPoint="2" secondPoint="3" mx="0.132292" my="0.264583"/>
+            <line typeLine="hair" id="5" firstPoint="3" secondPoint="4" lineColor="black"/>
+            <line typeLine="hair" id="6" firstPoint="2" secondPoint="4" lineColor="black"/>
+        </calculation>
+        <modeling>
+            <point type="modeling" id="7" idObject="1" mx="0.0264587" my="0.291041"/>
+            <point type="modeling" id="8" idObject="2" mx="-1.85208" my="0.264583"/>
+            <point type="modeling" id="9" idObject="4" mx="-2.03729" my="-1.71979"/>
+            <point type="modeling" id="10" idObject="3" mx="0.47625" my="-1.95792"/>
+            <point type="modeling" id="11" idObject="1" mx="0.0264587" my="0.291041"/>
+        </modeling>
+        <details>
+            <detail closed="1" id="12" name="Detail" supplement="1" width="1" mx="0.185208" my="-0.079375">
+                <node type="NodePoint" nodeType="Contour" idObject="7" mx="0" my="0"/>
+                <node type="NodePoint" nodeType="Contour" idObject="8" mx="0" my="0"/>
+                <node type="NodePoint" nodeType="Contour" idObject="9" mx="0" my="0"/>
+                <node type="NodePoint" nodeType="Contour" idObject="10" mx="0" my="0"/>
+                <node type="NodePoint" nodeType="Contour" idObject="11" mx="0" my="0"/>
+            </detail>
+        </details>
+    </draw>
+</pattern>

src/test/CollectionTest/warnings.pri

@@ -0,0 +1,49 @@
+#Turn on compilers warnings.
+*-g++{
+    QMAKE_CXXFLAGS += \
+        # Key -isystem disable checking errors in system headers.
+        -isystem "$${OUT_PWD}/$${UI_DIR}" \
+        -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+        -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+        $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
+
+    checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+        QMAKE_CXXFLAGS += -Werror
+    }
+
+    noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
+        # do nothing
+    } else {
+        #gcc’s 4.8.0 Address Sanitizer
+        #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
+        QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+        QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+        QMAKE_LFLAGS += -fsanitize=address
+    }
+}
+
+clang*{
+    QMAKE_CXXFLAGS += \
+        # Key -isystem disable checking errors in system headers.
+        -isystem "$${OUT_PWD}/$${UI_DIR}" \
+        -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+        -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+        $$CLANG_DEBUG_CXXFLAGS \ # See common.pri for more details.
+        -Wno-gnu-zero-variadic-macro-arguments\ # See macros QSKIP
+
+    checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+        QMAKE_CXXFLAGS += -Werror
+    }
+}
+
+*-icc-*{
+    QMAKE_CXXFLAGS += \
+        -isystem "$${OUT_PWD}/$${UI_DIR}" \
+        -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+        -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+        $$ICC_DEBUG_CXXFLAGS
+
+    checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+        QMAKE_CXXFLAGS += -Werror
+    }
+}

src/test/TranslationsTest/stable.h

@@ -30,7 +30,7 @@
 #define STABLE_H
 
 /* I like to include this pragma too, so the build log indicates if pre-compiled headers were in use. */
-#pragma message("Compiling precompiled headers for Valentina tests.\n")
+#pragma message("Compiling precompiled headers for Translation Tests.\n")
 
 /* Add C includes here */
 

src/test/ValentinaTest/ValentinaTest.pro

@@ -41,8 +41,6 @@ SOURCES += \
     tst_nameregexp.cpp \
     tst_vlayoutdetail.cpp \
     tst_varc.cpp \
-    tst_tapecommandline.cpp \
-    tst_valentinacommandline.cpp \
     tst_qmutokenparser.cpp \
     tst_vmeasurements.cpp \
     tst_vlockguard.cpp \
@@ -64,8 +62,6 @@ HEADERS += \
     tst_vlayoutdetail.h \
     tst_varc.h \
     stable.h \
-    tst_tapecommandline.h \
-    tst_valentinacommandline.h \
     tst_qmutokenparser.h \
     tst_vmeasurements.h \
     tst_vlockguard.h \
@@ -202,102 +198,3 @@ else:unix: LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpro
 
 INCLUDEPATH += $${PWD}/../../libs/vpropertyexplorer
 DEPENDPATH += $${PWD}/../../libs/vpropertyexplorer
-
-TAPE_TEST_FILES += \
-    tst_tape/keiko.vit \
-    tst_tape/empty.vit \
-    tst_tape/all_measurements_v0.3.0.vit \
-    tst_tape/all_measurements_v0.4.0.vst \
-    tst_tape/GOST_man_ru_v0.3.0.vst \
-    tst_tape/all_measurements_v0.3.3.vit \
-    tst_tape/all_measurements_v0.4.2.vst \
-    tst_tape/GOST_man_ru_v0.4.2.vst \
-    tst_tape/broken1.vit \
-    tst_tape/broken2.vit \
-    tst_tape/broken3.vit \
-    tst_tape/broken4.vit \
-    tst_tape/text.vit \
-    tst_tape/text.vst
-
-VALENTINA_TEST_FILES += \
-    tst_valentina/empty.val \
-    tst_valentina/issue_372.val \
-    tst_valentina/wrong_obj_type.val \
-    tst_valentina/text.val \
-    tst_valentina/glimited_no_m.val \
-    tst_valentina/glimited_vit.val \
-    tst_valentina/glimited.vit \
-    tst_valentina/glimited_vst.val \
-    tst_valentina/glimited.vst \
-    tst_valentina/issue_256.val \
-    tst_valentina/issue_256_wrong_path.val \
-    tst_valentina/issue_256_correct.vit \
-    tst_valentina/issue_256_wrong.vit \
-    tst_valentina/issue_256_correct.vst \
-    tst_valentina/issue_256_wrong.vit \
-    tst_valentina/wrong_formula.val
-
-COLLECTION_FILES += \
-    $${PWD}/../../app/share/tables/standard/GOST_man_ru.vst \
-    $${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 \
-    $${PWD}/../../app/share/collection/TestDart.val \
-    $${PWD}/../../app/share/collection/patrón_blusa.val \
-    $${PWD}/../../app/share/collection/blusa.vit \
-    $${PWD}/../../app/share/collection/PajamaTopWrap2.val \
-    $${PWD}/../../app/share/collection/Susan.vit \
-    $${PWD}/../../app/share/collection/Moulage_0.5_armhole_neckline.val \
-    $${PWD}/../../app/share/collection/0.7_Armhole_adjustment_0.10.val \
-    $${PWD}/../../app/share/collection/my_calculated_measurements_for_val.vit \
-    $${PWD}/../../app/share/collection/Keiko_skirt.val \
-    $${PWD}/../../app/share/collection/keiko.vit \
-    $${PWD}/../../app/share/collection/medidas_eli2015.vit \
-    $${PWD}/../../app/share/collection/pantalon_base_Eli.val \
-    $${PWD}/../../app/share/collection/Razmernye_priznaki_dlya_zhenskogo_zhaketa.vit \
-    $${PWD}/../../app/share/collection/IMK_Zhaketa_poluprilegayuschego_silueta.val \
-    $${PWD}/../../app/share/collection/Lara_Jil.vit \
-    $${PWD}/../../app/share/collection/modell_2.val \
-    $${PWD}/../../app/share/collection/MaleShirt/MaleShirt.val \
-    $${PWD}/../../app/share/collection/MaleShirt/MaleShirt.vit \
-    $${PWD}/../../app/share/collection/Trousers/Trousers.val \
-    $${PWD}/../../app/share/collection/Trousers/trousers.vit
-
-# Compilation will fail without this files after we added them to this section.
-OTHER_FILES += \
-    $$TAPE_TEST_FILES \
-    $$VALENTINA_TEST_FILES \
-    $$COLLECTION_FILES
-
-for(DIR, TAPE_TEST_FILES) {
-     #add these absolute paths to a variable which
-     #ends up as 'mkcommands = path1 path2 path3 ...'
-     tape_path += $${PWD}/$$DIR
-}
-
-copyToDestdir($$tape_path, $$shell_path($${OUT_PWD}/$$DESTDIR/tst_tape))
-
-for(DIR, VALENTINA_TEST_FILES) {
-     #add these absolute paths to a variable which
-     #ends up as 'mkcommands = path1 path2 path3 ...'
-     valentina_path += $${PWD}/$$DIR
-}
-
-copyToDestdir($$valentina_path, $$shell_path($${OUT_PWD}/$$DESTDIR/tst_valentina))
-
-for(DIR, COLLECTION_FILES) {
-     #add these absolute paths to a variable which
-     #ends up as 'mkcommands = path1 path2 path3 ...'
-     collection_path += $$DIR
-}
-
-copyToDestdir($$collection_path, $$shell_path($${OUT_PWD}/$$DESTDIR/tst_valentina_collection))

src/test/ValentinaTest/qttestmainlambda.cpp

@@ -35,8 +35,6 @@
 #include "tst_vlayoutdetail.h"
 #include "tst_varc.h"
 #include "tst_vellipticalarc.h"
-#include "tst_tapecommandline.h"
-#include "tst_valentinacommandline.h"
 #include "tst_qmutokenparser.h"
 #include "tst_vmeasurements.h"
 #include "tst_vlockguard.h"
@@ -71,8 +69,6 @@ int main(int argc, char** argv)
     ASSERT_TEST(new TST_VLayoutDetail());
     ASSERT_TEST(new TST_VArc());
     ASSERT_TEST(new TST_VEllipticalArc());
-    ASSERT_TEST(new TST_TapeCommandLine());
-    ASSERT_TEST(new TST_ValentinaCommandLine());
     ASSERT_TEST(new TST_QmuTokenParser());
     ASSERT_TEST(new TST_VMeasurements());
     ASSERT_TEST(new TST_VLockGuard());

src/test/test.pro

@@ -2,4 +2,5 @@ TEMPLATE = subdirs
 SUBDIRS = \
     ParserTest \
     ValentinaTest \
-    TranslationsTest
+    TranslationsTest \
+    CollectionTest