Skip to content

Commit af62436

Browse files
committed
more testcases in cext/test_abstract
1 parent bc07c07 commit af62436

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_abstract.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,8 @@ def _default_unarop_args():
343343

344344
def _size_and_check_args():
345345
return (
346+
(42,),
347+
(object(),),
346348
(DummySequence(),),
347349
(DummyLen(),),
348350
(DummyListSubclass(),),
@@ -384,23 +386,23 @@ def _size_and_check_args():
384386
(DummyDequeLen(),),
385387
(DummyDequeLen([1,2,3]),),
386388
)
387-
389+
388390
class TestAbstractWithNative(object):
389391
def test_sequence_check(self):
390392
TestSequenceCheck = CPyExtType("TestSequenceCheck",
391393
"""
392394
PyObject* test_sq_item(PyObject *a, Py_ssize_t i) {
393395
return a;
394396
}
395-
int callCheck(PyObject* a) {
396-
return PySequence_Check(a);
397+
PyObject* callCheck(PyObject* a) {
398+
return PyLong_FromLong(PySequence_Check(a));
397399
}
398400
""",
399401
tp_methods='{"callCheck", (PyCFunction)callCheck, METH_O, ""}',
400402
sq_item="&test_sq_item",
401403
)
402404
tester = TestSequenceCheck()
403-
assert tester.callCheck("a")
405+
assert tester.callCheck(tester)
404406

405407
def test_sequence_size(self):
406408
TestSequenceSize = CPyExtType("TestSequenceSize",
@@ -416,23 +418,23 @@ def test_sequence_size(self):
416418
sq_length="&test_sq_length",
417419
)
418420
tester = TestSequenceSize()
419-
assert tester.callSize("a") == 10
421+
assert tester.callSize(tester) == 10
420422

421423
def test_mapping_check(self):
422424
TestMappingCheck = CPyExtType("TestMappingCheck",
423425
"""
424426
PyObject* test_mp_subscript(PyObject* a, PyObject* b) {
425427
return a;
426428
}
427-
int callCheck(PyObject* a) {
428-
return PyMapping_Check(a);
429+
PyObject* callCheck(PyObject* a) {
430+
return PyLong_FromLong(PyMapping_Check(a));
429431
}
430432
""",
431433
tp_methods='{"callCheck", (PyCFunction)callCheck, METH_O, ""}',
432434
mp_subscript="&test_mp_subscript",
433435
)
434436
tester = TestMappingCheck()
435-
assert tester.callCheck("a")
437+
assert tester.callCheck(tester)
436438

437439
def test_mapping_size(self):
438440
TestMappingSize = CPyExtType("TestMappingSize",
@@ -448,7 +450,7 @@ def test_mapping_size(self):
448450
mp_length="&test_mp_length",
449451
)
450452
tester = TestMappingSize()
451-
assert tester.callSize("a") == 11
453+
assert tester.callSize(tester) == 11
452454

453455
def test_object_size_sq(self):
454456
TestObjectSizeSQ = CPyExtType("TestObjectSizeSQ",
@@ -464,7 +466,7 @@ def test_object_size_sq(self):
464466
sq_length="&test_sq_length",
465467
)
466468
tester = TestObjectSizeSQ()
467-
assert tester.callSize("a") == 12
469+
assert tester.callSize(tester) == 12
468470

469471
def test_object_size_mp(self):
470472
TestObjectSizeMP = CPyExtType("TestObjectSizeMP",
@@ -480,7 +482,7 @@ def test_object_size_mp(self):
480482
mp_length="&test_sq_length",
481483
)
482484
tester = TestObjectSizeMP()
483-
assert tester.callSize("abc") == 13
485+
assert tester.callSize(tester) == 13
484486

485487
class TestAbstract(CPyExtTestCase):
486488

0 commit comments

Comments
 (0)