1 files changed, 15 insertions, 6 deletions
diff --git a/tests/test_collection.py b/tests/test_collection.py
index 68c29f3..ccd535f 100644
--- a/tests/test_collection.py
+++ b/tests/test_collection.py
@@ -17,7 +17,6 @@ class testCollectionLoading(unittest.TestCase):
         self.assertEqual(self.collection.settings, {})
 
         self.collection.update_cache()
-        self.assertIsNotNone(self.collection.cache)
         self.assertIsNotNone(self.collection.stemmer)
 
     def test_simple(self):
@@ -28,9 +27,9 @@ class testCollectionLoading(unittest.TestCase):
             "Simple lesana collection"
             )
         self.assertEqual(len(self.collection.settings['fields']), 4)
+        self.assertEqual(len(self.collection.indexed_fields), 2)
 
         self.collection.update_cache()
-        self.assertIsNotNone(self.collection.cache)
         self.assertIsNotNone(self.collection.stemmer)
 
     def test_wrong_language(self):
@@ -42,7 +41,6 @@ class testCollectionLoading(unittest.TestCase):
         # The collection will default to english, but should still work.
         self.collection.update_cache()
         self.assertIsNotNone(self.collection.settings)
-        self.assertIsNotNone(self.collection.cache)
         self.assertIsNotNone(self.collection.stemmer)
 
     def test_unsafe(self):
@@ -50,26 +48,37 @@ class testCollectionLoading(unittest.TestCase):
         self.collection.safe = False
         self.collection.update_cache()
 
+    def test_search(self):
+        self.collection = lesana.Collection('tests/data/simple')
+        res = self.collection.search('Item')
+        matches = list(res)
+        self.assertEqual(len(matches), 2)
+        for m in matches:
+            self.assertIsInstance(m, lesana.Entry)
+
+
 
 class testEntries(unittest.TestCase):
     def setUp(self):
         self.collection = lesana.Collection('tests/data/simple')
         self.basepath = 'tests/data/simple/items'
 
+    def tearDown(self):
+        shutil.rmtree(os.path.join(self.collection.basedir, '.lesana'))
+
+
     def test_simple(self):
         fname = '085682ed-6792-499d-a3ab-9aebd683c011.yaml'
         with open(os.path.join(self.basepath, fname)) as fp:
             data = ruamel.yaml.load(fp)
         entry = lesana.Entry(self.collection, data=data, fname=fname)
         self.assertEqual(entry.idterm, 'Q'+data['uid'])
-        self.assertEqual(len(entry.indexed_fields), 2)
         fname = '11189ee47ddf4796b718a483b379f976.yaml'
         uid = '11189ee47ddf4796b718a483b379f976'
         with open(os.path.join(self.basepath, fname)) as fp:
             data = ruamel.yaml.load(fp)
         entry = lesana.Entry(self.collection, data=data, fname=fname)
         self.assertEqual(entry.idterm, 'Q'+uid)
-        self.assertEqual(len(entry.indexed_fields), 2)
 
     def test_write_new(self):
         new_entry = lesana.Entry(self.collection)
@@ -99,7 +108,7 @@ class testComplexCollection(unittest.TestCase):
             )
         self.assertEqual(len(self.collection.settings['fields']), 3)
         self.assertIsNotNone(self.collection.stemmer)
+        self.assertEqual(len(self.collection.indexed_fields), 2)
 
     def test_index(self):
         self.collection.update_cache()
-        self.assertIsNotNone(self.collection.cache)