Start on unit tests for Cython code

Mark Florisson · Mark Florisson · commit 9a72f8d5cddf · 2015-08-04T14:21:39.000+01:00
diff --git a/cassandra/bytesio.pyx b/cassandra/bytesio.pyx
@@ -20,39 +20,13 @@ cdef class BytesIOReader:
         string is returned when EOF is encountered immediately.
         """
         cdef Py_ssize_t newpos = self.pos + n
-        cdef char *res
-
         if n < 0:
             newpos = self.size
-
-        if newpos > self.size:
+        elif newpos > self.size:
             # Raise an error here, as we do not want the caller to consume past the
             # end of the buffer
             raise EOFError("Cannot read past the end of the file")
-        else:
-            res = self.buf_ptr + self.pos
 
+        cdef char *res = self.buf_ptr + self.pos
         self.pos = newpos
         return res
-
-
-class PyBytesIOReader(BytesIOReader):
-    """
-    Python-compatible BytesIOReader class
-    """
-
-    def read(self, n = -1):
-        """Read at most size bytes from the file
-        (less if the read hits EOF before obtaining size bytes).
-
-        If the size argument is negative or omitted, read all data until EOF
-        is reached. The bytes are returned as a string object. An empty
-        string is returned when EOF is encountered immediately.
-        """
-        if n is None or n < 0:
-            newpos = self.len
-        else:
-            newpos = min(self.pos+n, self.len)
-        r = self.buf[self.pos:newpos]
-        self.pos = newpos
-        return r
diff --git a/cassandra/datatypes.pyx b/cassandra/datatypes.pyx
@@ -60,3 +60,4 @@ def obj_array(list objs):
         arr[i] = obj
     return arr
 
+
diff --git a/setup.py b/setup.py
@@ -274,6 +274,8 @@ def run_setup(extensions):
             exclude_failures=True))
         extensions.extend(cythonize("cassandra/*.pyx",
             compiler_directives=directives))
+        extensions.extend(cythonize("tests/unit/cython/*.pyx",
+            compiler_directives=directives))
     except ImportError:
         sys.stderr.write("Cython is not installed. Not compiling core driver files as extensions (optional).")
 
diff --git a/tests/unit/cython/__init__.py b/tests/unit/cython/__init__.py
diff --git a/tests/unit/cython/bytesio_testhelper.pyx b/tests/unit/cython/bytesio_testhelper.pyx
@@ -0,0 +1,30 @@
+from cassandra.bytesio cimport BytesIOReader
+
+def test_read1(assert_equal, assert_raises):
+    cdef BytesIOReader reader = BytesIOReader(b'abcdef')
+    assert_equal(reader.read(2)[:2], b'ab')
+    assert_equal(reader.read(2)[:2], b'cd')
+    assert_equal(reader.read(0)[:0], b'')
+    assert_equal(reader.read(2)[:2], b'ef')
+
+def test_read2(assert_equal, assert_raises):
+    cdef BytesIOReader reader = BytesIOReader(b'abcdef')
+    reader.read(5)
+    reader.read(1)
+
+def test_read3(assert_equal, assert_raises):
+    cdef BytesIOReader reader = BytesIOReader(b'abcdef')
+    reader.read(6)
+
+def test_read_eof(assert_equal, assert_raises):
+    cdef BytesIOReader reader = BytesIOReader(b'abcdef')
+    reader.read(5)
+    # cannot convert reader.read to an object, do it manually
+    # assert_raises(EOFError, reader.read, 2)
+    try:
+        reader.read(2)
+    except EOFError:
+        pass
+    else:
+        raise Exception("Expected an EOFError")
+    reader.read(1) # see that we can still read this
diff --git a/tests/unit/cython/dummy_module.pyx b/tests/unit/cython/dummy_module.pyx
@@ -0,0 +1,2 @@
+# This is a dummy module used by utils.py to determine whether
+# cassandra was build with Cython
diff --git a/tests/unit/cython/test_bytesio.py b/tests/unit/cython/test_bytesio.py
@@ -0,0 +1,21 @@
+from tests.unit.cython.utils import cyimport, cythontest
+bytesio_testhelper = cyimport('tests.unit.cython.bytesio_testhelper')
+
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest  # noqa
+
+
+class BytesIOTest(unittest.TestCase):
+    """Test Cython BytesIO proxy"""
+
+    @cythontest
+    def test_reading(self):
+        bytesio_testhelper.test_read1(self.assertEqual, self.assertRaises)
+        bytesio_testhelper.test_read2(self.assertEqual, self.assertRaises)
+        bytesio_testhelper.test_read3(self.assertEqual, self.assertRaises)
+
+    @cythontest
+    def test_reading_error(self):
+        bytesio_testhelper.test_read_eof(self.assertEqual, self.assertRaises)
diff --git a/tests/unit/cython/utils.py b/tests/unit/cython/utils.py
@@ -0,0 +1,27 @@
+try:
+    import tests.unit.cython.dummy_module
+except ImportError:
+    have_cython = False
+else:
+    have_cython = True
+
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest  # noqa
+
+def cyimport(import_path):
+    """
+    Import a Cython module if available, otherwise return None
+    (and skip any relevant tests).
+    """
+    try:
+        return __import__(import_path, fromlist=True)
+    except ImportError:
+        if have_cython:
+            raise
+        return None
+
+# @cythontest
+# def test_something(self): ...
+cythontest = unittest.skipUnless(have_cython, 'Cython is not available')

Original file line number	Diff line number	Diff line change
`@@ -60,3 +60,4 @@ def obj_array(list objs):`
`60`	`60`	`arr[i] = obj`
`61`	`61`	`return arr`
`62`	`62`
	`63`	`+`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# This is a dummy module used by utils.py to determine whether`
	`2`	`+# cassandra was build with Cython`