Fixed #100 : SheerkaAdmin: Add builtins() command

Fixed #99 : SheerkaQueryManager: I can manage contains predicate when filtering objects
Fixed #97 : ERROR: list indices must be integers or slices, not Concept
Fixed #96 : SequenceNodeParser: SequenceNodeParser must correctly handle concept definition
Fixed #95 : ResolveAmbiguity must not remove concepts that do not require evaluation
Fixed #94 : Concepts with the same key are lost when new ontology
Fixed #93 : Introduce BuiltinConcepts.EVAL_GLOBAL_TRUTH_REQUESTED
Fixed #92 : ExpressionParser: Implement compile_disjunctions()
Fixed #91 : Implement get_concepts_complexity(context, concepts, concept_parts)
Fixed #90 : ResolveAmbiguity : where predicate is not used to resolve ambiguity
Fixed #89 : ResolveAmbiguityEvaluator: Concepts embedded in ConceptNode are not resolved
Fixed #88: SyaNodeParser: Parse multiple parameters when some of the are not recognized
Fixed #87: SyaNodeParser : Parse the multiple parameters

tests/evaluators/test_AddConceptInSetEvaluator.py

@@ -1,10 +1,10 @@
 import pytest
+
 from core.builtin_concepts import ReturnValueConcept, ParserResultConcept, BuiltinConcepts
 from core.concept import Concept
 from core.tokenizer import Tokenizer
 from evaluators.AddConceptInSetEvaluator import AddConceptInSetEvaluator
 from parsers.DefConceptParser import IsaConceptNode, NameNode
-
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 
 
@@ -51,7 +51,20 @@ class TestAddConceptInSetEvaluator(TestUsingMemoryBasedSheerka):
         assert res.value.body == "bar"
 
     def test_i_can_add_concept_to_a_set_of_concept(self):
-        sheerka, context, foo, bar = self.init_test().with_concepts("foo", "bar", create_new=True).unpack()
+        sheerka, context, foo, bar = self.init_test().with_concepts("foo", "bar").unpack()
+        ret_val = get_isa_ret_val("foo", "bar")
+
+        res = AddConceptInSetEvaluator().eval(context, ret_val)
+        foo = res.body  # get the created instance
+
+        assert res.status
+        assert context.sheerka.isinstance(res.value, foo.key)
+        assert context.sheerka.isa(foo, bar)
+
+        assert foo.get_prop(BuiltinConcepts.ISA) == {bar}
+
+    def test_i_can_add_concept_to_a_set_of_concept_when_global_truth_is_activated(self):
+        sheerka, context, foo, bar = self.init_test(global_truth=True).with_concepts("foo", "bar").unpack()
         ret_val = get_isa_ret_val("foo", "bar")
 
         res = AddConceptInSetEvaluator().eval(context, ret_val)
@@ -65,19 +78,18 @@ class TestAddConceptInSetEvaluator(TestUsingMemoryBasedSheerka):
 
         assert foo.get_prop(BuiltinConcepts.ISA) == {bar}
 
-    def test_i_can_add_bnf_concept_to_a_set_of_concept(self):
+    def test_i_can_add_bnf_concept_to_a_set_of_concept_when_global_truth_is_activated(self):
         """
         This test is the reason why I have started the whole eval on demand stuff
         Sheerka tries to evaluate the body but it can't (as a and b are not defined)
         So 'foo' cannot be put is set
         :return:
         """
-        sheerka, context, one, two, foo, bar = self.init_test().with_concepts(
+        sheerka, context, one, two, foo, bar = self.init_test(global_truth=True).with_concepts(
             "one",
             "two",
             Concept("foo", definition="(one|two)=a 'plus' (one|two)=b", body="a + b").def_var("a").def_var("b"),
-            "bar",
-            create_new=True).unpack()
+            "bar").unpack()
 
         ret_val = get_isa_ret_val("foo", "bar")
         res = AddConceptInSetEvaluator().eval(context, ret_val)
@@ -103,11 +115,25 @@ class TestAddConceptInSetEvaluator(TestUsingMemoryBasedSheerka):
         ret_val = get_isa_ret_val("foo", "bar")
         res = AddConceptInSetEvaluator().eval(context, ret_val)
 
+        assert res.status
+        assert context.sheerka.isinstance(res.value, foo.key)
+
+    def test_i_can_add_concept_with_a_body_to_a_set_of_concept_when_global_truth_is_activated(self):
+        context = self.get_context(global_truth=True)
+        foo = Concept("foo", body="1")
+        context.sheerka.create_new_concept(context, foo)
+
+        bar = Concept("bar")
+        context.sheerka.create_new_concept(context, bar)
+
+        ret_val = get_isa_ret_val("foo", "bar")
+        res = AddConceptInSetEvaluator().eval(context, ret_val)
+
         assert res.status
         assert context.sheerka.isinstance(res.value, BuiltinConcepts.SUCCESS)
 
     def test_i_cannot_add_the_same_concept_twice(self):
-        sheerka, context, foo, bar = self.init_test().with_concepts("foo", "bar", create_new=True).unpack()
+        sheerka, context, foo, bar = self.init_test(global_truth=True).with_concepts("foo", "bar").unpack()
 
         ret_val = get_isa_ret_val("foo", "bar")
         AddConceptInSetEvaluator().eval(context, ret_val)