traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #8670: Rename testcapi unicode test methods 

* test_aswidechar() => unicode_aswidechar()
 * test_aswidecharstring() => unicode_aswidecharstring()
This commit is contained in:
Victor Stinner 2010-10-02 11:49:31 +00:00
parent ea3f305a25
commit 46c7b3b283
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Lib/test/test_unicode.py
View File

@ -1396,26 +1396,26 @@ class UnicodeTest(string_tests.CommonTest,
# Test PyUnicode_AsWideChar() # Test PyUnicode_AsWideChar()
def test_aswidechar(self): def test_aswidechar(self):
from _testcapi import test_aswidechar from _testcapi import unicode_aswidechar
from ctypes import c_wchar, sizeof from ctypes import c_wchar, sizeof
wchar, size = test_aswidechar('abcdef', 2) wchar, size = unicode_aswidechar('abcdef', 2)
self.assertEquals(size, 2) self.assertEquals(size, 2)
self.assertEquals(wchar, 'ab') self.assertEquals(wchar, 'ab')
wchar, size = test_aswidechar('abc', 3) wchar, size = unicode_aswidechar('abc', 3)
self.assertEquals(size, 3) self.assertEquals(size, 3)
self.assertEquals(wchar, 'abc') self.assertEquals(wchar, 'abc')
wchar, size = test_aswidechar('abc', 4) wchar, size = unicode_aswidechar('abc', 4)
self.assertEquals(size, 3) self.assertEquals(size, 3)
self.assertEquals(wchar, 'abc\0') self.assertEquals(wchar, 'abc\0')
wchar, size = test_aswidechar('abc', 10) wchar, size = unicode_aswidechar('abc', 10)
self.assertEquals(size, 3) self.assertEquals(size, 3)
self.assertEquals(wchar, 'abc\0') self.assertEquals(wchar, 'abc\0')
wchar, size = test_aswidechar('abc\0def', 20) wchar, size = unicode_aswidechar('abc\0def', 20)
self.assertEquals(size, 7) self.assertEquals(size, 7)
self.assertEquals(wchar, 'abc\0def\0') self.assertEquals(wchar, 'abc\0def\0')
@ -1426,20 +1426,20 @@ class UnicodeTest(string_tests.CommonTest,
else: # sizeof(c_wchar) == 4 else: # sizeof(c_wchar) == 4
buflen = 2 buflen = 2
nchar = 1 nchar = 1
wchar, size = test_aswidechar(nonbmp, buflen) wchar, size = unicode_aswidechar(nonbmp, buflen)
self.assertEquals(size, nchar) self.assertEquals(size, nchar)
self.assertEquals(wchar, nonbmp + '\0') self.assertEquals(wchar, nonbmp + '\0')
# Test PyUnicode_AsWideCharString() # Test PyUnicode_AsWideCharString()
def test_aswidecharstring(self): def test_aswidecharstring(self):
from _testcapi import test_aswidecharstring from _testcapi import unicode_aswidecharstring
from ctypes import c_wchar, sizeof from ctypes import c_wchar, sizeof
wchar, size = test_aswidecharstring('abc') wchar, size = unicode_aswidecharstring('abc')
self.assertEquals(size, 3) self.assertEquals(size, 3)
self.assertEquals(wchar, 'abc\0') self.assertEquals(wchar, 'abc\0')
wchar, size = test_aswidecharstring('abc\0def') wchar, size = unicode_aswidecharstring('abc\0def')
self.assertEquals(size, 7) self.assertEquals(size, 7)
self.assertEquals(wchar, 'abc\0def\0') self.assertEquals(wchar, 'abc\0def\0')
@ -1448,7 +1448,7 @@ class UnicodeTest(string_tests.CommonTest,
nchar = 2 nchar = 2
else: # sizeof(c_wchar) == 4 else: # sizeof(c_wchar) == 4
nchar = 1 nchar = 1
wchar, size = test_aswidecharstring(nonbmp) wchar, size = unicode_aswidecharstring(nonbmp)
self.assertEquals(size, nchar) self.assertEquals(size, nchar)
self.assertEquals(wchar, nonbmp + '\0') self.assertEquals(wchar, nonbmp + '\0')

8
Modules/_testcapimodule.c
View File

@ -1386,7 +1386,7 @@ test_widechar(PyObject *self)
} }
static PyObject * static PyObject *
test_aswidechar(PyObject *self, PyObject *args) unicode_aswidechar(PyObject *self, PyObject *args)
{ {
PyObject *unicode, *result; PyObject *unicode, *result;
Py_ssize_t buflen, size; Py_ssize_t buflen, size;
@ -1417,7 +1417,7 @@ test_aswidechar(PyObject *self, PyObject *args)
} }
static PyObject * static PyObject *
test_aswidecharstring(PyObject *self, PyObject *args) unicode_aswidecharstring(PyObject *self, PyObject *args)
{ {
PyObject *unicode, *result; PyObject *unicode, *result;
Py_ssize_t size; Py_ssize_t size;
@ -2321,8 +2321,8 @@ static PyMethodDef TestMethods[] = {
{"test_u_code", (PyCFunction)test_u_code, METH_NOARGS}, {"test_u_code", (PyCFunction)test_u_code, METH_NOARGS},
{"test_Z_code", (PyCFunction)test_Z_code, METH_NOARGS}, {"test_Z_code", (PyCFunction)test_Z_code, METH_NOARGS},
{"test_widechar", (PyCFunction)test_widechar, METH_NOARGS}, {"test_widechar", (PyCFunction)test_widechar, METH_NOARGS},
{"test_aswidechar", test_aswidechar, METH_VARARGS}, {"unicode_aswidechar", unicode_aswidechar, METH_VARARGS},
{"test_aswidecharstring", test_aswidecharstring, METH_VARARGS}, {"unicode_aswidecharstring",unicode_aswidecharstring, METH_VARARGS},
#ifdef WITH_THREAD #ifdef WITH_THREAD
{"_test_thread_state", test_thread_state, METH_VARARGS}, {"_test_thread_state", test_thread_state, METH_VARARGS},
{"_pending_threadfunc", pending_threadfunc, METH_VARARGS}, {"_pending_threadfunc", pending_threadfunc, METH_VARARGS},