You must now use 'eval' to get the body of a concept

tests/test_sheerka.py

@@ -9,7 +9,7 @@ from core.sheerka import Sheerka, ExecutionContext
 from evaluators.MutipleSameSuccessEvaluator import MultipleSameSuccessEvaluator
 from parsers.ConceptLexerParser import Sequence, ZeroOrMore, StrMatch, OrderedChoice, Optional, ConceptMatch, \
     ConceptLexerParser
-from sdp.sheerkaDataProvider import SheerkaDataProvider
+from sdp.sheerkaDataProvider import SheerkaDataProvider, Event
 
 tests_root = path.abspath("../build/tests")
 root_folder = "init_folder"
@@ -39,7 +39,7 @@ def get_sheerka(use_dict=True, skip_builtins_in_db=True):
 
 
 def get_context(sheerka):
-    return ExecutionContext("test", "xxx", sheerka)
+    return ExecutionContext("test", Event(), sheerka)
 
 
 def get_default_concept():
@@ -131,8 +131,8 @@ def test_i_cannot_add_the_same_concept_twice():
     res = sheerka.create_new_concept(get_context(sheerka), concept)
 
     assert not res.status
-    assert sheerka.isinstance(res.value, BuiltinConcepts.ERROR)
-    assert res.value.body.args[0] == "Duplicate object."
+    assert sheerka.isinstance(res.value, BuiltinConcepts.CONCEPT_ALREADY_DEFINED)
+    assert res.value.body == concept
 
 
 def test_i_can_get_a_builtin_concept_by_their_enum_or_the_string():
@@ -317,33 +317,27 @@ def test_i_cannot_instantiate_when_properties_are_not_recognized():
     assert sheerka.isinstance(new.concept, concept)
 
 
-@pytest.mark.parametrize("concept, allow_non_body, expected", [
+@pytest.mark.parametrize("concept, reduce_simple_list, expected", [
     (None, False, None),
     (3.14, False, 3.14),
     ("foo", False, "foo"),
     (True, False, True),
     (Concept("name", body="foo"), False, "foo"),
-    (Concept("name"), True, Concept("name")),
-    (ConceptWithGetValue("name").set_prop("my_prop", "my_value"), True, "my_value"),
+    (Concept("name"), False, Concept("name")),
+    (ConceptWithGetValue("name").set_prop("my_prop", "my_value"), False, "my_value"),
     (ReturnValueConcept(value="return_value"), False, "return_value"),
     (ReturnValueConcept(value=Concept(key=BuiltinConcepts.USER_INPUT, body="text"), status=True), False, "text"),
     (ReturnValueConcept(value=UserInputConcept("text"), status=True), False, "text"),
     (Concept("name", body=["foo", "bar"]), False, ["foo", "bar"]),
-    (Concept("name", body=["foo"]), False, "foo"),
+    (Concept("name", body=["foo"]), True, "foo"),
+    (Concept("name", body=Concept("foo")), False, Concept("foo")),
+    (Concept("name", body=Concept("foo", body="value")), False, "value"),
+    (Concept("name", body=Concept("foo", body=ReturnValueConcept(value="return_value"))), False, "return_value"),
 ])
-def test_i_can_get_value(concept, allow_non_body, expected):
+def test_i_can_get_value(concept, reduce_simple_list, expected):
     sheerka = get_sheerka()
 
-    assert sheerka.value(concept, allow_non_body) == expected
-
-
-def test_i_cannot_get_value_when_no_body_and_allow_none_body_is_false():
-    sheerka = get_sheerka()
-    concept = Concept("name")
-    allow_none_body = False
-
-    assert sheerka.value(concept, allow_none_body) == sheerka.new(BuiltinConcepts.CANNOT_RESOLVE_VALUE_ERROR,
-                                                                  body=concept)
+    assert sheerka.value(concept, reduce_simple_list) == expected
 
 
 def test_list_of_concept_is_sorted_by_id():
@@ -569,6 +563,17 @@ def test_properties_values_takes_precedence_over_the_outside_world():
     assert evaluated.body == 'concept_b'
 
 
+def test_properties_values_takes_precedence():
+    sheerka = get_sheerka()
+    sheerka.add_in_cache(Concept(name="a", body="'concept_a'").init_key())
+    sheerka.add_in_cache(Concept(name="b", body="'concept_b'").init_key())
+
+    concept = Concept("foo", body="a + b").set_prop("a", "'prop_a'").init_key()
+    evaluated = sheerka.evaluate_concept(get_context(sheerka), concept)
+    assert evaluated.key == concept.key
+    assert evaluated.body == 'prop_aconcept_b'
+
+
 def test_i_can_reference_sub_property_of_a_property():
     sheerka = get_sheerka()
     sheerka.add_in_cache(Concept(name="concept_a").set_prop("subProp", "'sub_a'").init_key())
@@ -666,5 +671,3 @@ def test_i_cannot_add_the_same_concept_twice_in_a_set():
     all_entries = sheerka.sdp.get("All_" + all_foos.id, None, False)
     assert len(all_entries) == 1
     assert foo.id in all_entries
-
-