From 20e33d3c2e2e97266b0655780be15997682bef25 Mon Sep 17 00:00:00 2001 From: Stefan Behnel <stefan_ml@behnel.de> Date: Sun, 13 Jul 2014 14:02:45 +0200 Subject: [PATCH] fix tests --- tests/run/constant_folding.py | 14 +++++++------- tests/run/notinop.pyx | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/run/constant_folding.py b/tests/run/constant_folding.py index 5ad8d2f3b..7d7f683b8 100644 --- a/tests/run/constant_folding.py +++ b/tests/run/constant_folding.py @@ -390,8 +390,8 @@ def combined(): '//IntNode[@value = "4"]', '//IntNode[@value = "5"]', '//IntNode[@value = "7"]', - '//BoolBinopNode//PrimaryCmpNode', - '//BoolBinopNode[.//PrimaryCmpNode//IntNode[@value = "4"] and .//PrimaryCmpNode//IntNode[@value = "5"]]', + '//GenericBoolBinopNode//PrimaryCmpNode', + '//GenericBoolBinopNode[.//PrimaryCmpNode//IntNode[@value = "4"] and .//PrimaryCmpNode//IntNode[@value = "5"]]', '//PrimaryCmpNode[.//IntNode[@value = "2"] and .//IntNode[@value = "4"]]', '//PrimaryCmpNode[.//IntNode[@value = "5"] and .//IntNode[@value = "7"]]', ) @@ -423,11 +423,11 @@ def cascaded_cmp_with_partial_constants(a, b): '//IntNode[@value = "4"]', '//IntNode[@value = "5"]', '//IntNode[@value = "7"]', - '//BoolBinopNode', - '//SingleAssignmentNode//BoolBinopNode', - '//SingleAssignmentNode//BoolBinopNode//NameNode[@name = "a"]', - '//SingleAssignmentNode//BoolBinopNode//NameNode[@name = "b"]', - '//BoolBinopNode[.//PrimaryCmpNode//IntNode[@value = "4"] and .//PrimaryCmpNode//IntNode[@value = "5"]]', + '//GenericBoolBinopNode', + '//SingleAssignmentNode//GenericBoolBinopNode', + '//SingleAssignmentNode//GenericBoolBinopNode//NameNode[@name = "a"]', + '//SingleAssignmentNode//GenericBoolBinopNode//NameNode[@name = "b"]', + '//GenericBoolBinopNode[.//PrimaryCmpNode//IntNode[@value = "4"] and .//PrimaryCmpNode//IntNode[@value = "5"]]', '//BoolNode[@value = False]', ) @cython.test_fail_if_path_exists( diff --git a/tests/run/notinop.pyx b/tests/run/notinop.pyx index 3bc630ff6..63177cd07 100644 --- a/tests/run/notinop.pyx +++ b/tests/run/notinop.pyx @@ -83,7 +83,7 @@ def m_tuple(int a): return result @cython.test_assert_path_exists("//SwitchStatNode") -@cython.test_fail_if_path_exists("//BoolBinopNode", "//PrimaryCmpNode") +@cython.test_fail_if_path_exists("//BoolBinopNode", "//GenericBoolBinopNode", "//PrimaryCmpNode") def m_set(int a): """ >>> m_set(2) @@ -97,7 +97,7 @@ def m_set(int a): cdef bytes bytes_string = b'abcdefg' @cython.test_assert_path_exists("//PrimaryCmpNode") -@cython.test_fail_if_path_exists("//SwitchStatNode", "//BoolBinopNode") +@cython.test_fail_if_path_exists("//SwitchStatNode", "//BoolBinopNode", "//GenericBoolBinopNode") def m_bytes(char a): """ >>> m_bytes(ord('f')) @@ -109,7 +109,7 @@ def m_bytes(char a): return result @cython.test_assert_path_exists("//SwitchStatNode") -@cython.test_fail_if_path_exists("//BoolBinopNode", "//PrimaryCmpNode") +@cython.test_fail_if_path_exists("//BoolBinopNode", "//GenericBoolBinopNode", "//PrimaryCmpNode") def m_bytes_literal(char a): """ >>> m_bytes_literal(ord('f')) @@ -127,7 +127,7 @@ cdef unicode klingon_character = u'\uF8D2' py_klingon_character = klingon_character @cython.test_assert_path_exists("//PrimaryCmpNode") -@cython.test_fail_if_path_exists("//SwitchStatNode", "//BoolBinopNode") +@cython.test_fail_if_path_exists("//SwitchStatNode", "//GenericBoolBinopNode", "//BoolBinopNode") def m_unicode(Py_UNICODE a, unicode unicode_string): """ >>> m_unicode(ord('f'), py_unicode_string) @@ -147,7 +147,7 @@ def m_unicode(Py_UNICODE a, unicode unicode_string): return result @cython.test_assert_path_exists("//SwitchStatNode") -@cython.test_fail_if_path_exists("//BoolBinopNode", "//PrimaryCmpNode") +@cython.test_fail_if_path_exists("//GenericBoolBinopNode", "//BoolBinopNode", "//PrimaryCmpNode") def m_unicode_literal(Py_UNICODE a): """ >>> m_unicode_literal(ord('f')) @@ -160,7 +160,7 @@ def m_unicode_literal(Py_UNICODE a): cdef int result = a not in u'abcdefg\u1234\uF8D2' return result -@cython.test_assert_path_exists("//SwitchStatNode", "//BoolBinopNode") +@cython.test_assert_path_exists("//SwitchStatNode", "//GenericBoolBinopNode") @cython.test_fail_if_path_exists("//PrimaryCmpNode") def m_tuple_in_or_notin(int a): """ @@ -174,7 +174,7 @@ def m_tuple_in_or_notin(int a): cdef int result = a not in (1,2,3,4) or a in (3,4) return result -@cython.test_assert_path_exists("//SwitchStatNode", "//BoolBinopNode") +@cython.test_assert_path_exists("//SwitchStatNode", "//GenericBoolBinopNode") @cython.test_fail_if_path_exists("//PrimaryCmpNode") def m_tuple_notin_or_notin(int a): """ @@ -189,7 +189,7 @@ def m_tuple_notin_or_notin(int a): return result @cython.test_assert_path_exists("//SwitchStatNode") -@cython.test_fail_if_path_exists("//BoolBinopNode", "//PrimaryCmpNode") +@cython.test_fail_if_path_exists("//GenericBoolBinopNode", "//BoolBinopNode", "//PrimaryCmpNode") def m_tuple_notin_and_notin(int a): """ >>> m_tuple_notin_and_notin(2) @@ -202,7 +202,7 @@ def m_tuple_notin_and_notin(int a): cdef int result = a not in (1,2,3,4) and a not in (6,7) return result -@cython.test_assert_path_exists("//SwitchStatNode", "//BoolBinopNode") +@cython.test_assert_path_exists("//SwitchStatNode", "//GenericBoolBinopNode") @cython.test_fail_if_path_exists("//PrimaryCmpNode") def m_tuple_notin_and_notin_overlap(int a): """ @@ -217,7 +217,7 @@ def m_tuple_notin_and_notin_overlap(int a): return result @cython.test_assert_path_exists("//SwitchStatNode") -@cython.test_fail_if_path_exists("//BoolBinopNode", "//PrimaryCmpNode") +@cython.test_fail_if_path_exists("//GenericBoolBinopNode", "//BoolBinopNode", "//PrimaryCmpNode") def conditional_int(int a): """ >>> conditional_int(1) @@ -230,7 +230,7 @@ def conditional_int(int a): return 1 if a not in (1,2,3,4) else 2 @cython.test_assert_path_exists("//SwitchStatNode") -@cython.test_fail_if_path_exists("//BoolBinopNode", "//PrimaryCmpNode") +@cython.test_fail_if_path_exists("//GenericBoolBinopNode", "//BoolBinopNode", "//PrimaryCmpNode") def conditional_object(int a): """ >>> conditional_object(1) @@ -243,7 +243,7 @@ def conditional_object(int a): return 1 if a not in (1,2,3,4) else '2' @cython.test_assert_path_exists("//SwitchStatNode") -@cython.test_fail_if_path_exists("//BoolBinopNode", "//PrimaryCmpNode") +@cython.test_fail_if_path_exists("//GenericBoolBinopNode", "//BoolBinopNode", "//PrimaryCmpNode") def conditional_bytes(char a): """ >>> conditional_bytes(ord('a')) @@ -256,7 +256,7 @@ def conditional_bytes(char a): return 1 if a not in b'abc' else '2' @cython.test_assert_path_exists("//SwitchStatNode") -@cython.test_fail_if_path_exists("//BoolBinopNode", "//PrimaryCmpNode") +@cython.test_fail_if_path_exists("//GenericBoolBinopNode", "//BoolBinopNode", "//PrimaryCmpNode") def conditional_unicode(Py_UNICODE a): """ >>> conditional_unicode(ord('a')) @@ -269,7 +269,7 @@ def conditional_unicode(Py_UNICODE a): return 1 if a not in u'abc' else '2' @cython.test_assert_path_exists("//SwitchStatNode") -@cython.test_fail_if_path_exists("//BoolBinopNode", "//PrimaryCmpNode") +@cython.test_fail_if_path_exists("//GenericBoolBinopNode", "//BoolBinopNode", "//PrimaryCmpNode") def conditional_none(int a): """ >>> conditional_none(1) -- 2.30.9