From c5fd9d9dbb33bc4ddbf68315d6b15dc274f076cd Mon Sep 17 00:00:00 2001 From: Lauro Neto Date: Tue, 29 Mar 2011 17:26:57 -0300 Subject: Tests for reverse operators CPython calls nb_and with swapped arguments for reverse operators. This tests checks if the reverse operator raises NotImplementedError instead of TypeError when there isn't a valid reverse operator. Raising TypeError would cause the operator to fail. --- tests/libsample/CMakeLists.txt | 1 + tests/libsample/filter.cpp | 67 ++++++++++++++++++++++ tests/libsample/filter.h | 93 +++++++++++++++++++++++++++++++ tests/samplebinding/CMakeLists.txt | 4 ++ tests/samplebinding/filter_test.py | 18 ++++++ tests/samplebinding/global.h | 1 + tests/samplebinding/typesystem_sample.xml | 20 +++++++ 7 files changed, 204 insertions(+) create mode 100644 tests/libsample/filter.cpp create mode 100644 tests/libsample/filter.h create mode 100644 tests/samplebinding/filter_test.py diff --git a/tests/libsample/CMakeLists.txt b/tests/libsample/CMakeLists.txt index e1abe6a9b..b2ac420ce 100644 --- a/tests/libsample/CMakeLists.txt +++ b/tests/libsample/CMakeLists.txt @@ -37,6 +37,7 @@ str.cpp strlist.cpp virtualmethods.cpp expression.cpp +filter.cpp ) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/tests/libsample/filter.cpp b/tests/libsample/filter.cpp new file mode 100644 index 000000000..48a2b34e2 --- /dev/null +++ b/tests/libsample/filter.cpp @@ -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 + */ + +#include +#include "filter.h" +Data::Data(Field field, std::string value) + : m_field(field), m_value(value) +{ +} + +Union::Union(const Data& filter) +{ + m_filters.push_back(filter); +} + +Union::Union(const Intersection& filter) +{ + m_filters.push_back(filter); +} + +Union::Union(const Union& filter) +{ + m_filters = filter.filters(); +} + +Intersection::Intersection(const Data& filter) +{ + m_filters.push_back(filter); +} + +Intersection::Intersection(const Union& filter) +{ + m_filters.push_back(filter); +} + +Intersection::Intersection(const Intersection& filter) +{ + m_filters = filter.filters(); +} + +Intersection operator&(const Intersection& a, const Intersection& b) +{ + Intersection filter; + filter.addFilter(a); + filter.addFilter(b); + + return filter; +} diff --git a/tests/libsample/filter.h b/tests/libsample/filter.h new file mode 100644 index 000000000..79a7d342d --- /dev/null +++ b/tests/libsample/filter.h @@ -0,0 +1,93 @@ +/* + * 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 FILTER_H +#define FILTER_H + +#include +#include + +#include "libsamplemacros.h" + +class Intersection; + +class LIBSAMPLE_API Filter +{ +}; + +class LIBSAMPLE_API Data : public Filter +{ + +public: + enum Field { + Name, + Album, + Year + }; + + Data(Field field, std::string value); + + Field field() const { return m_field; } + std::string value() const { return m_value; } + +private: + Field m_field; + std::string m_value; +}; + +class LIBSAMPLE_API Union : public Filter +{ +public: + + Union(const Data&); + Union(const Intersection&); + Union() {}; + Union(const Union&); + + std::list filters() const { return m_filters; } + void addFilter(const Filter& data) { m_filters.push_back(data); } + +private: + std::list m_filters; +}; + +class LIBSAMPLE_API Intersection : public Filter +{ +public: + + Intersection(const Data&); + Intersection(const Union&); + Intersection() {}; + Intersection(const Intersection&); + + std::list filters() const { return m_filters; } + void addFilter(const Filter& data) { m_filters.push_back(data); } + +private: + std::list m_filters; +}; + +LIBSAMPLE_API Intersection operator&(const Intersection& a, const Intersection& b); + +#endif // FILTER_H + + diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt index e21c22864..f4244efed 100644 --- a/tests/samplebinding/CMakeLists.txt +++ b/tests/samplebinding/CMakeLists.txt @@ -86,6 +86,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualdtor_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualmethods_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/voidholder_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/valueandvirtual_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/sample/filter_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/sample/data_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/sample/intersection_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/sample/union_wrapper.cpp ) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sample-binding.txt.in" diff --git a/tests/samplebinding/filter_test.py b/tests/samplebinding/filter_test.py new file mode 100644 index 000000000..54da810cc --- /dev/null +++ b/tests/samplebinding/filter_test.py @@ -0,0 +1,18 @@ + +import unittest + +from sample import Data, Intersection, Union + +class TestFilters(unittest.TestCase): + + def testAnd(self): + + f1 = Data(Data.Name, "joe") + f2 = Union() + + inter = f1 & f2 + + self.assertEqual(type(inter), Intersection) + +if __name__ == '__main__': + unittest.main() diff --git a/tests/samplebinding/global.h b/tests/samplebinding/global.h index 18ad56466..f8781eef8 100644 --- a/tests/samplebinding/global.h +++ b/tests/samplebinding/global.h @@ -49,3 +49,4 @@ #include "voidholder.h" #include "valueandvirtual.h" #include "expression.h" +#include "filter.h" diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml index b5ffb5703..85187c53f 100644 --- a/tests/samplebinding/typesystem_sample.xml +++ b/tests/samplebinding/typesystem_sample.xml @@ -1297,6 +1297,26 @@ + + + + + Intersection inter = *%CPPSELF & %1; + return %CONVERTTOPYTHON[Intersection](inter); + + + + + + + + Intersection inter = *%CPPSELF & %1; + return %CONVERTTOPYTHON[Intersection](inter); + + + + + -- cgit v1.2.3