From 6f46f59f67c0d90fa184d9baf0c7a3f29d9e9865 Mon Sep 17 00:00:00 2001 From: Marcelo Lira Date: Sat, 6 Aug 2011 23:13:56 -0300 Subject: Added tests for classes that are typedefs that implement a template class. This simulates the situation found in Qt's phonon module. --- tests/libsample/CMakeLists.txt | 1 + tests/libsample/photon.cpp | 35 ++++++++++ tests/libsample/photon.h | 67 +++++++++++++++++++ tests/samplebinding/CMakeLists.txt | 3 + tests/samplebinding/global.h | 1 + .../samplebinding/templateinheritingclass_test.py | 75 ++++++++++++++++++++++ tests/samplebinding/typesystem_sample.xml | 7 ++ 7 files changed, 189 insertions(+) create mode 100644 tests/libsample/photon.cpp create mode 100644 tests/libsample/photon.h create mode 100644 tests/samplebinding/templateinheritingclass_test.py (limited to 'tests') diff --git a/tests/libsample/CMakeLists.txt b/tests/libsample/CMakeLists.txt index cc568c986..9148281ef 100644 --- a/tests/libsample/CMakeLists.txt +++ b/tests/libsample/CMakeLists.txt @@ -26,6 +26,7 @@ objectview.cpp overload.cpp overloadsort.cpp pairuser.cpp +photon.cpp point.cpp pointf.cpp polygon.cpp diff --git a/tests/libsample/photon.cpp b/tests/libsample/photon.cpp new file mode 100644 index 000000000..6467f6cc0 --- /dev/null +++ b/tests/libsample/photon.cpp @@ -0,0 +1,35 @@ +/* + * This file is part of the Shiboken Python Binding Generator project. + * + * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). + * + * Contact: PySide team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "photon.h" + +namespace Photon +{ +int callCalculateForValueDuplicatorPointer(ValueDuplicator* value) +{ + return value->calculate(); +} +int callCalculateForValueDuplicatorReference(ValueDuplicator& value) +{ + return value.calculate(); +} +} // namespace Photon diff --git a/tests/libsample/photon.h b/tests/libsample/photon.h new file mode 100644 index 000000000..8707c71af --- /dev/null +++ b/tests/libsample/photon.h @@ -0,0 +1,67 @@ +/* + * This file is part of the Shiboken Python Binding Generator project. + * + * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). + * + * Contact: PySide team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef PHOTON_H +#define PHOTON_H + +#include "libsamplemacros.h" + +// This namespace and classes simulate +// situations found in Qt's phonon module. + +namespace Photon +{ + +enum ClassType { + IdentityType = 1, + DuplicatorType = 2 +}; + +template +class LIBSAMPLE_API TemplateBase +{ +public: + explicit TemplateBase(int value) : m_value(value) {} + inline void setValue(int value) { m_value = value; } + inline int value() const { return m_value; } + inline int multiplicator() const { return (int)CLASS_TYPE; } + inline int calculate() const { return m_value * ((int)CLASS_TYPE); } + static inline ClassType classType() { return CLASS_TYPE; } + + inline int sumValueUsingPointer(TemplateBase* other) const { return m_value + other->m_value; } + inline int sumValueUsingReference(TemplateBase& other) const { return m_value + other.m_value; } + + static inline TemplateBase* passPointerThrough(TemplateBase* obj) { return obj; } +private: + TemplateBase(const TemplateBase&); + TemplateBase& operator=(const TemplateBase&); + int m_value; +}; + +typedef TemplateBase ValueIdentity; +typedef TemplateBase ValueDuplicator; +LIBSAMPLE_API int callCalculateForValueDuplicatorPointer(ValueDuplicator* value); +LIBSAMPLE_API int callCalculateForValueDuplicatorReference(ValueDuplicator& value); + +} // namespace Photon + +#endif // PHOTON_H diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt index 382b9d13e..7a8ab7e88 100644 --- a/tests/samplebinding/CMakeLists.txt +++ b/tests/samplebinding/CMakeLists.txt @@ -58,6 +58,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/overload2_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/pairuser_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/pen_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/persistentmodelindex_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/sample/photon_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/sample/photon_valueidentity_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/sample/photon_valueduplicator_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/point_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/pointf_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/pointerholder_wrapper.cpp diff --git a/tests/samplebinding/global.h b/tests/samplebinding/global.h index 8b9b44ec4..a4736a784 100644 --- a/tests/samplebinding/global.h +++ b/tests/samplebinding/global.h @@ -33,6 +33,7 @@ #include "overload.h" #include "pairuser.h" #include "pen.h" +#include "photon.h" #include "point.h" #include "pointf.h" #include "pointerholder.h" diff --git a/tests/samplebinding/templateinheritingclass_test.py b/tests/samplebinding/templateinheritingclass_test.py new file mode 100644 index 000000000..d3741642f --- /dev/null +++ b/tests/samplebinding/templateinheritingclass_test.py @@ -0,0 +1,75 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# This file is part of the Shiboken Python Bindings Generator project. +# +# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +# +# Contact: PySide team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License +# version 2.1 as published by the Free Software Foundation. Please +# review the following information to ensure the GNU Lesser General +# Public License version 2.1 requirements will be met: +# http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +# # +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA + +import unittest +from sample import Photon + +'''This tests classes that inherit from template classes, +simulating a situation found in Qt's phonon module.''' + +class TemplateInheritingClassTest(unittest.TestCase): + def testClassBasics(self): + self.assertEqual(Photon.ValueIdentity.classType(), Photon.IdentityType) + self.assertEqual(Photon.ValueDuplicator.classType(), Photon.DuplicatorType) + + def testInstanceBasics(self): + value = 123 + samer = Photon.ValueIdentity(value) + self.assertEqual(samer.multiplicator(), 1) + doubler = Photon.ValueDuplicator(value) + self.assertEqual(doubler.multiplicator(), 2) + self.assertEqual(samer.value(), doubler.value()) + self.assertEqual(samer.calculate() * 2, doubler.calculate()) + + def testPassToFunctionAsPointer(self): + obj = Photon.ValueDuplicator(123) + self.assertEqual(Photon.callCalculateForValueDuplicatorPointer(obj), obj.calculate()) + + def testPassToFunctionAsReference(self): + obj = Photon.ValueDuplicator(321) + self.assertEqual(Photon.callCalculateForValueDuplicatorReference(obj), obj.calculate()) + + def testPassToMethodAsValue(self): + value1, value2 = 123, 321 + one = Photon.ValueIdentity(value1) + other = Photon.ValueIdentity(value2) + self.assertEqual(one.sumValueUsingPointer(other), value1 + value2) + + def testPassToMethodAsReference(self): + value1, value2 = 123, 321 + one = Photon.ValueDuplicator(value1) + other = Photon.ValueDuplicator(value2) + self.assertEqual(one.sumValueUsingReference(other), value1 + value2) + + def testPassPointerThrough(self): + obj1 = Photon.ValueIdentity(123) + self.assertEqual(obj1, obj1.passPointerThrough(obj1)) + obj2 = Photon.ValueDuplicator(321) + self.assertEqual(obj2, obj2.passPointerThrough(obj2)) + self.assertRaises(TypeError, obj1.passPointerThrough, obj2) + +if __name__ == '__main__': + unittest.main() diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml index 3e910ccc6..d52fdbe80 100644 --- a/tests/samplebinding/typesystem_sample.xml +++ b/tests/samplebinding/typesystem_sample.xml @@ -170,6 +170,13 @@ + + + + + + + -- cgit v1.2.3