aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2010-08-12 18:04:01 -0300
committerRenato Filho <renato.filho@openbossa.org>2010-08-16 18:42:52 -0300
commitf548708c9643481b023763aa25722a5a25a268e1 (patch)
treebeb320a64100129fc5dfe8fea8094c22e31b70f5 /tests
parent6e6e88c719568af17b0dcbd6584f7f1b6c9acc80 (diff)
Create unit test to function with ambiguous signature in Python side.
Reviewer: Hugo Parente Lima <hugo.pl@gmail.com> Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/libsample/null.h50
-rw-r--r--tests/libsample/objecttype.cpp17
-rw-r--r--tests/libsample/objecttype.h10
-rw-r--r--tests/samplebinding/null_conversions.h32
-rw-r--r--tests/samplebinding/objecttype_test.py7
-rw-r--r--tests/samplebinding/typesystem_sample.xml9
6 files changed, 124 insertions, 1 deletions
diff --git a/tests/libsample/null.h b/tests/libsample/null.h
new file mode 100644
index 00000000..ffddaafa
--- /dev/null
+++ b/tests/libsample/null.h
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the Shiboken Python Binding Generator project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * 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.
+ *
+ * As a special exception to the GNU Lesser General Public License
+ * version 2.1, the object code form of a "work that uses the Library"
+ * may incorporate material from a header file that is part of the
+ * Library. You may distribute such object code under terms of your
+ * choice, provided that the incorporated material (i) does not exceed
+ * more than 5% of the total size of the Library; and (ii) is limited to
+ * numerical parameters, data structure layouts, accessors, macros,
+ * inline functions and templates.
+ *
+ * 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
+ */
+
+#ifndef NULL_H
+#define NULL_H
+
+class Null
+{
+public:
+ Null(bool value) : m_isNull(value) {}
+ Null() : m_isNull(false) {}
+ void setIsNull(bool flag) { m_isNull = flag; }
+
+private:
+ bool m_isNull;
+};
+
+#endif // STR_H
+
diff --git a/tests/libsample/objecttype.cpp b/tests/libsample/objecttype.cpp
index 4c608037..d57dbedd 100644
--- a/tests/libsample/objecttype.cpp
+++ b/tests/libsample/objecttype.cpp
@@ -40,7 +40,7 @@
using namespace std;
-ObjectType::ObjectType(ObjectType* parent) : m_parent(0), m_layout(0)
+ObjectType::ObjectType(ObjectType* parent) : m_parent(0), m_layout(0), m_call_id(-1)
{
setParent(parent);
}
@@ -260,3 +260,18 @@ ObjectType::setObjectNameWithSize(const Str& name, int size)
setObjectNameWithSize("", size, name);
}
+void ObjectType::setObject(ObjectType *)
+{
+ m_call_id = 0;
+}
+
+void ObjectType::setObject(const Null&)
+{
+ m_call_id = 1;
+}
+
+int ObjectType::callId() const
+{
+ return m_call_id;
+}
+
diff --git a/tests/libsample/objecttype.h b/tests/libsample/objecttype.h
index 18454a12..9c0bb212 100644
--- a/tests/libsample/objecttype.h
+++ b/tests/libsample/objecttype.h
@@ -37,6 +37,7 @@
#include <list>
#include "str.h"
+#include "null.h"
#include "libsamplemacros.h"
@@ -105,6 +106,11 @@ public:
void setObjectNameWithSize(const char*, int size=9, const Str& name = Str("<unknown>"));
void setObjectNameWithSize(const Str& name = Str("<unknown>"), int size=9);
+ //Function used to comfuse the generator when two values accept Null as arg
+ void setObject(ObjectType *);
+ void setObject(const Null&);
+ int callId() const;
+
private:
ObjectType(const ObjectType&);
@@ -117,6 +123,10 @@ private:
ObjectTypeList m_children;
ObjectTypeLayout* m_layout;
+
+
+ //used on overload null test
+ int m_call_id;
};
LIBSAMPLE_API unsigned int objectTypeHash(const ObjectType* objectType);
diff --git a/tests/samplebinding/null_conversions.h b/tests/samplebinding/null_conversions.h
new file mode 100644
index 00000000..cbe159f8
--- /dev/null
+++ b/tests/samplebinding/null_conversions.h
@@ -0,0 +1,32 @@
+namespace Shiboken {
+template<>
+struct Converter<Null>
+{
+ static inline bool checkType(PyObject* pyObj)
+ {
+ return false;
+ }
+
+ static inline bool isConvertible(PyObject* pyObj)
+ {
+ if (pyObj == 0 || pyObj == Py_None)
+ return true;
+ return false;
+ }
+
+ static inline PyObject* toPython(void* cppobj)
+ {
+ Py_RETURN_NONE;
+ }
+
+ static inline PyObject* toPython(const Null& cpx)
+ {
+ Py_RETURN_NONE;
+ }
+
+ static inline Null toCpp(PyObject* pyobj)
+ {
+ return Null(pyobj == 0);
+ }
+};
+}
diff --git a/tests/samplebinding/objecttype_test.py b/tests/samplebinding/objecttype_test.py
index 958df1d5..2a0dbbdb 100644
--- a/tests/samplebinding/objecttype_test.py
+++ b/tests/samplebinding/objecttype_test.py
@@ -55,6 +55,13 @@ class ObjectTypeTest(unittest.TestCase):
o.setObjectName('object name')
self.assertEqual(str(o.objectName()), 'object name')
+ def testNullOverload(self):
+ o = ObjectType()
+ o.setObject(None)
+ self.assertEqual(o.callId(), 0)
+ o.setNullObject(None)
+ self.assertEqual(o.callId(), 1)
+
if __name__ == '__main__':
unittest.main()
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index 24b4ff87..b3e05d4e 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -17,6 +17,11 @@
<include file-name="complex.h" location="global"/>
</primitive-type>
+ <primitive-type name="Null">
+ <conversion-rule file="null_conversions.h"/>
+ <include file-name="null.h" location="global"/>
+ </primitive-type>
+
<primitive-type name="OddBool" target-lang-api-name="PyBool">
<conversion-rule file="oddbool_conversions.h"/>
<include file-name="oddbool.h" location="global"/>
@@ -117,6 +122,9 @@
<value-type name="Derived::SomeInnerClass" />
<object-type name="ObjectType" hash-function="objectTypeHash">
+ <!-- rename function to avoid Python signature conflit -->
+ <modify-function signature="setObject(const Null&amp;)" rename="setNullObject" />
+
<modify-function signature="event(Event*)">
<modify-argument index="1" invalidate-after-use="yes"/>
</modify-function>
@@ -199,6 +207,7 @@
</modify-function>
</object-type>
+
<value-type name="Event"/>
<value-type name="BlackBox">