Refactored Concept class for better separation of metadata, compiled and values

tests/test_ConceptEvaluator.py

@@ -1,10 +1,9 @@
 import pytest
 
 from core.builtin_concepts import ReturnValueConcept, ParserResultConcept, BuiltinConcepts
-from core.concept import Concept
+from core.concept import Concept, ConceptParts
 from core.sheerka import Sheerka, ExecutionContext
 from evaluators.ConceptEvaluator import ConceptEvaluator
-from parsers.BaseParser import BaseParser
 from parsers.ExactConceptParser import ExactConceptParser
 from sdp.sheerkaDataProvider import Event
 
@@ -41,7 +40,7 @@ def test_i_can_evaluate_concept():
     concept = Concept(name="foo",
                       where="1",
                       pre="2",
-                      post="3").set_prop("a", "4").set_prop("b", "5")
+                      post="3").def_prop("a", "4").def_prop("b", "5")
 
     evaluator = ConceptEvaluator()
     item = get_return_value(concept)
@@ -49,10 +48,13 @@ def test_i_can_evaluate_concept():
 
     assert result.who == evaluator.name
     assert result.status
-    assert result.value == Concept(name="foo",
-                                   where=1,
-                                   pre=2,
-                                   post=3).set_prop("a", 4).set_prop("b", 5).init_key()
+    assert result.value.name == "foo"
+    assert result.value.get_metadata_value(ConceptParts.WHERE) == 1
+    assert result.value.get_metadata_value(ConceptParts.PRE) == 2
+    assert result.value.get_metadata_value(ConceptParts.POST) == 3
+    assert result.value.get_prop("a") == 4
+    assert result.value.get_prop("b") == 5
+    assert result.value.key == "foo"
     assert result.parents == [item]
 
 
@@ -111,8 +113,8 @@ def test_i_cannot_recognize_a_concept_if_one_of_the_prop_is_unknown():
     context = get_context()
     context.sheerka.add_in_cache(Concept(name="one").init_key())
     concept_plus = context.sheerka.add_in_cache(Concept(name="a plus b")
-                                                .set_prop("a", "one")
-                                                .set_prop("b", "two").init_key())
+                                                .def_prop("a", "one")
+                                                .def_prop("b", "two").init_key())
 
     evaluator = ConceptEvaluator()
     item = get_return_value(concept_plus)