[pypy-commit] pypy default: Give meaningful class names in tests

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r47172:74cb13e6e9d0
Date: 2011-09-08 00:09 +0200
http://bitbucket.org/pypy/pypy/changeset/74cb13e6e9d0/

Log:	Give meaningful class names in tests

diff --git a/pypy/module/cpyext/test/foo.c b/pypy/module/cpyext/test/foo.c
--- a/pypy/module/cpyext/test/foo.c
+++ b/pypy/module/cpyext/test/foo.c
@@ -215,36 +215,36 @@
 typedef struct {
     PyUnicodeObject HEAD;
     int val;
-} FuuObject;
+} UnicodeSubclassObject;
 
 
-static int Fuu_init(FuuObject *self, PyObject *args, PyObject *kwargs) {
+static int UnicodeSubclass_init(UnicodeSubclassObject *self, PyObject *args, PyObject *kwargs) {
     self->val = 42;
     return 0;
 }
 
 static PyObject *
-Fuu_escape(PyTypeObject* type, PyObject *args)
+UnicodeSubclass_escape(PyTypeObject* type, PyObject *args)
 {
     Py_RETURN_TRUE;
 }
 
 static PyObject *
-Fuu_get_val(FuuObject *self) {
+UnicodeSubclass_get_val(UnicodeSubclassObject *self) {
     return PyInt_FromLong(self->val);
 }
 
-static PyMethodDef Fuu_methods[] = {
-    {"escape", (PyCFunction) Fuu_escape, METH_VARARGS, NULL},
-    {"get_val", (PyCFunction) Fuu_get_val, METH_NOARGS, NULL},
+static PyMethodDef UnicodeSubclass_methods[] = {
+    {"escape", (PyCFunction) UnicodeSubclass_escape, METH_VARARGS, NULL},
+    {"get_val", (PyCFunction) UnicodeSubclass_get_val, METH_NOARGS, NULL},
     {NULL}  /* Sentinel */
 };
 
-PyTypeObject FuuType = {
+PyTypeObject UnicodeSubtype = {
     PyObject_HEAD_INIT(NULL)
     0,
     "foo.fuu",
-    sizeof(FuuObject),
+    sizeof(UnicodeSubclassObject),
     0,
     0,          /*tp_dealloc*/
     0,          /*tp_print*/
@@ -277,7 +277,7 @@
 
     /* Attribute descriptor and subclassing stuff */
 
-    Fuu_methods,/*tp_methods*/
+    UnicodeSubclass_methods,/*tp_methods*/
     0,          /*tp_members*/
     0,          /*tp_getset*/
     0,          /*tp_base*/
@@ -287,7 +287,7 @@
     0,          /*tp_descr_set*/
     0,          /*tp_dictoffset*/
 
-    (initproc) Fuu_init, /*tp_init*/
+    (initproc) UnicodeSubclass_init, /*tp_init*/
     0,          /*tp_alloc  will be set to PyType_GenericAlloc in module init*/
     0,          /*tp_new*/
     0,          /*tp_free  Low-level free-memory routine */
@@ -299,11 +299,11 @@
     0           /*tp_weaklist*/
 };
 
-PyTypeObject Fuu2Type = {
+PyTypeObject UnicodeSubtype2 = {
     PyObject_HEAD_INIT(NULL)
     0,
     "foo.fuu2",
-    sizeof(FuuObject),
+    sizeof(UnicodeSubclassObject),
     0,
     0,          /*tp_dealloc*/
     0,          /*tp_print*/
@@ -628,15 +628,15 @@
 
     footype.tp_new = PyType_GenericNew;
 
-    FuuType.tp_base = &PyUnicode_Type;
-    Fuu2Type.tp_base = &FuuType;
+    UnicodeSubtype.tp_base = &PyUnicode_Type;
+    UnicodeSubtype2.tp_base = &UnicodeSubtype;
     MetaType.tp_base = &PyType_Type;
 
     if (PyType_Ready(&footype) < 0)
         return;
-    if (PyType_Ready(&FuuType) < 0)
+    if (PyType_Ready(&UnicodeSubtype) < 0)
         return;
-    if (PyType_Ready(&Fuu2Type) < 0)
+    if (PyType_Ready(&UnicodeSubtype2) < 0)
         return;
     if (PyType_Ready(&MetaType) < 0)
         return;
@@ -655,9 +655,9 @@
         return;
     if (PyDict_SetItemString(d, "fooType", (PyObject *)&footype) < 0)
         return;
-    if (PyDict_SetItemString(d, "FuuType", (PyObject *) &FuuType) < 0)
+    if (PyDict_SetItemString(d, "UnicodeSubtype", (PyObject *) &UnicodeSubtype) < 0)
         return;
-    if(PyDict_SetItemString(d, "Fuu2Type", (PyObject *) &Fuu2Type) < 0)
+    if (PyDict_SetItemString(d, "UnicodeSubtype2", (PyObject *) &UnicodeSubtype2) < 0)
         return;
     if (PyDict_SetItemString(d, "MetaType", (PyObject *) &MetaType) < 0)
         return;
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -119,16 +119,16 @@
         module = self.import_module(name='foo')
         obj = module.new()
         # call __new__
-        newobj = module.FuuType(u"xyz")
+        newobj = module.UnicodeSubtype(u"xyz")
         assert newobj == u"xyz"
-        assert isinstance(newobj, module.FuuType)
+        assert isinstance(newobj, module.UnicodeSubtype)
 
         assert isinstance(module.fooType(), module.fooType)
         class bar(module.fooType):
             pass
         assert isinstance(bar(), bar)
 
-        fuu = module.FuuType
+        fuu = module.UnicodeSubtype
         class fuu2(fuu):
             def baz(self):
                 return self
@@ -137,20 +137,20 @@
 
     def test_init(self):
         module = self.import_module(name="foo")
-        newobj = module.FuuType()
+        newobj = module.UnicodeSubtype()
         assert newobj.get_val() == 42
 
         # this subtype should inherit tp_init
-        newobj = module.Fuu2Type()
+        newobj = module.UnicodeSubtype2()
         assert newobj.get_val() == 42
 
         # this subclass redefines __init__
-        class Fuu2(module.FuuType):
+        class UnicodeSubclass2(module.UnicodeSubtype):
             def __init__(self):
                 self.foobar = 32
-                super(Fuu2, self).__init__()
+                super(UnicodeSubclass2, self).__init__()
         
-        newobj = Fuu2()
+        newobj = UnicodeSubclass2()
         assert newobj.get_val() == 42
         assert newobj.foobar == 32