From 0a51e23aa8ddcba8d8b9ffdc1ea9f35adb6b6ce6 Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Thu, 15 Jan 2015 11:19:08 -0600 Subject: [PATCH] Update existing integration test for new map type. --- cassandra/util.py | 3 +++ tests/integration/standard/test_types.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cassandra/util.py b/cassandra/util.py index 87f520eb..aa06d6d4 100644 --- a/cassandra/util.py +++ b/cassandra/util.py @@ -622,6 +622,9 @@ class OrderedMap(Mapping): self.__class__.__name__, ', '.join("(%r, %r)" % (k, v) for k, v in self._items)) + def __str__(self): + return '{%s}' % ', '.join("%r: %r" % (k, v) for k, v in self._items) + @staticmethod def _serialize_key(key): return cPickle.dumps(key) diff --git a/tests/integration/standard/test_types.py b/tests/integration/standard/test_types.py index fb985fa7..b0a47c06 100644 --- a/tests/integration/standard/test_types.py +++ b/tests/integration/standard/test_types.py @@ -30,7 +30,7 @@ from cassandra import InvalidRequest from cassandra.cluster import Cluster from cassandra.cqltypes import Int32Type, EMPTY from cassandra.query import dict_factory -from cassandra.util import OrderedDict, sortedset +from cassandra.util import OrderedMap, sortedset from tests.integration import get_server_versions, use_singledc, PROTOCOL_VERSION @@ -279,11 +279,11 @@ class TypeTests(unittest.TestCase): s.execute("INSERT INTO mytable (a, b, c, o, s, l, n) VALUES ('a', 'b', %s, %s, %s, %s, %s)", ('', '', '', [''], {'': 3})) self.assertEqual( - {'c': '', 'o': '', 's': '', 'l': [''], 'n': OrderedDict({'': 3})}, + {'c': '', 'o': '', 's': '', 'l': [''], 'n': OrderedMap({'': 3})}, s.execute("SELECT c, o, s, l, n FROM mytable WHERE a='a' AND b='b'")[0]) self.assertEqual( - {'c': '', 'o': '', 's': '', 'l': [''], 'n': OrderedDict({'': 3})}, + {'c': '', 'o': '', 's': '', 'l': [''], 'n': OrderedMap({'': 3})}, s.execute(s.prepare("SELECT c, o, s, l, n FROM mytable WHERE a='a' AND b='b'"), [])[0]) # non-string types shouldn't accept empty strings