From 0979148866fe29e46a3edb9df352ba694ef50eea Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Thu, 16 Apr 2015 19:31:27 -0700
Subject: [PATCH] Slightly more legible tests

---
 test/test_dbcore.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/test_dbcore.py b/test/test_dbcore.py
index c364e9867..313530764 100644
--- a/test/test_dbcore.py
+++ b/test/test_dbcore.py
@@ -479,43 +479,41 @@ class ParseSortedQueryTest(unittest.TestCase):
     def psq(self, parts):
         return dbcore.parse_sorted_query(
             TestModel1,
-            parts
+            parts.split(),
         )
 
     def test_and_query(self):
-        q, s = self.psq([u'foo', u'bar'])
+        q, s = self.psq('foo bar')
         self.assertIsInstance(q, dbcore.query.AndQuery)
         self.assertIsInstance(s, dbcore.query.NullSort)
         self.assertEqual(len(q.subqueries), 2)
 
     def test_or_query(self):
-        q, s = self.psq([u'foo', u',', u'bar'])
+        q, s = self.psq('foo , bar')
         self.assertIsInstance(q, dbcore.query.OrQuery)
         self.assertIsInstance(s, dbcore.query.NullSort)
         self.assertEqual(len(q.subqueries), 2)
 
     def test_no_space_before_comma_or_query(self):
-        # E.g., query `foo, bar`
-        q, s = self.psq([u'foo,', u'bar'])
+        q, s = self.psq('foo, bar')
         self.assertIsInstance(q, dbcore.query.OrQuery)
         self.assertIsInstance(s, dbcore.query.NullSort)
         self.assertEqual(len(q.subqueries), 2)
 
     def test_no_spaces_or_query(self):
-        # E.g., query `foo, bar`
-        q, s = self.psq([u'foo,bar'])
+        q, s = self.psq('foo,bar')
         self.assertIsInstance(q, dbcore.query.AndQuery)
         self.assertIsInstance(s, dbcore.query.NullSort)
         self.assertEqual(len(q.subqueries), 1)
 
     def test_trailing_comma_or_query(self):
-        q, s = self.psq([u'foo', u',', u'bar', u','])
+        q, s = self.psq('foo , bar ,')
         self.assertIsInstance(q, dbcore.query.OrQuery)
         self.assertIsInstance(s, dbcore.query.NullSort)
         self.assertEqual(len(q.subqueries), 3)
 
     def test_leading_comma_or_query(self):
-        q, s = self.psq([u',', u'foo', u',', u'bar'])
+        q, s = self.psq(', foo , bar')
         self.assertIsInstance(q, dbcore.query.OrQuery)
         self.assertIsInstance(s, dbcore.query.NullSort)
         self.assertEqual(len(q.subqueries), 3)