added the SimpleFile class to the sample library to check how a

method returning a boolean value that indicates success/failure
on a IO operation could be modified to express the any occurring
problems as Python exceptions (in this case IOError);
the generator was changed to return a 'None' value for Python
callers on methods that had it's return value removed

8 files changed, 239 insertions, 0 deletions

diff --git a/tests/libsample/CMakeLists.txt b/tests/libsample/CMakeLists.txt
index 3a3aef497..869b95b47 100644
--- a/tests/libsample/CMakeLists.txt
+++ b/tests/libsample/CMakeLists.txt
@@ -15,6 +15,7 @@ pairuser.cpp
 point.cpp
 reference.cpp
 samplenamespace.cpp
+simplefile.cpp
 size.cpp
 virtualmethods.cpp
 )
diff --git a/tests/libsample/simplefile.cpp b/tests/libsample/simplefile.cpp
new file mode 100644
index 000000000..46844559e
--- /dev/null
+++ b/tests/libsample/simplefile.cpp
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the Shiboken Python Binding Generator project.
+ *
+ * Copyright (C) 2009 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
+ */
+
+#include "simplefile.h"
+
+bool
+SimpleFile::open()
+{
+    if ((m_descriptor = fopen(m_filename, "rb")) == 0)
+        return false;
+
+    fseek(m_descriptor, 0, SEEK_END);
+    m_size = ftell(m_descriptor);
+    rewind(m_descriptor);
+
+    return true;
+}
+
+void
+SimpleFile::close()
+{
+    if (m_descriptor) {
+        fclose(m_descriptor);
+        m_descriptor = 0;
+    }
+}
+
diff --git a/tests/libsample/simplefile.h b/tests/libsample/simplefile.h
new file mode 100644
index 000000000..e709557d2
--- /dev/null
+++ b/tests/libsample/simplefile.h
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the Shiboken Python Binding Generator project.
+ *
+ * Copyright (C) 2009 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 SIMPLEFILE_H
+#define SIMPLEFILE_H
+
+#include <stdio.h>
+
+class SimpleFile
+{
+public:
+    explicit SimpleFile(const char* filename)
+        : m_filename(filename), m_descriptor(0), m_size(0)
+    {
+        printf("[%s] filename: %s\n", __PRETTY_FUNCTION__, m_filename);
+    }
+
+    ~SimpleFile()
+    {
+        this->close();
+    }
+
+    const char* filename()
+    {
+        return m_filename;
+    }
+
+    long size()
+    {
+        return m_size;
+    }
+
+    int fileno()
+    {
+        if (m_descriptor)
+            return m_descriptor->_fileno;
+        return -1;
+    }
+
+    bool open();
+    void close();
+
+private:
+    const char* m_filename;
+    FILE* m_descriptor;
+    long m_size;
+};
+
+#endif // SIMPLEFILE_H
+
diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt
index fc2a47b92..4e53c84a1 100644
--- a/tests/samplebinding/CMakeLists.txt
+++ b/tests/samplebinding/CMakeLists.txt
@@ -23,6 +23,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/privatedtor_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/reference_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/sample_module_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/samplenamespace_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/sample/simplefile_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/size_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualmethods_wrapper.cpp
 )
diff --git a/tests/samplebinding/global.h b/tests/samplebinding/global.h
index 4e9ee4510..19aa1fe64 100644
--- a/tests/samplebinding/global.h
+++ b/tests/samplebinding/global.h
@@ -10,6 +10,7 @@
 #include "mapuser.h"
 #include "multiple_derived.h"
 #include "samplenamespace.h"
+#include "simplefile.h"
 #include "modifications.h"
 #include "implicitconv.h"
 #include "reference.h"
diff --git a/tests/samplebinding/simplefile_glue.cpp b/tests/samplebinding/simplefile_glue.cpp
new file mode 100644
index 000000000..118ec945c
--- /dev/null
+++ b/tests/samplebinding/simplefile_glue.cpp
@@ -0,0 +1,8 @@
+// native ending
+if (%0 == Py_False) {
+    PyObject* error_msg = PyString_FromFormat(
+            "Could not open file: \"%s\"", PySimpleFile_cptr(self)->filename());
+    PyErr_SetObject(PyExc_IOError, error_msg);
+    return 0;
+}
+
diff --git a/tests/samplebinding/simplefile_test.py b/tests/samplebinding/simplefile_test.py
new file mode 100755
index 000000000..3a82bad8e
--- /dev/null
+++ b/tests/samplebinding/simplefile_test.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# This file is part of the Shiboken Python Bindings Generator project.
+#
+# Copyright (C) 2009 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
+
+'''Test cases for SimpleFile class'''
+
+import os
+import unittest
+
+from sample import SimpleFile
+
+class SimpleFileTest(unittest.TestCase):
+    '''Test cases for SimpleFile class.'''
+
+    def setUp(self):
+        filename = 'simplefile%d.txt' % os.getpid()
+        self.existing_filename = os.path.join(os.path.curdir, filename)
+        self.delete_file = False
+        if not os.path.exists(self.existing_filename):
+            f = open(self.existing_filename, 'w')
+            for line in range(10):
+                f.write('sbrubbles\n')
+            f.close()
+            self.delete_file = True
+
+        self.non_existing_filename = os.path.join(os.path.curdir, 'inexistingfile.txt')
+        i = 0
+        while os.path.exists(self.non_existing_filename):
+            i += 1
+            filename = 'inexistingfile-%d.txt' % i
+            self.non_existing_filename = os.path.join(os.path.curdir, filename)
+
+    def tearDown(self):
+        if self.delete_file:
+            os.remove(self.existing_filename)
+
+    def testExistingFile(self):
+        '''Test SimpleFile class with existing file.'''
+        f = SimpleFile(self.existing_filename)
+        self.assertEqual(f.filename(), self.existing_filename)
+        f.open()
+        self.assertNotEqual(f.fileno(), -1)
+        self.assertNotEqual(f.size(), 0)
+        f.close()
+
+    def testNonExistingFile(self):
+        '''Test SimpleFile class with non-existing file.'''
+        f = SimpleFile(self.non_existing_filename)
+        self.assertEqual(f.filename(), self.non_existing_filename)
+        self.assertRaises(IOError, f.open)
+        self.assertEqual(f.fileno(), -1)
+        self.assertEqual(f.size(), 0)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index ca1b3c3bd..8aaa2f53e 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -4,6 +4,7 @@
     <primitive-type name="double"/>
     <primitive-type name="int"/>
     <primitive-type name="char"/>
+    <primitive-type name="long"/>
 
     <primitive-type name="Complex" target-lang-api-name="PyComplex">
         <conversion-rule file="complex_conversions.h"/>
@@ -218,6 +219,16 @@
     <value-type name="ListUser"/>
     <value-type name="NonDefaultCtor" />
     <value-type name="OddBoolUser" />
+
+    <value-type name="SimpleFile">
+        <modify-function signature="open()">
+            <modify-argument index="return">
+                <remove-argument/>
+            </modify-argument>
+            <inject-code class="native" position="end" file="simplefile_glue.cpp"/>
+        </modify-function>
+    </value-type>
+
     <object-type name="PrivateDtor" />
 
     <interface-type name="MBase"/>