diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-22 10:58:19 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-22 11:10:23 +0200 |
commit | 52c58bfc2247449c81b06e4122022355d4d1dcde (patch) | |
tree | 46a36e351b08e4307ff1ec3308869373cc0d9e5b /sources/pyside2/tests/QtCore | |
parent | 58a93d240c5bdd3bc60ccddbc31676bd0fa2eae3 (diff) | |
parent | 8aca0dec116c6b321373f5636b34036530ac6e4b (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Iddee2cf511ee0f0896a04a76e5b5b8bd44d1d6f1
Diffstat (limited to 'sources/pyside2/tests/QtCore')
-rw-r--r-- | sources/pyside2/tests/QtCore/CMakeLists.txt | 1 | ||||
-rw-r--r-- | sources/pyside2/tests/QtCore/qtimezone_test.py | 43 |
2 files changed, 44 insertions, 0 deletions
diff --git a/sources/pyside2/tests/QtCore/CMakeLists.txt b/sources/pyside2/tests/QtCore/CMakeLists.txt index f7eb86d16..b8b0ec143 100644 --- a/sources/pyside2/tests/QtCore/CMakeLists.txt +++ b/sources/pyside2/tests/QtCore/CMakeLists.txt @@ -102,6 +102,7 @@ PYSIDE_TEST(qthread_signal_test.py) PYSIDE_TEST(qthread_test.py) PYSIDE_TEST(qtimer_singleshot_test.py) PYSIDE_TEST(qtimer_timeout_test.py) +PYSIDE_TEST(qtimezone_test.py) PYSIDE_TEST(qtnamespace_test.py) PYSIDE_TEST(qurl_test.py) PYSIDE_TEST(qurlquery_test.py) diff --git a/sources/pyside2/tests/QtCore/qtimezone_test.py b/sources/pyside2/tests/QtCore/qtimezone_test.py new file mode 100644 index 000000000..e0bebdfbf --- /dev/null +++ b/sources/pyside2/tests/QtCore/qtimezone_test.py @@ -0,0 +1,43 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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. +## +## $QT_END_LICENSE$ +## +############################################################################# + +import unittest + +from PySide2.QtCore import QTimeZone + +class TestQTimeZone (unittest.TestCase): + def testTimeZone(self): + id = 'Europe/Berlin' + timeZone = QTimeZone(id) + self.assertTrue(timeZone.isValid()) + self.assertEqual(timeZone.id(), id) + name = timeZone.displayName(QTimeZone.GenericTime, QTimeZone.DefaultName) + self.assertTrue(name) + +if __name__ == '__main__': + unittest.main() |