Pārlūkot izejas kodu

Remove tests that tested the primitives which are now implemented in AL

Yentl Van Tendeloo 9 gadi atpakaļ
vecāks
revīzija
254cd9dd06

+ 0 - 6
bootstrap/bootstrap.py

@@ -19,25 +19,20 @@ def bootstrap():
                     "integer_multiplication": ["Integer", "Integer", "Integer"],
                     "integer_division": ["Integer", "Integer", "Integer"],
                     "integer_gt": ["Boolean", "Integer", "Integer"],
-                    "integer_gte": ["Boolean", "Integer", "Integer"],
                     "integer_lt": ["Boolean", "Integer", "Integer"],
-                    "integer_lte": ["Boolean", "Integer", "Integer"],
                     "integer_neg": ["Integer", "Integer"],
                     "float_addition": ["Float", "Float", "Float"],
                     "float_subtraction": ["Float", "Float", "Float"],
                     "float_multiplication": ["Float", "Float", "Float"],
                     "float_division": ["Float", "Float", "Float"],
                     "float_gt": ["Boolean", "Float", "Float"],
-                    "float_gte": ["Boolean", "Float", "Float"],
                     "float_lt": ["Boolean", "Float", "Float"],
-                    "float_lte": ["Boolean", "Float", "Float"],
                     "float_neg": ["Float", "Float"],
                     "bool_and": ["Boolean", "Boolean", "Boolean"],
                     "bool_or": ["Boolean", "Boolean", "Boolean"],
                     "bool_not": ["Boolean", "Boolean"],
                     "string_join": ["String", "String", "String"],
                     "string_get": ["String", "String", "Integer"],
-                    "string_substr": ["String", "String", "Integer", "Integer"],
                     "string_len": ["Integer", "String"],
                     "string_split": ["Element", "String", "String"],
                     "value_eq":  ["Boolean", "Element", "Element"],
@@ -83,7 +78,6 @@ def bootstrap():
                     "is_physical_string": ["Boolean", "Element"],
                     "is_physical_action": ["Boolean", "Element"],
                     "is_physical_float": ["Boolean", "Element"],
-                    "has_value": ["Boolean", "Element"],
                     "create_node": ["Element"],
                     "create_edge": ["Element", "Element", "Element"],
                     "create_value": ["Element", "Element"],

+ 0 - 30
kernel/modelverse_kernel/primitives.py

@@ -33,16 +33,6 @@ def integer_lt(a, b, **remainder):
     result = yield [("CNV", [a_value < b_value])]
     raise PrimitiveFinished(result)
 
-def integer_gte(a, b, **remainder):
-    a_value, b_value =  yield [("RV", [a]), ("RV", [b])]
-    result = yield [("CNV", [a_value >= b_value])]
-    raise PrimitiveFinished(result)
-
-def integer_lte(a, b, **remainder):
-    a_value, b_value =  yield [("RV", [a]), ("RV", [b])]
-    result = yield [("CNV", [a_value <= b_value])]
-    raise PrimitiveFinished(result)
-
 def integer_neg(a, **remainder):
     a_value =           yield [("RV", [a])]
     result = yield [("CNV", [-a_value])]
@@ -93,16 +83,6 @@ def float_lt(a, b, **remainder):
     result = yield [("CNV", [a_value < b_value])]
     raise PrimitiveFinished(result)
 
-def float_gte(a, b, **remainder):
-    a_value, b_value =  yield [("RV", [a]), ("RV", [b])]
-    result = yield [("CNV", [a_value >= b_value])]
-    raise PrimitiveFinished(result)
-
-def float_lte(a, b, **remainder):
-    a_value, b_value =  yield [("RV", [a]), ("RV", [b])]
-    result = yield [("CNV", [a_value <= b_value])]
-    raise PrimitiveFinished(result)
-
 def float_neg(a, **remainder):
     a_value =           yield [("RV", [a])]
     result = yield [("CNV", [-a_value])]
@@ -126,11 +106,6 @@ def string_get(a, b, **remainder):
     result = yield [("CNV", [a_value[b_value]])]
     raise PrimitiveFinished(result)
 
-def string_substr(a, b, c, **remainder):
-    a_value, b_value, c_value = yield [("RV", [a]), ("RV", [b]), ("RV", [c])]
-    result = yield [("CNV", [a_value[b_value:c_value]])]
-    raise PrimitiveFinished(result)
-
 def string_len(a, **remainder):
     a_value = yield [("RV", [a])]
     result = yield [("CNV", [len(a_value)])]
@@ -347,11 +322,6 @@ def is_physical_boolean(a, **remainder):
     result = yield [("CNV", [isinstance(t, bool)])]
     raise PrimitiveFinished(result)
 
-def has_value(a, **remainder):
-    t = yield [("RV", [a])]
-    result = yield [("CNV", [t is not None])]
-    raise PrimitiveFinished(result)
-
 def is_physical_action(a, **remainder):
     t = yield [("RV", [a])]
     result = yield [("CNV", [isinstance(t, dict) and t["value"] in ["if", "while", "assign", "call", "break", "continue", "return", "resolve", "access", "constant", "global", "declare"]])]

+ 0 - 18
kernel/test/primitives/test_float.py

@@ -46,15 +46,6 @@ class TestInteger(unittest.TestCase):
     def test_gt_greater(self):
         self.helper_primitives_2_params("float_gt", 5.8, 2.4, True)
 
-    def test_gte_less(self):
-        self.helper_primitives_2_params("float_gte", 2.4, 5.8, False)
-
-    def test_gte_eq(self):
-        self.helper_primitives_2_params("float_gte", 2.4, 2.4, True)
-
-    def test_gte_greater(self):
-        self.helper_primitives_2_params("float_gte", 5.8, 2.4, True)
-
     def test_lt_less(self):
         self.helper_primitives_2_params("float_lt", 2.4, 5.8, True)
 
@@ -64,15 +55,6 @@ class TestInteger(unittest.TestCase):
     def test_lt_greater(self):
         self.helper_primitives_2_params("float_lt", 5.8, 2.4, False)
 
-    def test_lte_less(self):
-        self.helper_primitives_2_params("float_lte", 2.4, 5.8, True)
-
-    def test_lte_eq(self):
-        self.helper_primitives_2_params("float_lte", 2.4, 2.4, True)
-
-    def test_lte_greater(self):
-        self.helper_primitives_2_params("float_lte", 5.8, 2.4, False)
-
     def test_eq_diff(self):
         self.helper_primitives_2_params("value_eq", 2.4, 5.8, False)
 

+ 0 - 18
kernel/test/primitives/test_integer.py

@@ -46,15 +46,6 @@ class TestInteger(unittest.TestCase):
     def test_gt_greater(self):
         self.helper_primitives_2_params("integer_gt", 5, 2, True)
 
-    def test_gte_less(self):
-        self.helper_primitives_2_params("integer_gte", 2, 5, False)
-
-    def test_gte_eq(self):
-        self.helper_primitives_2_params("integer_gte", 2, 2, True)
-
-    def test_gte_greater(self):
-        self.helper_primitives_2_params("integer_gte", 5, 2, True)
-
     def test_lt_less(self):
         self.helper_primitives_2_params("integer_lt", 2, 5, True)
 
@@ -64,15 +55,6 @@ class TestInteger(unittest.TestCase):
     def test_lt_greater(self):
         self.helper_primitives_2_params("integer_lt", 5, 2, False)
 
-    def test_lte_less(self):
-        self.helper_primitives_2_params("integer_lte", 2, 5, True)
-
-    def test_lte_eq(self):
-        self.helper_primitives_2_params("integer_lte", 2, 2, True)
-
-    def test_lte_greater(self):
-        self.helper_primitives_2_params("integer_lte", 5, 2, False)
-
     def test_eq_diff(self):
         self.helper_primitives_2_params("value_eq", 2, 5, False)
 

+ 0 - 12
kernel/test/primitives/test_string.py

@@ -73,18 +73,6 @@ class TestString(unittest.TestCase):
     def test_get_last(self):
         self.helper_primitives_2_params("string_get", "abcdefghijklmnopqrstuvwxyz", 25, "z")
 
-    def test_substr_empty(self):
-        self.helper_primitives_3_params("string_substr", "abcdefghijklmnopqrstuvwxyz", 1, 1, "")
-
-    def test_substr_one(self):
-        self.helper_primitives_3_params("string_substr", "abcdefghijklmnopqrstuvwxyz", 0, 1, "a")
-
-    def test_substr(self):
-        self.helper_primitives_3_params("string_substr", "abcdefghijklmnopqrstuvwxyz", 10, 15, "klmno")
-
-    def test_substr_full(self):
-        self.helper_primitives_3_params("string_substr", "abcdefghijklmnopqrstuvwxyz", 0, 26, "abcdefghijklmnopqrstuvwxyz")
-
     def test_len(self):
         self.helper_primitives_1_params("string_len", "abcdefghijklmnopqrstuvwxyz", 26)