Added first implementation of concepts ambiguity resolution + Jenkins file test

tests/evaluators/test_ConceptEvaluator.py

@@ -1,8 +1,8 @@
 import pytest
-
 from core.builtin_concepts import ReturnValueConcept, ParserResultConcept, BuiltinConcepts
 from core.concept import Concept, ConceptParts
 from evaluators.ConceptEvaluator import ConceptEvaluator
+
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 
 
@@ -20,11 +20,12 @@ class TestAddConceptEvaluator(TestUsingMemoryBasedSheerka):
 
     def test_i_can_evaluate_concept(self):
         context = self.get_context()
-        context.local_hints.add(BuiltinConcepts.EVAL_BODY_REQUESTED)
+        context.local_hints.update({BuiltinConcepts.EVAL_BODY_REQUESTED, BuiltinConcepts.EVAL_WHERE_REQUESTED})
         concept = Concept(name="foo",
                           where="True",
-                          pre="2",
-                          post="3").def_var("a", "4").def_var("b", "5")
+                          pre="2 > 1",
+                          ret="3",
+                          post="4").def_var("a", "5").def_var("b", "6")
 
         evaluator = ConceptEvaluator()
         item = self.pretval(concept)
@@ -34,10 +35,11 @@ class TestAddConceptEvaluator(TestUsingMemoryBasedSheerka):
         assert result.status
         assert result.value.name == "foo"
         assert result.value.get_value(ConceptParts.WHERE) == True
-        assert result.value.get_value(ConceptParts.PRE) == 2
-        assert result.value.get_value(ConceptParts.POST) == 3
-        assert result.value.get_value("a") == 4
-        assert result.value.get_value("b") == 5
+        assert result.value.get_value(ConceptParts.PRE) == True
+        assert result.value.get_value(ConceptParts.RET) == 3
+        assert result.value.get_value(ConceptParts.POST) == 4
+        assert result.value.get_value("a") == 5
+        assert result.value.get_value("b") == 6
         assert result.value.key == "foo"
         assert result.parents == [item]
 
@@ -118,4 +120,3 @@ class TestAddConceptEvaluator(TestUsingMemoryBasedSheerka):
         assert not context.sheerka.is_success(error_concept)  # it's indeed an error
         assert result.status
         assert result.value == error_concept
-