mirror of
https://github.com/python/cpython.git
synced 2025-11-25 04:34:37 +00:00
Combine the functionality of test_support.run_unittest()
and test_support.run_classtests() into run_unittest() and use it wherever possible. Also don't use "from test.test_support import ...", but "from test import test_support" in a few spots. From SF patch #662807.
This commit is contained in:
parent
90437c03f2
commit
21d3a32b99
63 changed files with 310 additions and 402 deletions
|
|
@ -1,16 +1,16 @@
|
|||
from unittest import TestCase
|
||||
from test.test_support import vereq, run_unittest
|
||||
from base64 import encodestring, decodestring
|
||||
import unittest
|
||||
from test import test_support
|
||||
import base64
|
||||
|
||||
class Base64TestCase(TestCase):
|
||||
class Base64TestCase(unittest.TestCase):
|
||||
|
||||
def test_encodestring(self):
|
||||
vereq(encodestring("www.python.org"), "d3d3LnB5dGhvbi5vcmc=\n")
|
||||
vereq(encodestring("a"), "YQ==\n")
|
||||
vereq(encodestring("ab"), "YWI=\n")
|
||||
vereq(encodestring("abc"), "YWJj\n")
|
||||
vereq(encodestring(""), "")
|
||||
vereq(encodestring("abcdefghijklmnopqrstuvwxyz"
|
||||
self.assertEqual(base64.encodestring("www.python.org"), "d3d3LnB5dGhvbi5vcmc=\n")
|
||||
self.assertEqual(base64.encodestring("a"), "YQ==\n")
|
||||
self.assertEqual(base64.encodestring("ab"), "YWI=\n")
|
||||
self.assertEqual(base64.encodestring("abc"), "YWJj\n")
|
||||
self.assertEqual(base64.encodestring(""), "")
|
||||
self.assertEqual(base64.encodestring("abcdefghijklmnopqrstuvwxyz"
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789!@#0^&*();:<>,. []{}"),
|
||||
"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
|
||||
|
|
@ -18,20 +18,20 @@ class Base64TestCase(TestCase):
|
|||
"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n")
|
||||
|
||||
def test_decodestring(self):
|
||||
vereq(decodestring("d3d3LnB5dGhvbi5vcmc=\n"), "www.python.org")
|
||||
vereq(decodestring("YQ==\n"), "a")
|
||||
vereq(decodestring("YWI=\n"), "ab")
|
||||
vereq(decodestring("YWJj\n"), "abc")
|
||||
vereq(decodestring("YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
|
||||
self.assertEqual(base64.decodestring("d3d3LnB5dGhvbi5vcmc=\n"), "www.python.org")
|
||||
self.assertEqual(base64.decodestring("YQ==\n"), "a")
|
||||
self.assertEqual(base64.decodestring("YWI=\n"), "ab")
|
||||
self.assertEqual(base64.decodestring("YWJj\n"), "abc")
|
||||
self.assertEqual(base64.decodestring("YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
|
||||
"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT"
|
||||
"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n"),
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789!@#0^&*();:<>,. []{}")
|
||||
vereq(decodestring(''), '')
|
||||
self.assertEqual(base64.decodestring(''), '')
|
||||
|
||||
def test_main():
|
||||
run_unittest(Base64TestCase)
|
||||
test_support.run_unittest(Base64TestCase)
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_main()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue