Added more tests to parser

src/phylter/parser.py

@@ -107,8 +107,7 @@ def find_group_end(self, consumable):
 			elif item == '(':
 				i += 1
 
-		if openings > 1:
-			raise Exception("Unbalanced parenthesis")
+		raise Exception("Unbalanced parenthesis")
 
 	def build_query(self, consumable):
 		l = []
@@ -140,7 +139,6 @@ def build_query(self, consumable):
 					condition = self._get_condition_class(operator)(left, right)
 					l.append(condition)
 				else:
-					print(consumable.current)
 					raise Exception("Unexpected tokens found: %s" % consumable.iterable[consumable.pos:])
 
 		assert all((isinstance(x, (Condition, ConditionGroup)) or x in ('and', 'or') for x in l))

tests/test_parser.py

@@ -20,13 +20,21 @@ def test_constructor(self):
 		assert ci.length == 3
 		assert ci.remaining == 3
 
-	def test_current(self):
+	def test_current_and_next(self):
 		ci = ConsumableIter([1, 2, 3])
 		assert ci.current == 1
+		assert ci.next == 2
 
-	def test_current_empty(self):
+	def test_current_and_next_empty(self):
 		ci = ConsumableIter([])
 		assert ci.current is None
+		assert ci.next is None
+
+	def test_current_and_next_beyond_end(self):
+		ci = ConsumableIter([1])
+		ci.consume()
+		assert ci.current is None
+		assert ci.next is None
 
 	def test_has_more(self):
 		ci = ConsumableIter([1, 2, 3])
@@ -234,7 +242,22 @@ def test_parse_fail(self):
 			'foo == 1 or ',
 			'or',
 			'and',
-#			'foo == bar and (foo < 1 or foo > 2)',
 		):
 			with pytest.raises(ParseException) as e:
 				Parser().parse(s)
+
+	def test_find_group_end(self):
+		p = Parser()
+
+		for items, group_end_pos in (
+			(['foo', '==', '1', ')'], 3),
+			(['foo', '==', '1', ')', 'or', 'a', '==', '1'], 3),
+			(['foo', '==', '1', ')', 'or', '(', 'foo', '==', '1', ')'], 3),
+		):
+			assert p.find_group_end(ConsumableIter(items)) == group_end_pos
+
+		with pytest.raises(Exception):
+			assert p.find_group_end(ConsumableIter(['foo', '==', 'bar'])) == group_end_pos
+
+		with pytest.raises(Exception) as e:
+			assert p.find_group_end(ConsumableIter(['(', 'foo', '==', 'bar'])) == group_end_pos