From 073f4a155b83a3edbd63e5114da2d82cbb5cafa3 Mon Sep 17 00:00:00 2001
From: Adam Holmberg <Adam.Holmberg@datastax.com>
Date: Wed, 15 Oct 2014 08:47:16 -0500
Subject: [PATCH] Move NamedTupleFactoryAndNumericColNamesTests to
 row_factories tests.

---
 tests/integration/standard/test_query.py      | 50 -------------------
 ...est_factories.py => test_row_factories.py} | 50 +++++++++++++++++++
 2 files changed, 50 insertions(+), 50 deletions(-)
 rename tests/integration/standard/{test_factories.py => test_row_factories.py} (70%)

diff --git a/tests/integration/standard/test_query.py b/tests/integration/standard/test_query.py
index 58ae729d..7ed03dc1 100644
--- a/tests/integration/standard/test_query.py
+++ b/tests/integration/standard/test_query.py
@@ -421,53 +421,3 @@ class LightweightTransactionTests(unittest.TestCase):
 
         # Make sure test passed
         self.assertTrue(received_timeout)
-
-
-class NamedTupleFactoryAndNumericColNamesTests(unittest.TestCase):
-    """
-    Test for PYTHON-122: Improve Error Handling/Reporting for named_tuple_factory and Numeric Column Names
-    """
-    def setUp(self):
-        self.cluster = Cluster(protocol_version=PROTOCOL_VERSION)
-        self.session = self.cluster.connect()
-
-        ddl = '''
-            CREATE TABLE test3rf.ToBeIndexed ( key blob PRIMARY KEY, "626972746864617465" blob )
-            WITH COMPACT STORAGE'''
-
-        self.session.execute(ddl)
-
-    def tearDown(self):
-        """
-        Shutdown cluster
-        """
-        self.session.execute("DROP TABLE test3rf.ToBeIndexed")
-        self.cluster.shutdown()
-
-    def test_no_exception_on_select(self):
-        """
-        no exception on SELECT for numeric column name
-        """
-        try:
-            self.session.execute('SELECT * FROM test3rf.ToBeIndexed')
-        except ValueError as e:
-            self.fail("Unexpected ValueError exception: %s" % e.message)
-
-    def test_can_select_using_alias(self):
-        """
-        can SELECT "<numeric col name>" AS aliases
-        """
-        try:
-            self.session.execute('SELECT key, "626972746864617465" AS my_col from test3rf.ToBeIndexed')
-        except ValueError as e:
-            self.fail("Unexpected ValueError exception: %s" % e.message)
-
-    def test_can_select_with_dict_factory(self):
-        """
-        can SELECT numeric column  using  dict_factory
-        """
-        self.session.row_factory = dict_factory
-        try:
-            self.session.execute('SELECT * FROM test3rf.ToBeIndexed')
-        except ValueError as e:
-            self.fail("Unexpected ValueError exception: %s" % e.message)
diff --git a/tests/integration/standard/test_factories.py b/tests/integration/standard/test_row_factories.py
similarity index 70%
rename from tests/integration/standard/test_factories.py
rename to tests/integration/standard/test_row_factories.py
index ef15ca99..189a0a9d 100644
--- a/tests/integration/standard/test_factories.py
+++ b/tests/integration/standard/test_row_factories.py
@@ -137,3 +137,53 @@ class RowFactoryTests(unittest.TestCase):
         self.assertEqual(result[0]['k'], 1)
         self.assertEqual(result[1]['k'], result[1]['v'])
         self.assertEqual(result[1]['k'], 2)
+
+
+class NamedTupleFactoryAndNumericColNamesTests(unittest.TestCase):
+    """
+    Test for PYTHON-122: Improve Error Handling/Reporting for named_tuple_factory and Numeric Column Names
+    """
+    def setUp(self):
+        self.cluster = Cluster(protocol_version=PROTOCOL_VERSION)
+        self.session = self.cluster.connect()
+
+        ddl = '''
+            CREATE TABLE test3rf.ToBeIndexed ( key blob PRIMARY KEY, "626972746864617465" blob )
+            WITH COMPACT STORAGE'''
+
+        self.session.execute(ddl)
+
+    def tearDown(self):
+        """
+        Shutdown cluster
+        """
+        self.session.execute("DROP TABLE test3rf.ToBeIndexed")
+        self.cluster.shutdown()
+
+    def test_no_exception_on_select(self):
+        """
+        no exception on SELECT for numeric column name
+        """
+        try:
+            self.session.execute('SELECT * FROM test3rf.ToBeIndexed')
+        except ValueError as e:
+            self.fail("Unexpected ValueError exception: %s" % e.message)
+
+    def test_can_select_using_alias(self):
+        """
+        can SELECT "<numeric col name>" AS aliases
+        """
+        try:
+            self.session.execute('SELECT key, "626972746864617465" AS my_col from test3rf.ToBeIndexed')
+        except ValueError as e:
+            self.fail("Unexpected ValueError exception: %s" % e.message)
+
+    def test_can_select_with_dict_factory(self):
+        """
+        can SELECT numeric column  using  dict_factory
+        """
+        self.session.row_factory = dict_factory
+        try:
+            self.session.execute('SELECT * FROM test3rf.ToBeIndexed')
+        except ValueError as e:
+            self.fail("Unexpected ValueError exception: %s" % e.message)