[Python-checkins] python/nondist/sandbox/datetime test_both.py,1.23,1.24

2002年12月02日 15:47:22 -0800

Update of /cvsroot/python/python/nondist/sandbox/datetime
In directory sc8-pr-cvs1:/tmp/cvs-serv16552
Modified Files:
	test_both.py 
Log Message:
TestTimeDelta: added simple tests for things that weren't being tested;
fiddled some code for a more uniform style.
Index: test_both.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/test_both.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** test_both.py	2 Dec 2002 23:35:46 -0000	1.23
--- test_both.py	2 Dec 2002 23:47:20 -0000	1.24
***************
*** 41,79 ****
 class TestTimeDelta(unittest.TestCase):
 
! def test_timedelta(self):
! a = timedelta(7) # One week
! b = timedelta(0, 60) # One minute
! c = timedelta(0, 0, 1000) # One millisecond
! self.assertEqual(a+b+c, timedelta(7, 60, 1000))
! self.assertEqual(a-b, timedelta(6, 24*3600 - 60))
! self.assertEqual(-a, timedelta(-7))
! self.assertEqual(+a, timedelta(7))
! self.assertEqual(-b, timedelta(-1, 24*3600 - 60))
! self.assertEqual(-c, timedelta(-1, 24*3600 - 1, 999000))
! self.assertEqual(abs(a), a)
! self.assertEqual(abs(-a), a)
! self.assertEqual(timedelta(6, 24*3600), a)
! self.assertEqual(timedelta(0, 0, 60*1000000), b)
! self.assertEqual(a*10, timedelta(70))
! self.assertEqual(a*10, 10*a)
! self.assertEqual(a*10L, 10*a)
! self.assertEqual(b*10, timedelta(0, 600))
! self.assertEqual(10*b, timedelta(0, 600))
! self.assertEqual(b*10L, timedelta(0, 600))
! self.assertEqual(c*10, timedelta(0, 0, 10000))
! self.assertEqual(10*c, timedelta(0, 0, 10000))
! self.assertEqual(c*10L, timedelta(0, 0, 10000))
! self.assertEqual(a*-1, -a)
! self.assertEqual(b*-2, -b-b)
! self.assertEqual(c*-2, -c+-c)
! self.assertEqual(b*(60*24), (b*60)*24)
! self.assertEqual(b*(60*24), (60*b)*24)
! self.assertEqual(c*1000, timedelta(0, 1))
! self.assertEqual(1000*c, timedelta(0, 1))
! self.assertEqual(a//7, timedelta(1))
! self.assertEqual(b//10, timedelta(0, 6))
! self.assertEqual(c//1000, timedelta(0, 0, 1))
! self.assertEqual(a//10, timedelta(0, 7*24*360))
! self.assertEqual(a//3600000, timedelta(0, 0, 7*24*1000))
 # Add/sub ints, longs, floats should be illegal
 for i in 1, 1L, 1.0:
--- 41,83 ----
 class TestTimeDelta(unittest.TestCase):
 
! def test_computations(self):
! eq = self.assertEqual
! td = timedelta
! 
! a = td(7) # One week
! b = td(0, 60) # One minute
! c = td(0, 0, 1000) # One millisecond
! eq(a+b+c, td(7, 60, 1000))
! eq(a-b, td(6, 24*3600 - 60))
! eq(-a, td(-7))
! eq(+a, td(7))
! eq(-b, td(-1, 24*3600 - 60))
! eq(-c, td(-1, 24*3600 - 1, 999000))
! eq(abs(a), a)
! eq(abs(-a), a)
! eq(td(6, 24*3600), a)
! eq(td(0, 0, 60*1000000), b)
! eq(a*10, td(70))
! eq(a*10, 10*a)
! eq(a*10L, 10*a)
! eq(b*10, td(0, 600))
! eq(10*b, td(0, 600))
! eq(b*10L, td(0, 600))
! eq(c*10, td(0, 0, 10000))
! eq(10*c, td(0, 0, 10000))
! eq(c*10L, td(0, 0, 10000))
! eq(a*-1, -a)
! eq(b*-2, -b-b)
! eq(c*-2, -c+-c)
! eq(b*(60*24), (b*60)*24)
! eq(b*(60*24), (60*b)*24)
! eq(c*1000, td(0, 1))
! eq(1000*c, td(0, 1))
! eq(a//7, td(1))
! eq(b//10, td(0, 6))
! eq(c//1000, td(0, 0, 1))
! eq(a//10, td(0, 7*24*360))
! eq(a//3600000, td(0, 0, 7*24*1000))
! 
 # Add/sub ints, longs, floats should be illegal
 for i in 1, 1L, 1.0:
***************
*** 82,88 ****
 self.assertRaises(TypeError, lambda: i+a)
 self.assertRaises(TypeError, lambda: i-a)
 # Check keyword args to constructor
- eq = self.assertEqual
- td = timedelta
 eq(td(1), td(days=1))
 eq(td(0, 1), td(seconds=1))
--- 86,91 ----
 self.assertRaises(TypeError, lambda: i+a)
 self.assertRaises(TypeError, lambda: i-a)
+ 
 # Check keyword args to constructor
 eq(td(1), td(days=1))
 eq(td(0, 1), td(seconds=1))
***************
*** 94,97 ****
--- 97,101 ----
 eq(td(seconds=1), td(milliseconds=1000))
 eq(td(milliseconds=1), td(microseconds=1000))
+ 
 # Check float args to constructor
 eq(td(weeks=1.0/7), td(days=1))
***************
*** 102,105 ****
--- 106,116 ----
 eq(td(milliseconds=0.001), td(microseconds=1))
 
+ def test_basic_attributes(self):
+ days, seconds, us = 1, 7, 31
+ td = timedelta(days, seconds, us)
+ self.assertEqual(td.days, days)
+ self.assertEqual(td.seconds, seconds)
+ self.assertEqual(td.microseconds, us)
+ 
 def test_carries(self):
 t1 = timedelta(days=100,
***************
*** 108,113 ****
 minutes=-3,
 seconds=12,
! microseconds=(3*60 - 12) * 1000000)
! t2 = timedelta()
 self.assertEqual(t1, t2)
 
--- 119,124 ----
 minutes=-3,
 seconds=12,
! microseconds=(3*60 - 12) * 1e6 + 1)
! t2 = timedelta(microseconds=1)
 self.assertEqual(t1, t2)
 
***************
*** 130,133 ****
--- 141,145 ----
 d[t2] = 2
 self.assertEqual(len(d), 1)
+ self.assertEqual(d[t1], 2)
 
 def test_pickling(self):