update query tests

fix escape colons in the query term
This commit is contained in:
Philippe Mongeau 2013-03-10 20:26:45 -04:00
parent 5d5b52629d
commit 685972bbc5
2 changed files with 8 additions and 8 deletions

View file

@ -612,7 +612,7 @@ class CollectionQuery(Query):
if match:
key = match.group(1)
term = match.group(2)
term = match.group(2).replace('\:', ':')
for p, q in cls.prefixes.items():
if term.startswith(p):
return (key, term[len(p):], q)

View file

@ -27,37 +27,37 @@ some_item = _common.item()
class QueryParseTest(unittest.TestCase):
def test_one_basic_term(self):
q = 'test'
r = (None, 'test', False)
r = (None, 'test', None)
self.assertEqual(pqp(q), r)
def test_one_keyed_term(self):
q = 'test:val'
r = ('test', 'val', False)
r = ('test', 'val', None)
self.assertEqual(pqp(q), r)
def test_colon_at_end(self):
q = 'test:'
r = (None, 'test:', False)
r = (None, 'test:', None)
self.assertEqual(pqp(q), r)
def test_one_basic_regexp(self):
q = r':regexp'
r = (None, 'regexp', True)
r = (None, 'regexp', beets.library.RegexpQuery)
self.assertEqual(pqp(q), r)
def test_keyed_regexp(self):
q = r'test::regexp'
r = ('test', 'regexp', True)
r = ('test', 'regexp', beets.library.RegexpQuery)
self.assertEqual(pqp(q), r)
def test_escaped_colon(self):
q = r'test\:val'
r = (None, 'test:val', False)
r = (None, 'test:val', None)
self.assertEqual(pqp(q), r)
def test_escaped_colon_in_regexp(self):
q = r':test\:regexp'
r = (None, 'test:regexp', True)
r = (None, 'test:regexp', beets.library.RegexpQuery)
self.assertEqual(pqp(q), r)
class AnySubstringQueryTest(unittest.TestCase):