Set PYTHONPATH for tests

[m_librarian.git] / tests / test_search.py

diff --git a/tests/test_search.py b/tests/test_search.py
old mode 100755 (executable)
new mode 100644 (file)
index 991a907..7fdf9fe
--- a/tests/test_search.py
+++ b/tests/test_search.py
@@ -1,16 +1,16 @@
-#! /usr/bin/env python
 # coding: utf-8
 
-
-from tests import TestCase, main
-from m_librarian.search import search_authors
+from tests import TestCase
+from m_librarian.db import Author, Book
+from m_librarian.search import mk_search_conditions, \
+    search_authors, search_books
 
 
 class TestSearch(TestCase):
     def test_search_authors(self):
         self.import_inpx('test.inpx')
         self.assertEqual(
-            search_authors('exact', True, {'surname': u'Друг'}).count(), 1)
+            search_authors('full', True, {'surname': u'Друг'}).count(), 1)
         self.assertEqual(
             search_authors('start', True, {'surname': u'Друг'}).count(), 2)
         self.assertEqual(
@@ -19,6 +19,12 @@ class TestSearch(TestCase):
             search_authors('substring', False, {'surname': u'друг'}).count(),
             3)
 
-
-if __name__ == "__main__":
-    main()
+        join_expressions = []
+        join_expressions.append(Book.j.authors)
+        conditions = mk_search_conditions(
+            Author, 'start', False, {'surname': u'друг'})
+        join_expressions.extend(conditions)
+        self.assertEqual(
+            search_books('start', False,
+                         {'title': u'тест'}, join_expressions).count(),
+            2)