From 28d4f9e6681094037a45cd0c469e9abae7a2e4f0 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sat, 6 Feb 2010 23:11:25 +0000 Subject: testCopysign was defined twice in test_math; combine the definitions --- Lib/test/test_math.py | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py index 293cdab..72c52ff 100644 --- a/Lib/test/test_math.py +++ b/Lib/test/test_math.py @@ -292,31 +292,37 @@ class MathTests(unittest.TestCase): @requires_IEEE_754 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) # copysign should let us distinguish signs of zeros - self.assertEquals(copysign(1., 0.), 1.) - self.assertEquals(copysign(1., -0.), -1.) - self.assertEquals(copysign(INF, 0.), INF) - self.assertEquals(copysign(INF, -0.), NINF) - self.assertEquals(copysign(NINF, 0.), INF) - self.assertEquals(copysign(NINF, -0.), NINF) + self.assertEquals(math.copysign(1., 0.), 1.) + self.assertEquals(math.copysign(1., -0.), -1.) + self.assertEquals(math.copysign(INF, 0.), INF) + self.assertEquals(math.copysign(INF, -0.), NINF) + self.assertEquals(math.copysign(NINF, 0.), INF) + self.assertEquals(math.copysign(NINF, -0.), NINF) # and of infinities - self.assertEquals(copysign(1., INF), 1.) - self.assertEquals(copysign(1., NINF), -1.) - self.assertEquals(copysign(INF, INF), INF) - self.assertEquals(copysign(INF, NINF), NINF) - self.assertEquals(copysign(NINF, INF), INF) - self.assertEquals(copysign(NINF, NINF), NINF) - self.assertTrue(math.isnan(copysign(NAN, 1.))) - self.assertTrue(math.isnan(copysign(NAN, INF))) - self.assertTrue(math.isnan(copysign(NAN, NINF))) - self.assertTrue(math.isnan(copysign(NAN, NAN))) + self.assertEquals(math.copysign(1., INF), 1.) + self.assertEquals(math.copysign(1., NINF), -1.) + self.assertEquals(math.copysign(INF, INF), INF) + self.assertEquals(math.copysign(INF, NINF), NINF) + self.assertEquals(math.copysign(NINF, INF), INF) + self.assertEquals(math.copysign(NINF, NINF), NINF) + self.assertTrue(math.isnan(math.copysign(NAN, 1.))) + self.assertTrue(math.isnan(math.copysign(NAN, INF))) + self.assertTrue(math.isnan(math.copysign(NAN, NINF))) + self.assertTrue(math.isnan(math.copysign(NAN, NAN))) # 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 # given platform. - self.assertTrue(math.isinf(copysign(INF, NAN))) + self.assertTrue(math.isinf(math.copysign(INF, NAN))) # 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): self.assertRaises(TypeError, math.cos) @@ -878,13 +884,6 @@ class MathTests(unittest.TestCase): self.assertEquals((), math.trunc(t)) 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): self.assertTrue(math.isnan(float("nan"))) self.assertTrue(math.isnan(float("inf")* 0.)) -- cgit v0.12