Implemented SheerkaOntology

tests/core/test_SheerkaEvaluateConcept.py

@@ -2,8 +2,9 @@ from dataclasses import dataclass
 
 import pytest
 from core.builtin_concepts import BuiltinConcepts, ReturnValueConcept, ParserResultConcept
-from core.concept import Concept, DoNotResolve, ConceptParts, InfiniteRecursionResolved, CB, NotInit, \
+from core.concept import Concept, DoNotResolve, ConceptParts, InfiniteRecursionResolved, CB, \
     concept_part_value, DEFINITION_TYPE_DEF
+from core.global_symbols import NotInit
 from core.sheerka.services.SheerkaEvaluateConcept import SheerkaEvaluateConcept
 from core.sheerka.services.SheerkaMemory import SheerkaMemory
 from parsers.BaseParser import BaseParser
@@ -13,7 +14,6 @@ from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 from tests.evaluators.EvaluatorTestsUtils import pr_ret_val, python_ret_val
 
 
-
 class TestSheerkaEvaluateConcept(TestUsingMemoryBasedSheerka):
 
     @pytest.mark.parametrize("body, expected", [
@@ -27,7 +27,7 @@ class TestSheerkaEvaluateConcept(TestUsingMemoryBasedSheerka):
         ("1 > 2", False),
     ])
     def test_i_can_evaluate_a_concept_with_simple_body(self, body, expected):
-        sheerka, context, concept = self.init_concepts(Concept("foo", body=body), eval_body=True)
+        sheerka, context, concept = self.init_test(eval_body=True).with_concepts(Concept("foo", body=body)).unpack()
 
         evaluated = sheerka.evaluate_concept(context, concept)
 
@@ -99,7 +99,9 @@ class TestSheerkaEvaluateConcept(TestUsingMemoryBasedSheerka):
 
     def test_i_can_evaluate_when_the_body_is_the_name_of_the_concept(self):
         # to prove that I can distinguish from a string
-        sheerka, context, concept = self.init_concepts(Concept("foo", body="'foo'"), eval_body=True, create_new=True)
+        sheerka, context, concept = self.init_test(eval_body=True).with_concepts(
+            Concept("foo", body="'foo'"),
+            create_new=True).unpack()
 
         evaluated = sheerka.evaluate_concept(context, concept)