Merge pull request #11 from neo4j/params-test

Add failing test to illustrate issue found at hackathon

Author: nigelsmall

neo4j/v1/packstream.py

@@ -318,7 +318,7 @@
     STRING_TYPE = str
 else:
     INTEGER_TYPE = (int, long)
-    STRING_TYPE = unicode
+    STRING_TYPE = (str, unicode)
 
 __all__ = ["Packer", "pack", "packb", "Unpacker", "unpack", "unpackb"]
 
@@ -493,17 +493,21 @@ def pack(self, value):
             else:
                 raise OverflowError("Integer %s out of range" % value)
 
-        # Bytes
-        elif isinstance(value, bytes):
-            self.pack_bytes_header(len(value))
-            self.pack_raw(value)
-
         # String
         elif isinstance(value, STRING_TYPE):
-            value_bytes = value.encode(ENCODING)
+            if isinstance(value, bytes):
+                value_bytes = value
+            else:
+                value_bytes = value.encode(ENCODING)
             self.pack_string_header(len(value_bytes))
             self.pack_raw(value_bytes)
 
+        # Bytes (deliberately listed after String since in
+        # Python 2, bytes should be treated as a String)
+        elif isinstance(value, (bytes, bytearray)):
+            self.pack_bytes_header(len(value))
+            self.pack_raw(value)
+
         # List
         elif isinstance(value, list):
             self.pack_list_header(len(value))

test/test_packstream.py

@@ -124,17 +124,17 @@ def test_negative_float64(self):
             assert_packable(r, expected)
 
     def test_empty_bytes(self):
-        assert_packable(b"", b"\xCC\x00")
+        assert_packable(bytearray(), b"\xCC\x00")
 
     def test_bytes_8(self):
-        assert_packable(b"hello", b"\xCC\x05hello")
+        assert_packable(bytearray(b"hello"), b"\xCC\x05hello")
 
     def test_bytes_16(self):
-        b = bytes(bytearray(40000))
+        b = bytearray(40000)
         assert_packable(b, b"\xCD\x9C\x40" + b)
 
     def test_bytes_32(self):
-        b = bytes(bytearray(80000))
+        b = bytearray(80000)
         assert_packable(b, b"\xCE\x00\x01\x38\x80" + b)
 
     def test_empty_string(self):

test/test_session.py

@@ -24,6 +24,7 @@
 from neo4j.v1.session import GraphDatabase, CypherError
 from neo4j.v1.typesystem import Node, Relationship, Path
 
+
 class RunTestCase(TestCase):
     def test_must_use_valid_url_scheme(self):
         with self.assertRaises(ValueError):
@@ -48,6 +49,18 @@ def test_can_run_simple_statement(self):
         session.close()
         assert count == 1
 
+    def test_can_run_simple_statement_with_params(self):
+        session = GraphDatabase.driver("bolt://localhost").session()
+        count = 0
+        for record in session.run("RETURN {x} AS n", {"x": {"abc": ["d", "e", "f"]}}):
+            assert record[0] == {"abc": ["d", "e", "f"]}
+            assert record["n"] == {"abc": ["d", "e", "f"]}
+            assert repr(record)
+            assert len(record) == 1
+            count += 1
+        session.close()
+        assert count == 1
+
     def test_fails_on_bad_syntax(self):
         session = GraphDatabase.driver("bolt://localhost").session()
         with self.assertRaises(CypherError):