Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 78041 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78041 | mark.dickinson | 2010-02-06 23:11:25 +0000 (Sat, 06 Feb 2010) | 1 line

  testCopysign was defined twice in test_math;  combine the definitions
........
This commit is contained in:
Mark Dickinson 2010-02-06 23:14:49 +00:00
parent 004f3dcaa5
commit 3f2c03d80f
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Lib/test/test_math.py
View File

@ -209,31 +209,37 @@ class MathTests(unittest.TestCase):
if float.__getformat__("double").startswith("IEEE"): if float.__getformat__("double").startswith("IEEE"):
def testCopysign(self): def testCopysign(self):
self.assertEqual(math.copysign(1, 42), 1.0)
self.assertEqual(math.copysign(0., 42), 0.0)
self.assertEqual(math.copysign(1., -42), -1.0)
self.assertEqual(math.copysign(3, 0.), 3.0)
self.assertEqual(math.copysign(4., -0.), -4.0)
self.assertRaises(TypeError, math.copysign) self.assertRaises(TypeError, math.copysign)
# copysign should let us distinguish signs of zeros # copysign should let us distinguish signs of zeros
self.assertEquals(copysign(1., 0.), 1.) self.assertEquals(math.copysign(1., 0.), 1.)
self.assertEquals(copysign(1., -0.), -1.) self.assertEquals(math.copysign(1., -0.), -1.)
self.assertEquals(copysign(INF, 0.), INF) self.assertEquals(math.copysign(INF, 0.), INF)
self.assertEquals(copysign(INF, -0.), NINF) self.assertEquals(math.copysign(INF, -0.), NINF)
self.assertEquals(copysign(NINF, 0.), INF) self.assertEquals(math.copysign(NINF, 0.), INF)
self.assertEquals(copysign(NINF, -0.), NINF) self.assertEquals(math.copysign(NINF, -0.), NINF)
# and of infinities # and of infinities
self.assertEquals(copysign(1., INF), 1.) self.assertEquals(math.copysign(1., INF), 1.)
self.assertEquals(copysign(1., NINF), -1.) self.assertEquals(math.copysign(1., NINF), -1.)
self.assertEquals(copysign(INF, INF), INF) self.assertEquals(math.copysign(INF, INF), INF)
self.assertEquals(copysign(INF, NINF), NINF) self.assertEquals(math.copysign(INF, NINF), NINF)
self.assertEquals(copysign(NINF, INF), INF) self.assertEquals(math.copysign(NINF, INF), INF)
self.assertEquals(copysign(NINF, NINF), NINF) self.assertEquals(math.copysign(NINF, NINF), NINF)
self.assert_(math.isnan(copysign(NAN, 1.))) self.assertTrue(math.isnan(math.copysign(NAN, 1.)))
self.assert_(math.isnan(copysign(NAN, INF))) self.assertTrue(math.isnan(math.copysign(NAN, INF)))
self.assert_(math.isnan(copysign(NAN, NINF))) self.assertTrue(math.isnan(math.copysign(NAN, NINF)))
self.assert_(math.isnan(copysign(NAN, NAN))) self.assertTrue(math.isnan(math.copysign(NAN, NAN)))
# copysign(INF, NAN) may be INF or it may be NINF, since # copysign(INF, NAN) may be INF or it may be NINF, since
# we don't know whether the sign bit of NAN is set on any # we don't know whether the sign bit of NAN is set on any
# given platform. # given platform.
self.assert_(math.isinf(copysign(INF, NAN))) self.assertTrue(math.isinf(math.copysign(INF, NAN)))
# similarly, copysign(2., NAN) could be 2. or -2. # similarly, copysign(2., NAN) could be 2. or -2.
self.assertEquals(abs(copysign(2., NAN)), 2.) self.assertEquals(abs(math.copysign(2., NAN)), 2.)
def testCos(self): def testCos(self):
self.assertRaises(TypeError, math.cos) self.assertRaises(TypeError, math.cos)
@ -800,13 +806,6 @@ class MathTests(unittest.TestCase):
self.assertEquals((), math.trunc(t)) self.assertEquals((), math.trunc(t))
self.assertRaises(TypeError, math.trunc, t, 0) self.assertRaises(TypeError, math.trunc, t, 0)
def testCopysign(self):
self.assertEqual(math.copysign(1, 42), 1.0)
self.assertEqual(math.copysign(0., 42), 0.0)
self.assertEqual(math.copysign(1., -42), -1.0)
self.assertEqual(math.copysign(3, 0.), 3.0)
self.assertEqual(math.copysign(4., -0.), -4.0)
def testIsnan(self): def testIsnan(self):
self.assert_(math.isnan(float("nan"))) self.assert_(math.isnan(float("nan")))
self.assert_(math.isnan(float("inf")* 0.)) self.assert_(math.isnan(float("inf")* 0.))