Adds tests for a class without implicit conversions being extended in another module.

One value type class, called NoImplicitConversion, without implicit
conversions of any kind is declared in the first library, libsample.
In the other library, libother, ExtendsNoImplicitConversion defines
a conversion operator to turn itself into a NoImplicitConversion class.
The unit tests tries to pass an ExtendsNoImplicitConversion object
where a NoImplicitConversion is expected.

9 files changed, 180 insertions, 0 deletions

diff --git a/tests/libother/extendsnoimplicitconversion.h b/tests/libother/extendsnoimplicitconversion.h
new file mode 100644
index 000000000..0a06482ec
--- /dev/null
+++ b/tests/libother/extendsnoimplicitconversion.h
@@ -0,0 +1,51 @@
+/*
+ * 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 EXTENDSNOIMPLICITCONVERSION_H
+#define EXTENDSNOIMPLICITCONVERSION_H
+
+#include "libothermacros.h"
+#include "noimplicitconversion.h"
+
+class LIBOTHER_API ExtendsNoImplicitConversion
+{
+public:
+    explicit ExtendsNoImplicitConversion(int objId) : m_objId(objId) {};
+    int objId() const { return m_objId; }
+    operator NoImplicitConversion() const { return NoImplicitConversion(m_objId); }
+private:
+    int m_objId;
+};
+#endif // EXTENDSNOIMPLICITCONVERSION_H
+
diff --git a/tests/libsample/noimplicitconversion.h b/tests/libsample/noimplicitconversion.h
new file mode 100644
index 000000000..7b3e898ae
--- /dev/null
+++ b/tests/libsample/noimplicitconversion.h
@@ -0,0 +1,55 @@
+/*
+ * 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 NOIMPLICITCONVERSION_H
+#define NOIMPLICITCONVERSION_H
+
+#include "libsamplemacros.h"
+
+// This class must not have implicit conversions AND
+// no conversion operators should be defined in its own module.
+class LIBSAMPLE_API NoImplicitConversion
+{
+public:
+    explicit NoImplicitConversion(int objId) : m_objId(objId) {}
+    int objId() const { return m_objId; }
+    static int receivesNoImplicitConversionByValue(NoImplicitConversion arg) { return arg.m_objId; }
+    static int receivesNoImplicitConversionByPointer(NoImplicitConversion* arg) { return arg->m_objId; }
+    static int receivesNoImplicitConversionByReference(NoImplicitConversion& arg) { return arg.m_objId; }
+private:
+    int m_objId;
+};
+
+#endif // NOIMPLICITCONVERSION_H
+
diff --git a/tests/otherbinding/CMakeLists.txt b/tests/otherbinding/CMakeLists.txt
index 500e8682a..06a5caa97 100644
--- a/tests/otherbinding/CMakeLists.txt
+++ b/tests/otherbinding/CMakeLists.txt
@@ -5,6 +5,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_other.xml
 )
 
 set(other_SRC
+${CMAKE_CURRENT_BINARY_DIR}/other/extendsnoimplicitconversion_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/other/number_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/other/otherderived_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/other/othermultiplederived_wrapper.cpp
diff --git a/tests/otherbinding/conversion_operator_for_class_without_implicit_conversions_test.py b/tests/otherbinding/conversion_operator_for_class_without_implicit_conversions_test.py
new file mode 100755
index 000000000..d69171fe3
--- /dev/null
+++ b/tests/otherbinding/conversion_operator_for_class_without_implicit_conversions_test.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# This file is part of the Shiboken Python Bindings 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.
+# #
+# 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
+
+'''Tests calling NoImplicitConversion using a ExtendsNoImplicitConversion parameter,
+   being that the latter defines a new conversion operator for the former, and this one
+   has no implicit conversions.'''
+
+import unittest
+
+from sample import NoImplicitConversion
+from other import ExtendsNoImplicitConversion
+
+class ConversionOperatorForClassWithoutImplicitConversionsTest(unittest.TestCase):
+    '''Tests calling NoImplicitConversion constructor using a ExtendsNoImplicitConversion parameter.'''
+
+    def testNoImplicitConversion(self):
+        '''Basic test to see if the NoImplicitConversion is Ok.'''
+        obj = NoImplicitConversion(123)
+        # NoImplicitConversion.receivesNoImplicitConversionByValue(NoImplicitConversion)
+        self.assertEqual(obj.objId(), NoImplicitConversion.receivesNoImplicitConversionByValue(obj))
+        # NoImplicitConversion.receivesNoImplicitConversionByPointer(NoImplicitConversion*)
+        self.assertEqual(obj.objId(), NoImplicitConversion.receivesNoImplicitConversionByPointer(obj))
+        # NoImplicitConversion.receivesNoImplicitConversionByReference(NoImplicitConversion&)
+        self.assertEqual(obj.objId(), NoImplicitConversion.receivesNoImplicitConversionByReference(obj))
+
+    def testPassingExtendsNoImplicitConversionAsNoImplicitConversionByValue(self):
+        '''Gives an ExtendsNoImplicitConversion object to a function expecting a NoImplicitConversion, passing by value.'''
+        obj = ExtendsNoImplicitConversion(123)
+        self.assertEqual(obj.objId(), NoImplicitConversion.receivesNoImplicitConversionByValue(obj))
+
+    def testPassingExtendsNoImplicitConversionAsNoImplicitConversionByReference(self):
+        '''Gives an ExtendsNoImplicitConversion object to a function expecting a NoImplicitConversion, passing by reference.'''
+        obj = ExtendsNoImplicitConversion(123)
+        self.assertEqual(obj.objId(), NoImplicitConversion.receivesNoImplicitConversionByReference(obj))
+
+    def testPassingExtendsNoImplicitConversionAsNoImplicitConversionByPointer(self):
+        '''Gives an ExtendsNoImplicitConversion object to a function expecting a NoImplicitConversion, passing by pointer.
+           This should not be accepted, since pointers should not be converted.'''
+        obj = ExtendsNoImplicitConversion(123)
+        self.assertRaises(TypeError, NoImplicitConversion.receivesNoImplicitConversionByPointer, obj)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/otherbinding/global.h b/tests/otherbinding/global.h
index 25276a982..8e5c0b0f4 100644
--- a/tests/otherbinding/global.h
+++ b/tests/otherbinding/global.h
@@ -1,4 +1,5 @@
 #include "../samplebinding/global.h"
+#include "extendsnoimplicitconversion.h"
 #include "number.h"
 #include "otherderived.h"
 #include "othermultiplederived.h"
diff --git a/tests/otherbinding/typesystem_other.xml b/tests/otherbinding/typesystem_other.xml
index 005334a39..58ec134b3 100644
--- a/tests/otherbinding/typesystem_other.xml
+++ b/tests/otherbinding/typesystem_other.xml
@@ -5,6 +5,7 @@
     <object-type name="OtherDerived" />
     <object-type name="OtherMultipleDerived" />
 
+    <value-type name="ExtendsNoImplicitConversion" />
     <value-type name="Number" />
 
 </typesystem>
diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt
index 9fa1ddc08..7510b5b3f 100644
--- a/tests/samplebinding/CMakeLists.txt
+++ b/tests/samplebinding/CMakeLists.txt
@@ -34,6 +34,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/mderived3_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/mderived4_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/mderived5_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/modifications_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/sample/noimplicitconversion_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/nondefaultctor_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/objecttype_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/objecttypelayout_wrapper.cpp
diff --git a/tests/samplebinding/global.h b/tests/samplebinding/global.h
index b442623e2..f54fb5166 100644
--- a/tests/samplebinding/global.h
+++ b/tests/samplebinding/global.h
@@ -13,6 +13,7 @@
 #include "mapuser.h"
 #include "modifications.h"
 #include "multiple_derived.h"
+#include "noimplicitconversion.h"
 #include "nondefaultctor.h"
 #include "objecttype.h"
 #include "objecttypelayout.h"
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index 597bed610..c3522b841 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -826,6 +826,7 @@
     <value-type name="MapUser"/>
     <value-type name="PairUser"/>
     <value-type name="ListUser"/>
+    <value-type name="NoImplicitConversion" />
     <value-type name="NonDefaultCtor" />
     <value-type name="OddBoolUser" />
     <value-type name="Overload">