8000 [3.12] gh-109802: Increase test coverage for complexobject.c (GH-1124… · python/cpython@e28722e · GitHub
[go: up one dir, main page]
Skip to content

Commit e28722e

Browse files
miss-islingtonskirpichev
miss-islington
and
skirpichev
authored
[3.12] gh-109802: Increase test coverage for complexobject.c (GH-112452) (GH-112489)
(cherry picked from commit f14d741) Co-authored-by: Sergey B Kirpichev <skirpichev@gmail.com>
1 parent 7225a01 commit e28722e

File tree

3 files changed

+193
-0
lines changed

3 files changed

+193
-0
lines changed

‎Lib/test/test_capi/test_complex.py

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from math import isnan
2+
import errno
13
import unittest
24
import warnings
35

@@ -10,6 +12,10 @@
1012
_testcapi = import_helper.import_module('_testcapi')
1113

1214
NULL = None
15+
INF = float("inf")
16+
NAN = float("nan")
17+
DBL_MAX = _testcapi.DBL_MAX
18+
1319

1420
class BadComplex3:
1521
def __complex__(self):
@@ -141,6 +147,87 @@ def test_asccomplex(self):
141147

142148
# CRASHES asccomplex(NULL)
143149

150+
def test_py_c_sum(self):
151+
# Test _Py_c_sum()
152+
_py_c_sum = _testcapi._py_c_sum
153+
154+
self.assertEqual(_py_c_sum(1, 1j), (1+1j, 0))
155+
156+
def test_py_c_diff(self):
157+
# Test _Py_c_diff()
158+
_py_c_diff = _testcapi._py_c_diff
159+
160+
self.assertEqual(_py_c_diff(1, 1j), (1-1j, 0))
161+
162+
def test_py_c_neg(self):
163+
# Test _Py_c_neg()
164+
_py_c_neg = _testcapi._py_c_neg
165+
166+
self.assertEqual(_py_c_neg(1+1j), -1-1j)
167+
168+
def test_py_c_prod(self):
169+
# Test _Py_c_prod()
170+
_py_c_prod = _testcapi._py_c_prod
171+
172+
self.assertEqual(_py_c_prod(2, 1j), (2j, 0))
173+
174+
def test_py_c_quot(self):
175+
# Test _Py_c_quot()
176+
_py_c_quot = _testcapi._py_c_quot
177+
178+
self.assertEqual(_py_c_quot(1, 1j), (-1j, 0))
179+
self.assertEqual(_py_c_quot(1, -1j), (1j, 0))
180+
self.assertEqual(_py_c_quot(1j, 2), (0.5j, 0))
181+
self.assertEqual(_py_c_quot(1j, -2), (-0.5j, 0))
182+
self.assertEqual(_py_c_quot(1, 2j), (-0.5j, 0))
183+
184+
z, e = _py_c_quot(NAN, 1j)
185+
self.assertTrue(isnan(z.real))
186+
self.assertTrue(isnan(z.imag))
187+
self.assertEqual(e, 0)
188+
189+
z, e = _py_c_quot(1j, NAN)
190+
self.assertTrue(isnan(z.real))
191+
self.assertTrue(isnan(z.imag))
192+
self.assertEqual(e, 0)
193+
194+
self.assertEqual(_py_c_quot(1, 0j)[1], errno.EDOM)
195+
196+
def test_py_c_pow(self):
197+
# Test _Py_c_pow()
198+
_py_c_pow = _testcapi._py_c_pow
199+
200+
self.assertEqual(_py_c_pow(1j, 0j), (1+0j, 0))
201+
self.assertEqual(_py_c_pow(1, 1j), (1+0j, 0))
202+
self.assertEqual(_py_c_pow(0j, 1), (0j, 0))
203+
self.assertAlmostEqual(_py_c_pow(1j, 2)[0], -1.0+0j)
204+
205+
r, e = _py_c_pow(1+1j, -1)
206+
self.assertAlmostEqual(r, 0.5-0.5j)
207+
self.assertEqual(e, 0)
208+
209+
self.assertEqual(_py_c_pow(0j, -1)[1], errno.EDOM)
210+
self.assertEqual(_py_c_pow(0j, 1j)[1], errno.EDOM)
211+
self.assertEqual(_py_c_pow(*[DBL_MAX+1j]*2)[0], complex(*[INF]*2))
212+
213+
214+
def test_py_c_abs(self):
215+
# Test _Py_c_abs()
216+
_py_c_abs = _testcapi._py_c_abs
217+
218+
self.assertEqual(_py_c_abs(-1), (1.0, 0))
219+
self.assertEqual(_py_c_abs(1j), (1.0, 0))
220+
221+
self.assertEqual(_py_c_abs(complex('+inf+1j')), (INF, 0))
222+
self.assertEqual(_py_c_abs(complex('-inf+1j')), (INF, 0))
223+
self.assertEqual(_py_c_abs(complex('1.25+infj')), (INF, 0))
224+
self.assertEqual(_py_c_abs(complex('1.25-infj')), (INF, 0))
225+
226+
self.assertTrue(isnan(_py_c_abs(complex('1.25+nanj'))[0]))
227+
self.assertTrue(isnan(_py_c_abs(complex('nan-1j'))[0]))
228+
229+
self.assertEqual(_py_c_abs(complex(*[DBL_MAX]*2))[1], errno.ERANGE)
230+
144231

145232
if __name__ == "__main__":
146233
unittest.main()

‎Lib/test/test_complex.py

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ def test_truediv(self):
109109
complex(random(), random()))
110110

111111
self.assertAlmostEqual(complex.__truediv__(2+0j, 1+1j), 1-1j)
112+
self.assertRaises(TypeError, operator.truediv, 1j, None)
113+
self.assertRaises(TypeError, operator.truediv, None, 1j)
112114

113115
for denom_real, denom_imag in [(0, NAN), (NAN, 0), (NAN, NAN)]:
114116
z = complex(0, 0) / complex(denom_real, denom_imag)
@@ -140,6 +142,7 @@ def test_floordiv_zero_division(self):
140142
def test_richcompare(self):
141143
self.assertIs(complex.__eq__(1+1j, 1<<10000), False)
142144
self.assertIs(complex.__lt__(1+1j, None), NotImplemented)
145+
self.assertIs(complex.__eq__(1+1j, None), NotImplemented)
143146
self.assertIs(complex.__eq__(1+1j, 1+1j), True)
144147
self.assertIs(complex.__eq__(1+1j, 2+2j), False)
145148
self.assertIs(complex.__ne__(1+1j, 1+1j), False)
@@ -162,6 +165,7 @@ def test_richcompare(self):
162165
self.assertIs(operator.eq(1+1j, 2+2j), False)
163166
self.assertIs(operator.ne(1+1j, 1+1j), False)
164167
self.assertIs(operator.ne(1+1j, 2+2j), True)
168+
self.assertIs(operator.eq(1+1j, 2.0), False)
165169

166170
def test_richcompare_boundaries(self):
167171
def check(n, deltas, is_equal, imag = 0.0):
@@ -180,6 +184,27 @@ def check(n, deltas, is_equal, imag = 0.0):
180184
check(2 ** pow, range(1, 101), lambda delta: False, float(i))
181185
check(2 ** 53, range(-100, 0), lambda delta: True)
182186

187+
def test_add(self):
188+
self.assertEqual(1j + int(+1), complex(+1, 1))
189+
self.assertEqual(1j + int(-1), complex(-1, 1))
190+
self.assertRaises(OverflowError, operator.add, 1j, 10**1000)
191+
self.assertRaises(TypeError, operator.add, 1j, None)
192+
self.assertRaises(TypeError, operator.add, None, 1j)
193+
194+
def test_sub(self):
195+
self.assertEqual(1j - int(+1), complex(-1, 1))
196+
self.assertEqual(1j - int(-1), complex(1, 1))
197+
self.assertRaises(OverflowError, operator.sub, 1j, 10**1000)
198+
self.assertRaises(TypeError, operator.sub, 1j, None)
199+
self.assertRaises(TypeError, operator.sub, None, 1j)
200+
201+
def test_mul(self):
202+
self.assertEqual(1j * int(20), complex(0, 20))
203+
self.assertEqual(1j * int(-1), complex(0, -1))
204+
self.assertRaises(OverflowError, operator.mul, 1j, 10**1000)
205+
self.assertRaises(TypeError, operator.mul, 1j, None)
206+
self.assertRaises(TypeError, operator.mul, None, 1j)
207+
183208
def test_mod(self):
184209
# % is no longer supported on complex numbers
185210
with self.assertRaises(TypeError):
@@ -212,11 +237,18 @@ def test_divmod_zero_division(self):
212237
def test_pow(self):
213238
self.assertAlmostEqual(pow(1+1j, 0+0j), 1.0)
214239
self.assertAlmostEqual(pow(0+0j, 2+0j), 0.0)
240+
self.assertEqual(pow(0+0j, 2000+0j), 0.0)
241+
self.assertEqual(pow(0, 0+0j), 1.0)
242+
self.assertEqual(pow(-1, 0+0j), 1.0)
215243
self.assertRaises(ZeroDivisionError, pow, 0+0j, 1j)
244+
self.assertRaises(ZeroDivisionError, pow, 0+0j, -1000)
216245
self.assertAlmostEqual(pow(1j, -1), 1/1j)
217246
self.assertAlmostEqual(pow(1j, 200), 1)
218247
self.assertRaises(ValueError, pow, 1+1j, 1+1j, 1+1j)
219248
self.assertRaises(OverflowError, pow, 1e200+1j, 1e200+1j)
249+
self.assertRaises(TypeError, pow, 1j, None)
250+
self.assertRaises(TypeError, pow, None, 1j)
251+
self.assertAlmostEqual(pow(1j, 0.5), 0.7071067811865476+0.7071067811865475j)
220252

221253
a = 3.33+4.43j
222254
self.assertEqual(a ** 0j, 1)
@@ -301,6 +333,7 @@ def test_boolcontext(self):
301333
for i in range(100):
302334
self.assertT F438 rue(complex(random() + 1e-6, random() + 1e-6))
303335
self.assertTrue(not complex(0.0, 0.0))
336+
self.assertTrue(1j)
304337

305338
def test_conjugate(self):
306339
self.assertClose(complex(5.3, 9.8).conjugate(), 5.3-9.8j)
@@ -314,6 +347,8 @@ def __complex__(self): return self.value
314347
self.assertRaises(TypeError, complex, {})
315348
self.assertRaises(TypeError, complex, NS(1.5))
316349
self.assertRaises(TypeError, complex, NS(1))
350+
self.assertRaises(TypeError, complex, object())
351+
self.assertRaises(TypeError, complex, NS(4.25+0.5j), object())
317352

318353
self.assertAlmostEqual(complex("1+10j"), 1+10j)
319354
self.assertAlmostEqual(complex(10), 10+0j)
@@ -359,6 +394,8 @@ def __complex__(self): return self.value
359394
self.assertAlmostEqual(complex('1e-500'), 0.0 + 0.0j)
360395
self.assertAlmostEqual(complex('-1e-500j'), 0.0 - 0.0j)
361396
self.assertAlmostEqual(complex('-1e-500+1e-500j'), -0.0 + 0.0j)
397+
self.assertEqual(complex('1-1j'), 1.0 - 1j)
398+
self.assertEqual(complex('1J'), 1j)
362399

363400
class complex2(complex): pass
364401
self.assertAlmostEqual(complex(complex2(1+1j)), 1+1j)
@@ -553,6 +590,8 @@ def test_hash(self):
553590
x /= 3.0 # now check against floating point
554591
self.assertEqual(hash(x), hash(complex(x, 0.)))
555592

593+
self.assertNotEqual(hash(2000005 - 1j), -1)
594+
556595
def test_abs(self):
557596
nums = [complex(x/3., y/7.) for x in range(-9,9) for y in range(-9,9)]
558597
for num in nums:
@@ -602,6 +641,14 @@ def test(v, expected, test_fn=self.assertEqual):
602641
test(complex(-0., 0.), "(-0+0j)")
603642
test(complex(-0., -0.), "(-0-0j)")
604643

644+
def test_pos(self):
645+
class ComplexSubclass(complex):
646+
pass
647+
648+
self.assertEqual(+(1+6j), 1+6j)
649+
self.assertEqual(+ComplexSubclass(1, 6), 1+6j)
650+
self.assertIs(type(+ComplexSubclass(1, 6)), complex)
651+
605652
def test_neg(self):
606653
self.assertEqual(-(1+6j), -1-6j)
607654

‎Modules/_testcapi/complex.c

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,58 @@ complex_asccomplex(PyObject *Py_UNUSED(module), PyObject *obj)
8585
return PyComplex_FromCComplex(complex);
8686
}
8787

88+
static PyObject*
89+
_py_c_neg(PyObject *Py_UNUSED(module), PyObject *num)
90+
{
91+
Py_complex complex;
92+
93+
complex = PyComplex_AsCComplex(num);
94+
if (complex.real == -1. && PyErr_Occurred()) {
95+
return NULL;
96+
}
97+
98+
return PyComplex_FromCComplex(_Py_c_neg(complex));
99+
}
100+
101+
#define _PY_C_FUNC2(suffix) \
102+
static PyObject * \
103+
_py_c_##suffix(PyObject *Py_UNUSED(module), PyObject *args) \
104+
{ \
105+
Py_complex num, exp, res; \
106+
\
107+
if (!PyArg_ParseTuple(args, "DD", &num, &exp)) { \
108+
return NULL; \
109+
} \
110+
\
111+
errno = 0; \
112+
res = _Py_c_##suffix(num, exp); \
113+
return Py_BuildValue("Di", &res, errno); \
114+
};
115+
116+
_PY_C_FUNC2(sum)
117+
_PY_C_FUNC2(diff)
118+
_PY_C_FUNC2(prod)
119+
_PY_C_FUNC2(quot)
120+
_PY_C_FUNC2(pow)
121+
122+
static PyObject*
123+
_py_c_abs(PyObject *Py_UNUSED(module), PyObject* obj)
124+
{
125+
Py_complex complex;
126+
double res;
127+
128+
NULLABLE(obj);
129+
complex = PyComplex_AsCComplex(obj);
130+
131+
if (complex.real == -1. && PyErr_Occurred()) {
132+
return NULL;
133+
}
134+
135+
errno = 0;
136+
res = _Py_c_abs(complex);
137+
return Py_BuildValue("di", res, errno);
138+
}
139+
88140

89141
static PyMethodDef test_methods[] = {
90142
{"complex_check", complex_check, METH_O},
@@ -94,6 +146,13 @@ static PyMethodDef test_methods[] = {
94146
{"complex_realasdouble", complex_realasdouble, METH_O},
95147
{"complex_imagasdouble", complex_imagasdouble, METH_O},
96148
{"complex_asccomplex", complex_asccomplex, METH_O},
149+
{"_py_c_sum", _py_c_sum, METH_VARARGS},
150+
{"_py_c_diff", _py_c_diff, METH_VARARGS},
151+
{"_py_c_neg", _py_c_neg, METH_O},
152+
{"_py_c_prod", _py_c_prod, METH_VARARGS},
153+
{"_py_c_quot", _py_c_quot, METH_VARARGS},
154+
{"_py_c_pow", _py_c_pow, METH_VARARGS},
155+
{"_py_c_abs", _py_c_abs, METH_O},
97156
{NULL},
98157
};
99158

0 commit comments

Comments
 (0)
0