Move unit tests from ./tests to ./tests/unittests

tony-gm · Jul 29, 2018 · 8c7ec77 · 8c7ec77
1 parent ff39e67
commit 8c7ec77
Show file tree

Hide file tree

Showing 30 changed files with 105 additions and 94 deletions.
diff --git a/tests/README.md b/tests/README.md
@@ -1,3 +1,6 @@
-# Unit/Integration Tests
+# LibrePCB Tests
 
-This directory contains unit/integration tests (as qmake projects) for all static libraries. Google Mock (gmock) is used as testing framework.
+This directory contains tests for LibrePCB. Purpose of subdirectories:
+
+- `data`: Data files (for example LibrePCB projects) used for the tests.
+- `unittests`: Unit/integration tests for all static libraries of LibrePCB.
diff --git a/tests/tests.pro b/tests/tests.pro
@@ -1,93 +1,4 @@
-#-------------------------------------------------
-#
-# Project created 2014-08-02
-#
-#-------------------------------------------------
-
-TEMPLATE = app
-TARGET = tests
-
-# Use common project definitions
-include(../common.pri)
-
-# Set preprocessor defines
-DEFINES += TEST_DATA_DIR=\\\"$${PWD}/data\\\"
-
-QT += core widgets network printsupport xml opengl sql concurrent
-
-CONFIG += console
-CONFIG -= app_bundle
-
-LIBS += \
-    -L$${DESTDIR} \
-    -lgoogletest \
-    -llibrepcbeagleimport \
-    -llibrepcbworkspace \
-    -llibrepcbproject \
-    -llibrepcblibrary \    # Note: The order of the libraries is very important for the linker!
-    -llibrepcbcommon \     # Another order could end up in "undefined reference" errors!
-    -lsexpresso \
-    -lclipper \
-    -lparseagle -lquazip -lz
-
-INCLUDEPATH += \
-    ../libs/googletest/googletest/include \
-    ../libs/googletest/googlemock/include \
-    ../libs/parseagle \
-    ../libs/quazip \
-    ../libs \
-
-DEPENDPATH += \
-    ../libs/librepcb/eagleimport \
-    ../libs/librepcb/workspace \
-    ../libs/librepcb/project \
-    ../libs/librepcb/library \
-    ../libs/librepcb/common \
-    ../libs/parseagle \
-    ../libs/quazip \
-    ../libs/sexpresso \
-    ../libs/clipper \
-
-PRE_TARGETDEPS += \
-    $${DESTDIR}/libgoogletest.a \
-    $${DESTDIR}/liblibrepcbeagleimport.a \
-    $${DESTDIR}/liblibrepcbworkspace.a \
-    $${DESTDIR}/liblibrepcbproject.a \
-    $${DESTDIR}/liblibrepcblibrary.a \
-    $${DESTDIR}/liblibrepcbcommon.a \
-    $${DESTDIR}/libquazip.a \
-    $${DESTDIR}/libsexpresso.a \
-    $${DESTDIR}/libclipper.a \
-
-SOURCES += \
-    common/applicationtest.cpp \
-    common/attributes/attributesubstitutortest.cpp \
-    common/directorylocktest.cpp \
-    common/filedownloadtest.cpp \
-    common/fileio/serializableobjectlisttest.cpp \
-    common/filepathtest.cpp \
-    common/networkrequesttest.cpp \
-    common/pointtest.cpp \
-    common/ratiotest.cpp \
-    common/scopeguardtest.cpp \
-    common/sqlitedatabasetest.cpp \
-    common/systeminfotest.cpp \
-    common/toolboxtest.cpp \
-    common/uuidtest.cpp \
-    common/versiontest.cpp \
-    eagleimport/deviceconvertertest.cpp \
-    eagleimport/devicesetconvertertest.cpp \
-    eagleimport/packageconvertertest.cpp \
-    eagleimport/symbolconvertertest.cpp \
-    main.cpp \
-    project/boards/boardplanefragmentsbuildertest.cpp \
-    project/projecttest.cpp \
-    workspace/workspacetest.cpp \
-
-HEADERS += \
-    common/attributes/attributeproviderdummy.h \
-    common/fileio/serializableobjectmock.h \
-    common/networkrequestbasesignalreceiver.h \
-
-FORMS += \
+TEMPLATE = subdirs
 
+SUBDIRS = \
+    unittests \
diff --git a/tests/unittests/README.md b/tests/unittests/README.md
@@ -0,0 +1,4 @@
+# Unit/Integration Tests
+
+This directory contains unit/integration tests for all static libraries.
+Google Test (gtest) is used as testing framework.
diff --git a/tests/common/applicationtest.cpp → tests/unittests/common/applicationtest.cpp b/tests/common/applicationtest.cpp → tests/unittests/common/applicationtest.cpp
diff --git a/...ommon/attributes/attributeproviderdummy.h → ...ommon/attributes/attributeproviderdummy.h b/...ommon/attributes/attributeproviderdummy.h → ...ommon/attributes/attributeproviderdummy.h
diff --git a/...n/attributes/attributesubstitutortest.cpp → ...n/attributes/attributesubstitutortest.cpp b/...n/attributes/attributesubstitutortest.cpp → ...n/attributes/attributesubstitutortest.cpp
diff --git a/tests/common/directorylocktest.cpp → tests/unittests/common/directorylocktest.cpp b/tests/common/directorylocktest.cpp → tests/unittests/common/directorylocktest.cpp
diff --git a/tests/common/filedownloadtest.cpp → tests/unittests/common/filedownloadtest.cpp b/tests/common/filedownloadtest.cpp → tests/unittests/common/filedownloadtest.cpp
diff --git a/...mon/fileio/serializableobjectlisttest.cpp → ...mon/fileio/serializableobjectlisttest.cpp b/...mon/fileio/serializableobjectlisttest.cpp → ...mon/fileio/serializableobjectlisttest.cpp
diff --git a/tests/common/fileio/serializableobjectmock.h → ...ts/common/fileio/serializableobjectmock.h b/tests/common/fileio/serializableobjectmock.h → ...ts/common/fileio/serializableobjectmock.h
diff --git a/tests/common/filepathtest.cpp → tests/unittests/common/filepathtest.cpp b/tests/common/filepathtest.cpp → tests/unittests/common/filepathtest.cpp
diff --git a/...common/networkrequestbasesignalreceiver.h → ...common/networkrequestbasesignalreceiver.h b/...common/networkrequestbasesignalreceiver.h → ...common/networkrequestbasesignalreceiver.h
diff --git a/tests/common/networkrequesttest.cpp → ...s/unittests/common/networkrequesttest.cpp b/tests/common/networkrequesttest.cpp → ...s/unittests/common/networkrequesttest.cpp
diff --git a/tests/common/pointtest.cpp → tests/unittests/common/pointtest.cpp b/tests/common/pointtest.cpp → tests/unittests/common/pointtest.cpp
diff --git a/tests/common/ratiotest.cpp → tests/unittests/common/ratiotest.cpp b/tests/common/ratiotest.cpp → tests/unittests/common/ratiotest.cpp
diff --git a/tests/common/scopeguardtest.cpp → tests/unittests/common/scopeguardtest.cpp b/tests/common/scopeguardtest.cpp → tests/unittests/common/scopeguardtest.cpp
diff --git a/tests/common/sqlitedatabasetest.cpp → ...s/unittests/common/sqlitedatabasetest.cpp b/tests/common/sqlitedatabasetest.cpp → ...s/unittests/common/sqlitedatabasetest.cpp
diff --git a/tests/common/systeminfotest.cpp → tests/unittests/common/systeminfotest.cpp b/tests/common/systeminfotest.cpp → tests/unittests/common/systeminfotest.cpp
diff --git a/tests/common/toolboxtest.cpp → tests/unittests/common/toolboxtest.cpp b/tests/common/toolboxtest.cpp → tests/unittests/common/toolboxtest.cpp
diff --git a/tests/common/uuidtest.cpp → tests/unittests/common/uuidtest.cpp b/tests/common/uuidtest.cpp → tests/unittests/common/uuidtest.cpp
diff --git a/tests/common/versiontest.cpp → tests/unittests/common/versiontest.cpp b/tests/common/versiontest.cpp → tests/unittests/common/versiontest.cpp
diff --git a/tests/eagleimport/deviceconvertertest.cpp → ...tests/eagleimport/deviceconvertertest.cpp b/tests/eagleimport/deviceconvertertest.cpp → ...tests/eagleimport/deviceconvertertest.cpp
diff --git a/tests/eagleimport/devicesetconvertertest.cpp → ...ts/eagleimport/devicesetconvertertest.cpp b/tests/eagleimport/devicesetconvertertest.cpp → ...ts/eagleimport/devicesetconvertertest.cpp
diff --git a/tests/eagleimport/packageconvertertest.cpp → ...ests/eagleimport/packageconvertertest.cpp b/tests/eagleimport/packageconvertertest.cpp → ...ests/eagleimport/packageconvertertest.cpp
diff --git a/tests/eagleimport/symbolconvertertest.cpp → ...tests/eagleimport/symbolconvertertest.cpp b/tests/eagleimport/symbolconvertertest.cpp → ...tests/eagleimport/symbolconvertertest.cpp
diff --git a/tests/main.cpp → tests/unittests/main.cpp b/tests/main.cpp → tests/unittests/main.cpp
diff --git a/...boards/boardplanefragmentsbuildertest.cpp → ...boards/boardplanefragmentsbuildertest.cpp b/...boards/boardplanefragmentsbuildertest.cpp → ...boards/boardplanefragmentsbuildertest.cpp
diff --git a/tests/project/projecttest.cpp → tests/unittests/project/projecttest.cpp b/tests/project/projecttest.cpp → tests/unittests/project/projecttest.cpp
diff --git a/tests/unittests/unittests.pro b/tests/unittests/unittests.pro
@@ -0,0 +1,93 @@
+#-------------------------------------------------
+#
+# Project created 2014-08-02
+#
+#-------------------------------------------------
+
+TEMPLATE = app
+TARGET = tests
+
+# Use common project definitions
+include(../../common.pri)
+
+# Set preprocessor defines
+DEFINES += TEST_DATA_DIR=\\\"$${PWD}/../data\\\"
+
+QT += core widgets network printsupport xml opengl sql concurrent
+
+CONFIG += console
+CONFIG -= app_bundle
+
+LIBS += \
+    -L$${DESTDIR} \
+    -lgoogletest \
+    -llibrepcbeagleimport \
+    -llibrepcbworkspace \
+    -llibrepcbproject \
+    -llibrepcblibrary \    # Note: The order of the libraries is very important for the linker!
+    -llibrepcbcommon \     # Another order could end up in "undefined reference" errors!
+    -lsexpresso \
+    -lclipper \
+    -lparseagle -lquazip -lz
+
+INCLUDEPATH += \
+    ../../libs/googletest/googletest/include \
+    ../../libs/googletest/googlemock/include \
+    ../../libs/parseagle \
+    ../../libs/quazip \
+    ../../libs \
+
+DEPENDPATH += \
+    ../../libs/librepcb/eagleimport \
+    ../../libs/librepcb/workspace \
+    ../../libs/librepcb/project \
+    ../../libs/librepcb/library \
+    ../../libs/librepcb/common \
+    ../../libs/parseagle \
+    ../../libs/quazip \
+    ../../libs/sexpresso \
+    ../../libs/clipper \
+
+PRE_TARGETDEPS += \
+    $${DESTDIR}/libgoogletest.a \
+    $${DESTDIR}/liblibrepcbeagleimport.a \
+    $${DESTDIR}/liblibrepcbworkspace.a \
+    $${DESTDIR}/liblibrepcbproject.a \
+    $${DESTDIR}/liblibrepcblibrary.a \
+    $${DESTDIR}/liblibrepcbcommon.a \
+    $${DESTDIR}/libquazip.a \
+    $${DESTDIR}/libsexpresso.a \
+    $${DESTDIR}/libclipper.a \
+
+SOURCES += \
+    common/applicationtest.cpp \
+    common/attributes/attributesubstitutortest.cpp \
+    common/directorylocktest.cpp \
+    common/filedownloadtest.cpp \
+    common/fileio/serializableobjectlisttest.cpp \
+    common/filepathtest.cpp \
+    common/networkrequesttest.cpp \
+    common/pointtest.cpp \
+    common/ratiotest.cpp \
+    common/scopeguardtest.cpp \
+    common/sqlitedatabasetest.cpp \
+    common/systeminfotest.cpp \
+    common/toolboxtest.cpp \
+    common/uuidtest.cpp \
+    common/versiontest.cpp \
+    eagleimport/deviceconvertertest.cpp \
+    eagleimport/devicesetconvertertest.cpp \
+    eagleimport/packageconvertertest.cpp \
+    eagleimport/symbolconvertertest.cpp \
+    main.cpp \
+    project/boards/boardplanefragmentsbuildertest.cpp \
+    project/projecttest.cpp \
+    workspace/workspacetest.cpp \
+
+HEADERS += \
+    common/attributes/attributeproviderdummy.h \
+    common/fileio/serializableobjectmock.h \
+    common/networkrequestbasesignalreceiver.h \
+
+FORMS += \
+
diff --git a/tests/workspace/workspacetest.cpp → tests/unittests/workspace/workspacetest.cpp b/tests/workspace/workspacetest.cpp → tests/unittests/workspace/workspacetest.cpp