intermediate commit

tests/parsers/test_SimpleConceptsParser.py

@@ -28,10 +28,11 @@ class TestSimpleConceptsParser(BaseTest):
             get_concepts(context, "I", "I am", "I am a new concept", use_sheerka=True)
 
             pi = get_parser_input(text)
-            res = parser.parse(context, pi)
+            error_sink = []
+            res = parser.parse(context, pi, error_sink)
 
             assert res == MultipleChoices([expected])
-            assert not parser.error_sink
+            assert not error_sink
 
     @pytest.mark.parametrize("text, expected", [
         ("foo", [_mt("1001", 0, 0)]),
@@ -42,10 +43,11 @@ class TestSimpleConceptsParser(BaseTest):
             get_concepts(context, get_metadata(name="foo", definition="I am a new concept"), use_sheerka=True)
 
             pi = get_parser_input(text)
-            res = parser.parse(context, pi)
+            error_sink = []
+            res = parser.parse(context, pi, error_sink)
 
             assert res == MultipleChoices([expected])
-            assert not parser.error_sink
+            assert not error_sink
 
     @pytest.mark.parametrize("text, expected", [
         ("long concept name", [_mt("1001", 0, 4)]),
@@ -57,17 +59,19 @@ class TestSimpleConceptsParser(BaseTest):
                          use_sheerka=True)
 
             pi = get_parser_input(text)
-            res = parser.parse(context, pi)
+            error_sink = []
+            res = parser.parse(context, pi, error_sink)
 
             assert res == MultipleChoices([expected])
-            assert not parser.error_sink
+            assert not error_sink
 
     def test_i_can_parse_a_sequence_of_concept(self, context, parser):
         with NewOntology(context, "test_i_can_parse_a_sequence_of_concept"):
             get_concepts(context, "foo bar", "baz", "qux", use_sheerka=True)
 
             pi = get_parser_input("foo bar baz foo, qux")
-            res = parser.parse(context, pi)
+            error_sink = []
+            res = parser.parse(context, pi, error_sink)
 
             expected = [_mt("1001", 0, 2),
                         _ut(" ", 3, 3),
@@ -76,40 +80,43 @@ class TestSimpleConceptsParser(BaseTest):
                         _mt("1003", 9, 9)]
 
             assert res == MultipleChoices([expected])
-            assert not parser.error_sink
+            assert not error_sink
 
     def test_i_can_detect_multiple_choices(self, context, parser):
         with NewOntology(context, "test_i_can_detect_multiple_choices"):
             get_concepts(context, "foo bar", "bar baz", use_sheerka=True)
 
             pi = get_parser_input("foo bar baz")
-            res = parser.parse(context, pi)
+            error_sink = []
+            res = parser.parse(context, pi, error_sink)
 
             expected1 = [_mt("1001", 0, 2), _ut(" baz", 3, 4)]
             expected2 = [_ut("foo ", 0, 1), _mt("1002", 2, 4)]
 
             assert res == MultipleChoices([expected1, expected2])
-            assert not parser.error_sink
+            assert not error_sink
 
     def test_i_can_detect_multiple_choices_2(self, context, parser):
         with NewOntology(context, "test_i_can_detect_multiple_choices_2"):
             get_concepts(context, "one two", "one", "two", use_sheerka=True)
 
             pi = get_parser_input("one two")
-            res = parser.parse(context, pi)
+            error_sink = []
+            res = parser.parse(context, pi, error_sink)
 
             expected1 = [_mt("1001", 0, 2)]
             expected2 = [_mt("1002", 0, 0), _ut(" ", 1, 1), _mt("1003", 2, 2)]
 
             assert res == MultipleChoices([expected1, expected2])
-            assert not parser.error_sink
+            assert not error_sink
 
     def test_i_can_detect_multiple_choices_3(self, context, parser):
         with NewOntology(context, "test_i_can_detect_multiple_choices_2"):
             get_concepts(context, "one two", "one", "two", use_sheerka=True)
 
             pi = get_parser_input("one two xxx one two")
-            res = parser.parse(context, pi)
+            error_sink = []
+            res = parser.parse(context, pi, error_sink)
 
             e1 = get_from(_mt("c:one two#1001:"), _ut(" xxx "), _mt("c:#1001:"))
             e2 = get_from(_mt("c:one#1002:"), _ut(" "), _mt("c:two#1003:"), _ut(" xxx "), _mt("c:one two#1001:"))
@@ -118,11 +125,12 @@ class TestSimpleConceptsParser(BaseTest):
                           _mt("c:#1003:"))
 
             assert res == MultipleChoices([e1, e2, e3, e4])
-            assert not parser.error_sink
+            assert not error_sink
 
     def test_nothing_is_return_is_no_concept_is_recognized(self, context, parser):
         pi = get_parser_input("one two three")
-        res = parser.parse(context, pi)
+        error_sink = []
+        res = parser.parse(context, pi, error_sink)
 
         assert res == MultipleChoices([])
 
@@ -131,12 +139,12 @@ class TestSimpleConceptsParser(BaseTest):
             get_concepts(context, "foo", "i am a concept", use_sheerka=True)
 
             pi = get_parser_input("foo.attribute")
-            res = parser.parse(context, pi)
+            error_sink = []
+            res = parser.parse(context, pi, error_sink)
             expected = [_mt("1001", 0, 0), _ut(".attribute", 1, 2)]
             assert res == MultipleChoices([expected])
 
             pi = get_parser_input("i am a concept.attribute")
-            res = parser.parse(context, pi)
+            res = parser.parse(context, pi, error_sink)
             expected = [_mt("1002", 0, 6), _ut(".attribute", 7, 8)]
             assert res == MultipleChoices([expected])
-