[Python-checkins] python/dist/src/Lib/test test_sre.py,1.41,1.42

montanaro@users.sourceforge.net montanaro@users.sourceforge.net
Fri, 25 Apr 2003 08:17:08 -0700


Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv28369

Modified Files:
	test_sre.py 
Log Message:
Remove tests which were migrated to test_re.py.  There are still more tests
to migrate.


Index: test_sre.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sre.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** test_sre.py	20 Apr 2003 07:35:44 -0000	1.41
--- test_sre.py	25 Apr 2003 15:17:03 -0000	1.42
***************
*** 47,59 ****
      print 'Running tests on character literals'
  
- for i in [0, 8, 16, 32, 64, 127, 128, 255]:
-     test(r"""sre.match(r"\%03o" % i, chr(i)) is not None""", 1)
-     test(r"""sre.match(r"\%03o0" % i, chr(i)+"0") is not None""", 1)
-     test(r"""sre.match(r"\%03o8" % i, chr(i)+"8") is not None""", 1)
-     test(r"""sre.match(r"\x%02x" % i, chr(i)) is not None""", 1)
-     test(r"""sre.match(r"\x%02x0" % i, chr(i)+"0") is not None""", 1)
-     test(r"""sre.match(r"\x%02xz" % i, chr(i)+"z") is not None""", 1)
- test(r"""sre.match("\911", "")""", None, sre.error)
- 
  #
  # Misc tests from Tim Peters' re.doc
--- 47,50 ----
***************
*** 74,199 ****
  test(r"""sre.match(r'a+', 'xxx')""", None)
  
- # bug 113254
- test(r"""sre.match(r'(a)|(b)', 'b').start(1)""", -1)
- test(r"""sre.match(r'(a)|(b)', 'b').end(1)""", -1)
- test(r"""sre.match(r'(a)|(b)', 'b').span(1)""", (-1, -1))
- 
- # bug described in patches 527371/672491
- test(r"""sre.match(r'(a)?a','a').lastindex""", None)
- test(r"""sre.match(r'(a)(b)?b','ab').lastindex""", 1)
- test(r"""sre.match(r'(?P<a>a)(?P<b>b)?b','ab').lastgroup""", 'a')
- test(r"""sre.match("(?P<a>a(b))", "ab").lastgroup""", 'a')
- test(r"""sre.match("((a))", "a").lastindex""", 1)
- 
- # bug 545855 -- This pattern failed to cause a compile error as it
- # should, instead provoking a TypeError.
- test(r"""sre.compile('foo[a-')""", None, sre.error)
- 
- # bugs 418626 at al. -- Testing Greg Chapman's addition of op code
- # SRE_OP_MIN_REPEAT_ONE for eliminating recursion on simple uses of
- # pattern '*?' on a long string.
- test(r"""sre.match('.*?c', 10000*'ab'+'cd').end(0)""", 20001)
- test(r"""sre.match('.*?cd', 5000*'ab'+'c'+5000*'ab'+'cde').end(0)""", 20003)
- test(r"""sre.match('.*?cd', 20000*'abc'+'de').end(0)""", 60001)
- # non-simple '*?' still recurses and hits the recursion limit
- test(r"""sre.search('(a|b)*?c', 10000*'ab'+'cd').end(0)""", None, RuntimeError)
- 
- # bug 612074
- pat=u"["+sre.escape(u"\u2039")+u"]"
- test(r"""sre.compile(pat) and 1""", 1, None)
- 
- if verbose:
-     print 'Running tests on sre.sub'
- 
- test(r"""sre.sub(r"(?i)b+", "x", "bbbb BBBB")""", 'x x')
- 
- def bump_num(matchobj):
-     int_value = int(matchobj.group(0))
-     return str(int_value + 1)
- 
- test(r"""sre.sub(r'\d+', bump_num, '08.2 -2 23x99y')""", '9.3 -3 24x100y')
- test(r"""sre.sub(r'\d+', bump_num, '08.2 -2 23x99y', 3)""", '9.3 -3 23x99y')
- 
- test(r"""sre.sub(r'.', lambda m: r"\n", 'x')""", '\\n')
- test(r"""sre.sub(r'.', r"\n", 'x')""", '\n')
- 
- s = r"\1\1"
- 
- test(r"""sre.sub(r'(.)', s, 'x')""", 'xx')
- test(r"""sre.sub(r'(.)', sre.escape(s), 'x')""", s)
- test(r"""sre.sub(r'(.)', lambda m: s, 'x')""", s)
- 
- test(r"""sre.sub(r'(?P<a>x)', '\g<a>\g<a>', 'xx')""", 'xxxx')
- test(r"""sre.sub(r'(?P<a>x)', '\g<a>\g<1>', 'xx')""", 'xxxx')
- test(r"""sre.sub(r'(?P<unk>x)', '\g<unk>\g<unk>', 'xx')""", 'xxxx')
- test(r"""sre.sub(r'(?P<unk>x)', '\g<1>\g<1>', 'xx')""", 'xxxx')
- 
- # bug 449964: fails for group followed by other escape
- test(r"""sre.sub(r'(?P<unk>x)', '\g<1>\g<1>\\b', 'xx')""", 'xx\bxx\b')
- 
- test(r"""sre.sub(r'a', r'\t\n\v\r\f\a\b\B\Z\a\A\w\W\s\S\d\D', 'a')""", '\t\n\v\r\f\a\b\\B\\Z\a\\A\\w\\W\\s\\S\\d\\D')
- test(r"""sre.sub(r'a', '\t\n\v\r\f\a', 'a')""", '\t\n\v\r\f\a')
- test(r"""sre.sub(r'a', '\t\n\v\r\f\a', 'a')""", (chr(9)+chr(10)+chr(11)+chr(13)+chr(12)+chr(7)))
- 
- test(r"""sre.sub(r'^\s*', 'X', 'test')""", 'Xtest')
- 
- # qualified sub
- test(r"""sre.sub(r'a', 'b', 'aaaaa')""", 'bbbbb')
- test(r"""sre.sub(r'a', 'b', 'aaaaa', 1)""", 'baaaa')
- 
- # bug 114660
- test(r"""sre.sub(r'(\S)\s+(\S)', r'\1 \2', 'hello  there')""", 'hello there')
- 
- # Test for sub() on escaped characters, see SF bug #449000
- test(r"""sre.sub(r'\r\n', r'\n', 'abc\r\ndef\r\n')""", 'abc\ndef\n')
- test(r"""sre.sub('\r\n', r'\n', 'abc\r\ndef\r\n')""", 'abc\ndef\n')
- test(r"""sre.sub(r'\r\n', '\n', 'abc\r\ndef\r\n')""", 'abc\ndef\n')
- test(r"""sre.sub('\r\n', '\n', 'abc\r\ndef\r\n')""", 'abc\ndef\n')
- 
- # Test for empty sub() behaviour, see SF bug #462270
- test(r"""sre.sub('x*', '-', 'abxd')""", '-a-b-d-')
- test(r"""sre.sub('x+', '-', 'abxd')""", 'ab-d')
- 
- if verbose:
-     print 'Running tests on symbolic references'
- 
- test(r"""sre.sub(r'(?P<a>x)', '\g<a', 'xx')""", None, sre.error)
- test(r"""sre.sub(r'(?P<a>x)', '\g<', 'xx')""", None, sre.error)
- test(r"""sre.sub(r'(?P<a>x)', '\g', 'xx')""", None, sre.error)
- test(r"""sre.sub(r'(?P<a>x)', '\g<a a>', 'xx')""", None, sre.error)
- test(r"""sre.sub(r'(?P<a>x)', '\g<1a1>', 'xx')""", None, sre.error)
- test(r"""sre.sub(r'(?P<a>x)', '\g<ab>', 'xx')""", None, IndexError)
- test(r"""sre.sub(r'(?P<a>x)|(?P<b>y)', '\g<b>', 'xx')""", None, sre.error)
- test(r"""sre.sub(r'(?P<a>x)|(?P<b>y)', '\\2', 'xx')""", None, sre.error)
- 
- if verbose:
-     print 'Running tests on sre.subn'
- 
- test(r"""sre.subn(r"(?i)b+", "x", "bbbb BBBB")""", ('x x', 2))
- test(r"""sre.subn(r"b+", "x", "bbbb BBBB")""", ('x BBBB', 1))
- test(r"""sre.subn(r"b+", "x", "xyz")""", ('xyz', 0))
- test(r"""sre.subn(r"b*", "x", "xyz")""", ('xxxyxzx', 4))
- test(r"""sre.subn(r"b*", "x", "xyz", 2)""", ('xxxyz', 2))
- 
- if verbose:
-     print 'Running tests on sre.split'
- 
- test(r"""sre.split(r":", ":a:b::c")""", ['', 'a', 'b', '', 'c'])
- test(r"""sre.split(r":+", ":a:b:::")""", ['', 'a', 'b', ''])
- test(r"""sre.split(r":*", ":a:b::c")""", ['', 'a', 'b', 'c'])
- test(r"""sre.split(r"(:*)", ":a:b::c")""", ['', ':', 'a', ':', 'b', '::', 'c'])
- test(r"""sre.split(r"(?::*)", ":a:b::c")""", ['', 'a', 'b', 'c'])
- test(r"""sre.split(r"(:)*", ":a:b::c")""", ['', ':', 'a', ':', 'b', ':', 'c'])
- test(r"""sre.split(r"([b:]+)", ":a:b::c")""", ['', ':', 'a', ':b::', 'c'])
- test(r"""sre.split(r"(b)|(:+)", ":a:b::c")""",
-      ['', None, ':', 'a', None, ':', '', 'b', None, '', None, '::', 'c'])
- test(r"""sre.split(r"(?:b)|(?::+)", ":a:b::c")""", ['', 'a', '', '', 'c'])
- 
- test(r"""sre.split(r":", ":a:b::c", 2)""", ['', 'a', 'b::c'])
- test(r"""sre.split(r':', 'a:b:c:d', 2)""", ['a', 'b', 'c:d'])
- 
- test(r"""sre.split(r"(:)", ":a:b::c", 2)""", ['', ':', 'a', ':', 'b::c'])
- test(r"""sre.split(r"(:*)", ":a:b::c", 2)""", ['', ':', 'a', ':', 'b::c'])
- 
  if verbose:
      print "Running tests on sre.findall"
--- 65,68 ----
***************
*** 322,454 ****
  test("sre.match(r'(x)*y', 50000*'x'+'y').span()", (0, 50001), RuntimeError)
  test("sre.match(r'(x)*?y', 50000*'x'+'y').span()", (0, 50001), RuntimeError)
- 
- from test.re_tests import *
- 
- if verbose:
-     print 'Running re_tests test suite'
- else:
-     # To save time, only run the first and last 10 tests
-     #tests = tests[:10] + tests[-10:]
-     pass
- 
- for t in tests:
-     sys.stdout.flush()
-     pattern=s=outcome=repl=expected=None
-     if len(t)==5:
-         pattern, s, outcome, repl, expected = t
-     elif len(t)==3:
-         pattern, s, outcome = t
-     else:
-         raise ValueError, ('Test tuples should have 3 or 5 fields',t)
- 
-     try:
-         obj=sre.compile(pattern)
-     except sre.error:
-         if outcome==SYNTAX_ERROR: pass  # Expected a syntax error
-         else:
-             print '=== Syntax error:', t
-     except KeyboardInterrupt: raise KeyboardInterrupt
-     except:
-         print '*** Unexpected error ***', t
-         if verbose:
-             traceback.print_exc(file=sys.stdout)
-     else:
-         try:
-             result=obj.search(s)
-         except (sre.error), msg:
-             print '=== Unexpected exception', t, repr(msg)
-         if outcome==SYNTAX_ERROR:
-             print '=== Compiled incorrectly', t
-         elif outcome==FAIL:
-             if result is None: pass   # No match, as expected
-             else: print '=== Succeeded incorrectly', t
-         elif outcome==SUCCEED:
-             if result is not None:
-                 # Matched, as expected, so now we compute the
-                 # result string and compare it to our expected result.
-                 start, end = result.span(0)
-                 vardict={'found': result.group(0),
-                          'groups': result.group(),
-                          'flags': result.re.flags}
-                 for i in range(1, 100):
-                     try:
-                         gi = result.group(i)
-                         # Special hack because else the string concat fails:
-                         if gi is None:
-                             gi = "None"
-                     except IndexError:
-                         gi = "Error"
-                     vardict['g%d' % i] = gi
-                 for i in result.re.groupindex.keys():
-                     try:
-                         gi = result.group(i)
-                         if gi is None:
-                             gi = "None"
-                     except IndexError:
-                         gi = "Error"
-                     vardict[i] = gi
-                 repl=eval(repl, vardict)
-                 if repl!=expected:
-                     print '=== grouping error', t,
-                     print repr(repl)+' should be '+repr(expected)
-             else:
-                 print '=== Failed incorrectly', t
-                 continue
- 
-             # Try the match on a unicode string, and check that it
-             # still succeeds.
-             try:
-                 u = unicode(s, "latin-1")
-             except NameError:
-                 pass
-             except TypeError:
-                 continue # skip unicode test strings
-             else:
-                 result=obj.search(u)
-                 if result==None:
-                     print '=== Fails on unicode match', t
- 
-             # Try the match on a unicode pattern, and check that it
-             # still succeeds.
-             try:
-                 u = unicode(pattern, "latin-1")
-             except NameError:
-                 pass
-             else:
-                 obj=sre.compile(u)
-                 result=obj.search(s)
-                 if result==None:
-                     print '=== Fails on unicode pattern match', t
- 
-             # Try the match with the search area limited to the extent
-             # of the match and see if it still succeeds.  \B will
-             # break (because it won't match at the end or start of a
-             # string), so we'll ignore patterns that feature it.
- 
-             if pattern[:2]!='\\B' and pattern[-2:]!='\\B':
-                 obj=sre.compile(pattern)
-                 result=obj.search(s, result.start(0), result.end(0)+1)
-                 if result==None:
-                     print '=== Failed on range-limited match', t
- 
-             # Try the match with IGNORECASE enabled, and check that it
-             # still succeeds.
-             obj=sre.compile(pattern, sre.IGNORECASE)
-             result=obj.search(s)
-             if result==None:
-                 print '=== Fails on case-insensitive match', t
- 
-             # Try the match with LOCALE enabled, and check that it
-             # still succeeds.
-             obj=sre.compile(pattern, sre.LOCALE)
-             result=obj.search(s)
-             if result==None:
-                 print '=== Fails on locale-sensitive match', t
- 
-             # Try the match with UNICODE locale enabled, and check
-             # that it still succeeds.
-             if have_unicode:
-                 obj=sre.compile(pattern, sre.UNICODE)
-                 result=obj.search(s)
-                 if result==None:
-                     print '=== Fails on unicode-sensitive match', t
--- 191,192 ----