fix wrapper tests, now that the compiler is fixed

diff --git a/tests/bugs.txt b/tests/bugs.txt
index 3333970323d42a04ebede8be699e175f8692a339..6c7e7aa6fab0e1755324364272b8df1d1accbefb 100644 (file)
--- a/tests/bugs.txt
+++ b/tests/bugs.txt
@@ -9,4 +9,3 @@ missing_baseclass_in_predecl_T262
 cfunc_call_tuple_args_T408
 cascaded_list_unpacking_T467
 compile.cpp_operators
-cpp_overload_wrapper

diff --git a/tests/wrappers/cpp_overload_wrapper.pyx b/tests/wrappers/cpp_overload_wrapper.pyx
index c1839c9f31cec7c2986facf1a4cd4071f553a705..8b9b84112070e00f06feb58d01d458e6c8d25fec 100644 (file)
--- a/tests/wrappers/cpp_overload_wrapper.pyx
+++ b/tests/wrappers/cpp_overload_wrapper.pyx
@@ -1,7 +1,18 @@
 
-cimport cppwrap_lib
+cimport cpp_overload_wrapper_lib as cppwrap_lib
 
 cdef class DoubleKeeper:
+    """
+    >>> d = DoubleKeeper()
+    >>> d.get_number()
+    1.0
+    >>> d.set_number(5.5)
+    >>> d.get_number()
+    5.5
+    >>> d.set_number(0)
+    >>> d.get_number()
+    0.0
+    """
     cdef cppwrap_lib.DoubleKeeper* keeper
 
     def __cinit__(self, number=None):
@@ -23,14 +34,33 @@ cdef class DoubleKeeper:
         return self.keeper.get_number()
 
     def transmogrify(self, double value):
+        """
+        >>> d = DoubleKeeper(5.5)
+        >>> d.transmogrify(1.0)
+        5.5
+        >>> d.transmogrify(2.0)
+        11.0
+        """
         return self.keeper.transmogrify(value)
 
 
 def voidfunc():
+    """
+    >>> voidfunc()
+    """
     cppwrap_lib.voidfunc()
 
 def doublefunc(double x, double y, double z):
+    """
+    >>> doublefunc(1.0, 2.0, 3.0) == 1.0 + 2.0 + 3.0
+    True
+    """
     return cppwrap_lib.doublefunc(x, y, z)
 
 def transmogrify_from_cpp(DoubleKeeper obj not None, double value):
+    """
+    >>> d = DoubleKeeper(2.0)
+    >>> d.transmogrify(3.0) == 6.0
+    True
+    """
     return cppwrap_lib.transmogrify_from_cpp(obj.keeper, value)

diff --git a/tests/wrappers/cpp_overload_wrapper_lib.cpp b/tests/wrappers/cpp_overload_wrapper_lib.cpp
index 3668120b09092698cee807a0f70e2e45efc4a14e..a031f975e325e02cad07c6a1cbcdc07a4c1080e9 100644 (file)
--- a/tests/wrappers/cpp_overload_wrapper_lib.cpp
+++ b/tests/wrappers/cpp_overload_wrapper_lib.cpp
@@ -1,5 +1,5 @@
 
-#include "cppwrap_lib.h"
+#include "cpp_overload_wrapper_lib.h"
 
 void voidfunc (void)
 {

diff --git a/tests/wrappers/cpp_overload_wrapper_lib.pxd b/tests/wrappers/cpp_overload_wrapper_lib.pxd
index d92ca89d473440058c46124ed5a83ec889753c38..173970057f2be63d8d2980ecedb95756db7ec1e0 100644 (file)
--- a/tests/wrappers/cpp_overload_wrapper_lib.pxd
+++ b/tests/wrappers/cpp_overload_wrapper_lib.pxd
@@ -1,5 +1,5 @@
 
-cdef extern from "testapi.h":
+cdef extern from "cpp_overload_wrapper_lib.h":
     void voidfunc()
     double doublefunc(double a, double b, double c)