diff options
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | tests/auto/util/tst_util.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/util/util.pro | 12 | ||||
| -rw-r--r-- | tests/tests.pri | 2 |
4 files changed, 16 insertions, 6 deletions
diff --git a/src/src.pro b/src/src.pro index 0835d301..841dc58d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -15,7 +15,7 @@ macx { TARGET = qtpass } -SOURCES += main.cpp\ +SOURCES += main.cpp \ mainwindow.cpp \ configdialog.cpp \ storemodel.cpp \ diff --git a/tests/auto/util/tst_util.cpp b/tests/auto/util/tst_util.cpp index 9788bddb..76d84405 100644 --- a/tests/auto/util/tst_util.cpp +++ b/tests/auto/util/tst_util.cpp @@ -1,5 +1,6 @@ #include "../../../src/util.h" -#include <QtTest/QtTest> +#include <QCoreApplication> +#include <QtTest> class tst_util : public QObject { Q_OBJECT @@ -31,7 +32,8 @@ void tst_util::initTestCase() {} void tst_util::cleanupTestCase() {} void tst_util::normalizeFolderPath() { - // QCOMPARE(Util::normalizeFolderPath("test"), "test/"); + QCOMPARE(Util::normalizeFolderPath("test"), QString("test/")); + QCOMPARE(Util::normalizeFolderPath("test/"), QString("test/")); } QTEST_MAIN(tst_util) diff --git a/tests/auto/util/util.pro b/tests/auto/util/util.pro index d9f4ef02..d5a395e9 100644 --- a/tests/auto/util/util.pro +++ b/tests/auto/util/util.pro @@ -1,3 +1,13 @@ !include(../auto.pri) { error("Couldn't find the auto.pri file!") } -SOURCES += tst_util.cpp +SOURCES += tst_util.cpp \ + util.cpp \ + settingsconstants.cpp \ + qtpasssettings.cpp + +HEADERS += qtpasssettings.h \ + settingsconstants.h \ + util.h + +VPATH += ../../../src +INCLUDEPATH += ../../../src diff --git a/tests/tests.pri b/tests/tests.pri index 248c55e8..951bc957 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -6,5 +6,3 @@ QT += testlib widgets target.path = $$[QT_INSTALL_TESTS]/qtpass/$$TARGET INSTALLS += target -VPATH += ../src -INCLUDEPATH += ../src |