From 407df30afa155c9e0195a25ba16827385e507314 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 14 Oct 2020 10:19:53 +0200 Subject: Add a test for typesystem typedefs Mimicks some template which might be used trying to enforce correctness of units by type checking. Task-number: PYSIDE-725 Change-Id: Ia7008d7db5638920eee3d0ef36cc32a63796b98e Reviewed-by: Cristian Maureira-Fredes --- sources/shiboken2/tests/libsample/CMakeLists.txt | 1 + .../shiboken2/tests/libsample/typesystypedef.cpp | 37 ++++++++++++++ sources/shiboken2/tests/libsample/typesystypedef.h | 57 ++++++++++++++++++++++ .../shiboken2/tests/samplebinding/CMakeLists.txt | 3 ++ sources/shiboken2/tests/samplebinding/global.h | 1 + .../tests/samplebinding/typesystem_sample.xml | 6 +++ .../tests/samplebinding/typesystypedef_test.py | 56 +++++++++++++++++++++ 7 files changed, 161 insertions(+) create mode 100644 sources/shiboken2/tests/libsample/typesystypedef.cpp create mode 100644 sources/shiboken2/tests/libsample/typesystypedef.h create mode 100644 sources/shiboken2/tests/samplebinding/typesystypedef_test.py (limited to 'sources') diff --git a/sources/shiboken2/tests/libsample/CMakeLists.txt b/sources/shiboken2/tests/libsample/CMakeLists.txt index 06021cec4..3bf119e9f 100644 --- a/sources/shiboken2/tests/libsample/CMakeLists.txt +++ b/sources/shiboken2/tests/libsample/CMakeLists.txt @@ -48,6 +48,7 @@ str.cpp strlist.cpp templateptr.cpp transform.cpp +typesystypedef.cpp virtualmethods.cpp expression.cpp filter.cpp diff --git a/sources/shiboken2/tests/libsample/typesystypedef.cpp b/sources/shiboken2/tests/libsample/typesystypedef.cpp new file mode 100644 index 000000000..16777bf32 --- /dev/null +++ b/sources/shiboken2/tests/libsample/typesystypedef.cpp @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of Qt for Python. +** +** $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$ +** +****************************************************************************/ + +#include "typesystypedef.h" + +ValueWithUnitUser::ValueWithUnitUser() = default; + +ValueWithUnit + ValueWithUnitUser::doubleInchToMillimeter(ValueWithUnit v) +{ + return ValueWithUnit(v.value() * 254); +} diff --git a/sources/shiboken2/tests/libsample/typesystypedef.h b/sources/shiboken2/tests/libsample/typesystypedef.h new file mode 100644 index 000000000..228381c5f --- /dev/null +++ b/sources/shiboken2/tests/libsample/typesystypedef.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of Qt for Python. +** +** $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$ +** +****************************************************************************/ + +#ifndef TYPESYSTYPEDEF_H +#define TYPESYSTYPEDEF_H + +#include "libsamplemacros.h" + +enum class LengthUnit { Millimeter, Inch }; + +template +class ValueWithUnit +{ + public: + explicit ValueWithUnit(T value = {}) : m_value(value) {} + + T value() const { return m_value; } + void setValue(const T &value) { m_value = value; } + +private: + T m_value; +}; + +class LIBSAMPLE_API ValueWithUnitUser +{ +public: + ValueWithUnitUser(); + + static ValueWithUnit doubleInchToMillimeter(ValueWithUnit); +}; + +#endif // TYPESYSTYPEDEF_H diff --git a/sources/shiboken2/tests/samplebinding/CMakeLists.txt b/sources/shiboken2/tests/samplebinding/CMakeLists.txt index 6bbfdb5bc..5e4478582 100644 --- a/sources/shiboken2/tests/samplebinding/CMakeLists.txt +++ b/sources/shiboken2/tests/samplebinding/CMakeLists.txt @@ -117,6 +117,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/strlist_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/time_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/templateptr_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/unremovednamespace_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/sample/valuewithunitdoubleinch_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/sample/valuewithunitdoublemillimeter_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/sample/valuewithunituser_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualdaughter_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualdaughter2_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualfinaldaughter_wrapper.cpp diff --git a/sources/shiboken2/tests/samplebinding/global.h b/sources/shiboken2/tests/samplebinding/global.h index f4e20b74f..0a168099b 100644 --- a/sources/shiboken2/tests/samplebinding/global.h +++ b/sources/shiboken2/tests/samplebinding/global.h @@ -86,6 +86,7 @@ #include "sometime.h" #include "templateptr.h" #include "transform.h" +#include "typesystypedef.h" #include "virtualmethods.h" #include "voidholder.h" #include "valueandvirtual.h" diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml index 7931c5a8d..595afb9ae 100644 --- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml +++ b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml @@ -2465,6 +2465,12 @@ + + + + + + diff --git a/sources/shiboken2/tests/samplebinding/typesystypedef_test.py b/sources/shiboken2/tests/samplebinding/typesystypedef_test.py new file mode 100644 index 000000000..30ac1c900 --- /dev/null +++ b/sources/shiboken2/tests/samplebinding/typesystypedef_test.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +############################################################################# +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of Qt for Python. +## +## $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$ +## +############################################################################# + +'''Test case for a class that holds a void pointer.''' + +import os +import sys +import unittest + +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +from shiboken_paths import init_paths +init_paths() + +from sample import (ValueWithUnitUser, ValueWithUnitDoubleInch, + ValueWithUnitDoubleMillimeter) + + +class TypeSysTypeDefTest(unittest.TestCase): + '''Test case type system typedefs.''' + + def test(self): + inch_value = ValueWithUnitDoubleInch(10) + mm_value = ValueWithUnitUser.doubleInchToMillimeter(inch_value) + self.assertEqual(int(mm_value.value()), 2540) + + +if __name__ == '__main__': + unittest.main() -- cgit v1.2.3