First implementation of Debugger for SyaNodeParser

tests/core/test_SheerkaRuleManager.py

@@ -2,7 +2,7 @@ import ast
 
 import pytest
 from core.builtin_concepts import BuiltinConcepts
-from core.concept import Concept
+from core.concept import Concept, CMV
 from core.global_symbols import RULE_COMPARISON_CONTEXT
 from core.rule import Rule
 from core.sheerka.services.SheerkaRuleManager import SheerkaRuleManager, FormatRuleParser, \
@@ -227,8 +227,8 @@ class TestSheerkaRuleManager(TestUsingMemoryBasedSheerka):
         assert res[0].concept == expected
 
     @pytest.mark.parametrize("text, expected_variables", [
-        ("a cat is an animal", ["cat", "animal"]),
-        ("a cat is an b", ["a", "animal"]),
+        ("a cat is an animal", ["a cat", "animal"]),
+        ("a cat is an b", ["a cat", "b"]),
     ])
     def test_i_can_compile_predicate_when_sya_node_parser(self, text, expected_variables):
         sheerka, context, *concepts = self.init_concepts(
@@ -238,7 +238,7 @@ class TestSheerkaRuleManager(TestUsingMemoryBasedSheerka):
             create_new=True
         )
         service = sheerka.services[SheerkaRuleManager.NAME]
-        expected = concepts[0]
+        expected = CMV(concepts[0], x=expected_variables[0], y=expected_variables[1])
 
         res = service.compile_when(context, "test", text)
 
@@ -281,14 +281,14 @@ class TestSheerkaRuleManager(TestUsingMemoryBasedSheerka):
         assert isinstance(res[0], RulePredicate)
         assert res[0].evaluator == CONCEPT_EVALUATOR_NAME
         assert sheerka.isinstance(res[0].predicate, BuiltinConcepts.RETURN_VALUE)
-        assert sheerka.objvalue(res[0].predicate)[0].concept == concepts[0]
-        assert res[0].concept == concepts[0]
+        assert sheerka.objvalue(res[0].predicate)[0].concept == CMV(concepts[0], x="a", y="b")
+        assert res[0].concept == CMV(concepts[0], x="a", y="b")
 
         assert isinstance(res[1], RulePredicate)
         assert res[1].evaluator == CONCEPT_EVALUATOR_NAME
         assert sheerka.isinstance(res[1].predicate, BuiltinConcepts.RETURN_VALUE)
-        assert sheerka.objvalue(res[1].predicate)[0].concept == concepts[1]
-        assert res[1].concept == concepts[1]
+        assert sheerka.objvalue(res[1].predicate)[0].concept == CMV(concepts[1], x="a", y="b")
+        assert res[1].concept == CMV(concepts[1], x="a", y="b")
 
     # @pytest.mark.skip
     # @pytest.mark.parametrize("text, expected", [