Managing concept properties in ConceptEvaluator

tests/test_sheerka.py

@@ -341,7 +341,7 @@ def test_i_can_use_expect_one_when_not_a_list_false():
     ("1 + 1", 2),
     ("sheerka.test()", 'I have access to Sheerka !')
 ])
-def test_i_can_eval_simple_python_expressions(text, expected):
+def test_i_can_eval_python_expressions_with_no_variable(text, expected):
     sheerka = get_sheerka()
 
     res = sheerka.eval(text)
@@ -351,9 +351,9 @@ def test_i_can_eval_simple_python_expressions(text, expected):
     assert res[0].value == expected
 
 
-def test_i_can_eval_simple_concept():
+def test_i_can_eval_concept_with_python_body():
     sheerka = get_sheerka()
-    concept = Concept(name="one", body="1").init_key()
+    concept = Concept(name="one", body="1")
     sheerka.add_in_cache(concept)
 
     text = "one"
@@ -363,6 +363,46 @@ def test_i_can_eval_simple_concept():
     assert res[0].value == 1
 
 
+def test_i_can_eval_concept_with_concept_body():
+    sheerka = get_sheerka()
+    concept_one = Concept(name="one")
+    concept_un = Concept(name="un", body="one")
+    sheerka.add_in_cache(concept_one)
+    sheerka.add_in_cache(concept_un)
+
+    res = sheerka.eval("un")
+    return_value = res[0].value
+    assert len(res) == 1
+    assert res[0].status
+    assert sheerka.isinstance(return_value, concept_one)
+
+
+def test_i_can_eval_concept_with_no_body():
+    sheerka = get_sheerka()
+    concept = Concept(name="one")
+    sheerka.add_in_cache(concept)
+
+    text = "one"
+    res = sheerka.eval(text)
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].value == concept
+    assert id(res[0].value) != id(concept)
+
+
+def test_is_unique_property_is_used_when_evaluating():
+    sheerka = get_sheerka()
+    concept = Concept(name="one", is_unique=True)
+    sheerka.add_in_cache(concept)
+
+    text = "one"
+    res = sheerka.eval(text)
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].value == concept
+    assert id(res[0].value) == id(concept)
+
+
 def test_i_can_eval_def_concept_request():
     text = """
 def concept a + b
@@ -405,7 +445,7 @@ def test_i_can_eval_def_concept_part_when_one_part_is_a_ref_of_another_concept()
     sheerka = get_sheerka()
 
     # concept 'a plus b' is known
-    concept_a_plus_b = Concept(name="a plus b").set_prop("a").set_prop("b").init_key()
+    concept_a_plus_b = Concept(name="a plus b").set_prop("a").set_prop("b")
     sheerka.add_in_cache(concept_a_plus_b)
 
     res = sheerka.eval("def concept a xx b as a plus b")
@@ -461,6 +501,45 @@ def test_i_can_eval_a_empty_input(text):
     assert sheerka.isinstance(res[0].value, BuiltinConcepts.NOP)
 
 
+def test_i_can_eval_concept_with_variable():
+    sheerka = get_sheerka()
+    concept_hello = Concept(name="hello a").set_prop("a")
+    concept_foo = Concept(name="foo")
+    sheerka.add_in_cache(concept_hello)
+    sheerka.add_in_cache(concept_foo)
+
+    res = sheerka.eval("hello foo")
+    return_value = res[0].value
+    assert len(res) == 1
+    assert res[0].status
+    assert sheerka.isinstance(return_value, concept_hello)
+    assert return_value.props["a"].value == concept_foo
+
+
+def test_i_can_eval_concept_with_variable_and_python_as_body():
+    sheerka = get_sheerka()
+    sheerka.add_in_cache(Concept(name="hello a", body="'hello ' + a").set_prop("a"))
+    sheerka.add_in_cache(Concept(name="foo", body="'foo'"))
+
+    res = sheerka.eval("hello foo")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].value, "hello foo"
+
+
+def test_i_can_eval_duplicate_concepts_with_same_value():
+    sheerka = get_sheerka()
+
+    sheerka.add_in_cache(Concept(name="hello a", body="'hello ' + a").set_prop("a"))
+    sheerka.add_in_cache(Concept(name="hello foo", body="'hello foo'"))
+    sheerka.add_in_cache(Concept(name="foo", body="'foo'"))
+
+    res = sheerka.eval("hello foo")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].value, "hello foo"
+
+
 def get_sheerka():
     sheerka = Sheerka()
     sheerka.initialize(root_folder)