pjht/buku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix test_search* cases

Browse Source
This commit is contained in:
Paul 2016-09-08 09:39:41 -05:00
parent 5c33c07ad9
commit 370879b599
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_bukuDb.py
View File

@ -234,7 +234,6 @@ class TestBukuDb(unittest.TestCase):
for bookmark in self.bookmarks: for bookmark in self.bookmarks:
self.bdb.add_bookmark(*bookmark) self.bdb.add_bookmark(*bookmark)
with mock.patch('buku.prompt') as mock_prompt:
get_first_tag = lambda x: ''.join(x[2].split(',')[:2]) get_first_tag = lambda x: ''.join(x[2].split(',')[:2])
for i, bookmark in enumerate(self.bookmarks): for i, bookmark in enumerate(self.bookmarks):
tag_search = get_first_tag(bookmark) tag_search = get_first_tag(bookmark)
@ -243,13 +242,14 @@ class TestBukuDb(unittest.TestCase):
title_search = bookmark[1] title_search = bookmark[1]
# Expect a five-tuple containing all bookmark data # Expect a five-tuple containing all bookmark data
# db index, URL, title, tags, description # db index, URL, title, tags, description
expected = (i + 1,) + (self.bookmarks[i],) expected = [(i + 1,) + tuple(bookmark)]
# search db by tag, url (domain name), and title # search db by tag, url (domain name), and title
for keyword in (tag_search, url_search, title_search): for keyword in (tag_search, url_search, title_search):
with mock.patch('buku.prompt') as mock_prompt:
# search by keyword # search by keyword
self.bdb.searchdb(keyword) self.bdb.searchdb([keyword])
# checking prompt called with the correct resultset from search # checking prompt called with the correct resultset from search
self.assertTrue(mock_prompt.called_with(expected, False, False)) mock_prompt.assert_called_with(expected, False, False)
# @unittest.skip('skipping') # @unittest.skip('skipping')
def test_search_by_tag(self): def test_search_by_tag(self):
@ -264,9 +264,9 @@ class TestBukuDb(unittest.TestCase):
self.bdb.search_by_tag(get_first_tag(self.bookmarks[i])) self.bdb.search_by_tag(get_first_tag(self.bookmarks[i]))
# Expect a five-tuple containing all bookmark data # Expect a five-tuple containing all bookmark data
# db index, URL, title, tags, description # db index, URL, title, tags, description
expected = (i + 1,) + (self.bookmarks[i],) expected = [(i + 1,) + tuple(self.bookmarks[i])]
# Checking prompt called with the correct resultset from search # Checking prompt called with the correct resultset from search
self.assertTrue(mock_prompt.called_with(expected, False, False)) mock_prompt.assert_called_with(expected, False, False)
# @unittest.skip('skipping') # @unittest.skip('skipping')
def test_search_and_open_in_broswer_by_range(self): def test_search_and_open_in_broswer_by_range(self):