Merge lp:~thisfred/u1db/mapping-test-improvements into lp:u1db

[Eric Casteleijn]

Added a few tests for edge cases, but mostly the tests and the code seem to be in pretty good shape.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 4/16/2012 6:28 PM, Eric Casteleijn wrote:
> Eric Casteleijn has proposed merging
> lp:~thisfred/u1db/mapping-test-improvements into lp:u1db.
>
> Requested reviews: Ubuntu One hackers (ubuntuone-hackers)
>
> For more details, see:
> https://code.launchpad.net/~thisfred/u1db/mapping-test-improvements/+merge/102141
>
> Added a few tests for edge cases, but mostly the tests and the
> code seem to be in pretty good shape.

 merge: approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk+MbXwACgkQJdeBCYSNAAMNmACgtHZY02qdRY4YjfhPpIU7w74j
FYcAn0YadAyTHRMh/ewZQVTg4JROF5HE
=2xIj
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'u1db/tests/test_backends.py'
--- u1db/tests/test_backends.py	2012-04-09 18:59:28 +0000
+++ u1db/tests/test_backends.py	2012-04-16 16:27:27 +0000
@@ -31,7 +31,7 @@
 )
 
 from u1db.remote import (
-    http_database
+    http_database,
     )
 
 try:
@@ -767,13 +767,20 @@
         self.db.create_index('test-idx', ['sub.foo.bar.baz.qux.fnord'])
         self.assertEqual([], self.db.get_from_index('test-idx', [('*',)]))
 
-    def test_index_list(self):
+    def test_index_list1(self):
         self.db.create_index("index", ["name"])
         content = '{"name": ["foo", "bar"]}'
         doc = self.db.create_doc(content)
         rows = self.db.get_from_index("index", [("bar", )])
         self.assertEqual([doc], rows)
 
+    def test_index_list2(self):
+        self.db.create_index("index", ["name"])
+        content = '{"name": ["foo", "bar"]}'
+        doc = self.db.create_doc(content)
+        rows = self.db.get_from_index("index", [("foo", )])
+        self.assertEqual([doc], rows)
+
     def test_get_from_index_case_sensitive(self):
         self.db.create_index('test-idx', ['key'])
         doc1 = self.db.create_doc(simple_doc)
@@ -857,6 +864,27 @@
         rows = self.db.get_from_index("index", [("foo", )])
         self.assertEqual([doc], rows)
 
+    def test_index_split_words_double_space(self):
+        self.db.create_index("index", ["split_words(name)"])
+        content = '{"name": "foo  bar"}'
+        doc = self.db.create_doc(content)
+        rows = self.db.get_from_index("index", [("bar", )])
+        self.assertEqual([doc], rows)
+
+    def test_index_split_words_leading_space(self):
+        self.db.create_index("index", ["split_words(name)"])
+        content = '{"name": " foo bar"}'
+        doc = self.db.create_doc(content)
+        rows = self.db.get_from_index("index", [("foo", )])
+        self.assertEqual([doc], rows)
+
+    def test_index_split_words_trailing_space(self):
+        self.db.create_index("index", ["split_words(name)"])
+        content = '{"name": "foo bar "}'
+        doc = self.db.create_doc(content)
+        rows = self.db.get_from_index("index", [("bar", )])
+        self.assertEqual([doc], rows)
+
 
 class PyDatabaseIndexTests(tests.DatabaseBaseTests):