aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@qt.io>2017-10-18 13:03:21 +0200
committerMarco Bubke <marco.bubke@qt.io>2017-10-21 13:39:31 +0000
commit2a410312730470641d2a2cc40f80ac4ee6316ba7 (patch)
treeb2f171ee17e4f30ae799fcd9c9721bd552320e35
parent9a61bf2a5fc8ca34b8ab7b886698dbf13b01400a (diff)
UnitTests: Add utility functions for test
Having a global temporaryDirPath makes changes much easier. Change-Id: Iec92bba7b7eca5b0e893ebee9f457734deba8cc8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--tests/unit/unittest/googletest.h2
-rw-r--r--tests/unit/unittest/sqlitedatabasebackend-test.cpp2
-rw-r--r--tests/unit/unittest/unittest-utility-functions.h39
-rw-r--r--tests/unit/unittest/unittest.pro3
4 files changed, 44 insertions, 2 deletions
diff --git a/tests/unit/unittest/googletest.h b/tests/unit/unittest/googletest.h
index 087a5c2bcb..550fdf4375 100644
--- a/tests/unit/unittest/googletest.h
+++ b/tests/unit/unittest/googletest.h
@@ -41,3 +41,5 @@
#include "google-using-declarations.h"
#include "unittest-matchers.h"
+
+#include "unittest-utility-functions.h"
diff --git a/tests/unit/unittest/sqlitedatabasebackend-test.cpp b/tests/unit/unittest/sqlitedatabasebackend-test.cpp
index 7663139f01..40227148bc 100644
--- a/tests/unit/unittest/sqlitedatabasebackend-test.cpp
+++ b/tests/unit/unittest/sqlitedatabasebackend-test.cpp
@@ -52,7 +52,7 @@ protected:
void SetUp() override;
void TearDown() override;
- Utils::PathString databaseFilePath = QDir::tempPath() + "/SqliteDatabaseBackendTest.db";
+ Utils::PathString databaseFilePath = UnitTest::temporaryDirPath() + "/SqliteDatabaseBackendTest.db";
Sqlite::Database database;
Sqlite::DatabaseBackend &databaseBackend = database.backend();
};
diff --git a/tests/unit/unittest/unittest-utility-functions.h b/tests/unit/unittest/unittest-utility-functions.h
new file mode 100644
index 0000000000..5fb9c25882
--- /dev/null
+++ b/tests/unit/unittest/unittest-utility-functions.h
@@ -0,0 +1,39 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include <utils/smallstring.h>
+
+#include <QDir>
+
+namespace UnitTest {
+
+inline
+Utils::PathString temporaryDirPath()
+{
+ return Utils::PathString::fromQString(QDir::tempPath());
+}
+} // namespace UnitTest
diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro
index e43f59758c..bbe866abb0 100644
--- a/tests/unit/unittest/unittest.pro
+++ b/tests/unit/unittest/unittest.pro
@@ -210,7 +210,8 @@ HEADERS += \
mockmutex.h \
mockfilepathstorage.h \
mockfilepathcaching.h \
- mocksqlitestatement.h
+ mocksqlitestatement.h \
+ unittest-utility-functions.h
!isEmpty(LIBCLANG_LIBS) {
HEADERS += \