|
From: Mark H. <mha...@us...> - 2009-01-14 13:02:23
|
Update of /cvsroot/pywin32/pywin32/win32/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4460/win32/test Modified Files: Tag: py3k test_win32file.py Added Files: Tag: py3k test_win32guistruct.py Log Message: merge lots of changes from the trunk Index: test_win32file.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32file.py,v retrieving revision 1.13.2.6 retrieving revision 1.13.2.7 diff -C2 -d -r1.13.2.6 -r1.13.2.7 *** test_win32file.py 8 Jan 2009 03:45:50 -0000 1.13.2.6 --- test_win32file.py 14 Jan 2009 12:42:03 -0000 1.13.2.7 *************** *** 68,73 **** win32file.SetFilePointer(h, newSize, win32file.FILE_BEGIN) win32file.SetEndOfFile(h) ! self.failUnless(win32file.GetFileSize(h) == newSize, ! "Truncated file does not have the expected size! (%s)" %newSize) # GetFileAttributesEx/GetFileAttributesExW tests. --- 68,72 ---- win32file.SetFilePointer(h, newSize, win32file.FILE_BEGIN) win32file.SetEndOfFile(h) ! self.failUnlessEqual(win32file.GetFileSize(h), newSize) # GetFileAttributesEx/GetFileAttributesExW tests. *************** *** 79,83 **** self.failUnless(attr==win32file.GetFileAttributes(testName), "Expected GetFileAttributesEx to return the same attributes as GetFileAttributes") ! h = None # Close the file by removing the last reference to the handle! --- 78,82 ---- self.failUnless(attr==win32file.GetFileAttributes(testName), "Expected GetFileAttributesEx to return the same attributes as GetFileAttributes") ! h = None # Close the file by removing the last reference to the handle! *************** *** 126,136 **** from win32timezone import GetLocalTimeZone now = datetime.datetime.now(tz=GetLocalTimeZone()) ! ok_delta = datetime.timedelta(seconds=1) later = now + datetime.timedelta(seconds=120) else: tick = int(time.time()) ! now = pywintypes.Time(tick) ! ok_delta = 1 ! later = pywintypes.Time(tick+120) filename = tempfile.mktemp("-testFileTimes") --- 125,140 ---- from win32timezone import GetLocalTimeZone now = datetime.datetime.now(tz=GetLocalTimeZone()) ! nowish = now + datetime.timedelta(seconds=1) later = now + datetime.timedelta(seconds=120) else: + rc, tzi = win32api.GetTimeZoneInformation() + bias = tzi[0] + if rc==2: # daylight-savings is in effect. + bias += tzi[-1] + bias *= 60 # minutes to seconds... tick = int(time.time()) ! now = pywintypes.Time(tick+bias) ! nowish = pywintypes.Time(tick+bias+1) ! later = pywintypes.Time(tick+bias+120) filename = tempfile.mktemp("-testFileTimes") *************** *** 141,155 **** 0, None, win32con.OPEN_EXISTING, 0, None) - # *sob* - before we had tz aware datetime objects, we are faced - # with FILETIME objects being +GST out from now(). So just skip - # this... - if not issubclass(pywintypes.TimeType, datetime.datetime): - return try: ct, at, wt = win32file.GetFileTime(f) self.failUnless(ct >= now, "File was created in the past - now=%s, created=%s" % (now, ct)) ! self.failUnless( now <= ct <= now + ok_delta, (now, ct)) self.failUnless(wt >= now, "File was written-to in the past now=%s, written=%s" % (now,wt)) ! self.failUnless( now <= wt <= now + ok_delta, (now, wt)) # Now set the times. --- 145,154 ---- 0, None, win32con.OPEN_EXISTING, 0, None) try: ct, at, wt = win32file.GetFileTime(f) self.failUnless(ct >= now, "File was created in the past - now=%s, created=%s" % (now, ct)) ! self.failUnless( now <= ct <= nowish, (now, ct)) self.failUnless(wt >= now, "File was written-to in the past now=%s, written=%s" % (now,wt)) ! self.failUnless( now <= wt <= nowish, (now, wt)) # Now set the times. *************** *** 157,163 **** # Get them back. ct, at, wt = win32file.GetFileTime(f) ! self.failUnlessEqual(ct, later) ! self.failUnlessEqual(at, later) ! self.failUnlessEqual(wt, later) finally: --- 156,165 ---- # Get them back. ct, at, wt = win32file.GetFileTime(f) ! # XXX - the builtin PyTime type appears to be out by a dst offset. ! # just ignore that type here... ! if issubclass(pywintypes.TimeType, datetime.datetime): ! self.failUnlessEqual(ct, later) ! self.failUnlessEqual(at, later) ! self.failUnlessEqual(wt, later) finally: --- NEW FILE: test_win32guistruct.py --- import unittest import win32gui import win32gui_struct import win32con class TestBase(unittest.TestCase): def assertDictEquals(self, d, **kw): checked = dict() for n, v in kw.items(): self.failUnlessEqual(v, d[n], "'%s' doesn't match: %r != %r" % (n, v, d[n])) checked[n] = True checked_keys = list(checked.keys()) passed_keys = list(kw.keys()) checked_keys.sort() passed_keys.sort() self.failUnlessEqual(checked_keys, passed_keys) class TestMenuItemInfo(TestBase): def _testPackUnpack(self, text): vals = dict(fType=win32con.MFT_MENUBARBREAK, fState=win32con.MFS_CHECKED, wID=123, hSubMenu=1234, hbmpChecked=12345, hbmpUnchecked=123456, dwItemData=1234567, text=text, hbmpItem=321) mii, extras = win32gui_struct.PackMENUITEMINFO(**vals) fType, fState, wID, hSubMenu, hbmpChecked, hbmpUnchecked, \ dwItemData, text, hbmpItem = win32gui_struct.UnpackMENUITEMINFO(mii) self.assertDictEquals(vals, fType=fType, fState=fState, wID=wID, hSubMenu=hSubMenu, hbmpChecked=hbmpChecked, hbmpUnchecked=hbmpUnchecked, dwItemData=dwItemData, text=text, hbmpItem=hbmpItem) def testPackUnpack(self): self._testPackUnpack("Hello") def testPackUnpackNone(self): self._testPackUnpack(None) def testEmptyMenuItemInfo(self): mii, extra = win32gui_struct.EmptyMENUITEMINFO() fType, fState, wID, hSubMenu, hbmpChecked, hbmpUnchecked, \ dwItemData, text, hbmpItem = win32gui_struct.UnpackMENUITEMINFO(mii) self.failUnlessEqual(fType, 0) self.failUnlessEqual(fState, 0) self.failUnlessEqual(wID, 0) self.failUnlessEqual(hSubMenu, 0) self.failUnlessEqual(hbmpChecked, 0) self.failUnlessEqual(hbmpUnchecked, 0) self.failUnlessEqual(dwItemData, 0) self.failUnlessEqual(hbmpItem, 0) # it's not clear if UnpackMENUITEMINFO() should ignore cch, instead # assuming it is a buffer size rather than 'current length' - but it # never has (and this gives us every \0 in the string), and actually # helps us test the unicode/str semantics. self.failUnlessEqual(text, '\0' * len(text)) class TestMenuInfo(TestBase): def testPackUnpack(self): vals = dict(dwStyle=1, cyMax=2, hbrBack=3, dwContextHelpID=4, dwMenuData=5) mi = win32gui_struct.PackMENUINFO(**vals) dwStyle, cyMax, hbrBack, dwContextHelpID, dwMenuData = \ win32gui_struct.UnpackMENUINFO(mi) self.assertDictEquals(vals, dwStyle=dwStyle, cyMax=cyMax, hbrBack=hbrBack, dwContextHelpID=dwContextHelpID, dwMenuData=dwMenuData) def testEmptyMenuItemInfo(self): mi = win32gui_struct.EmptyMENUINFO() dwStyle, cyMax, hbrBack, dwContextHelpID, dwMenuData = \ win32gui_struct.UnpackMENUINFO(mi) self.failUnlessEqual(dwStyle, 0) self.failUnlessEqual(cyMax, 0) self.failUnlessEqual(hbrBack, 0) self.failUnlessEqual(dwContextHelpID, 0) self.failUnlessEqual(dwMenuData, 0) class TestTreeViewItem(TestBase): def _testPackUnpack(self, text): vals = dict(hitem=1, state=2, stateMask=3, text=text, image=4, selimage=5, citems=6, param=7) ti, extra = win32gui_struct.PackTVITEM(**vals) hitem, state, stateMask, text, image, selimage, citems, param = \ win32gui_struct.UnpackTVITEM(ti) self.assertDictEquals(vals, hitem=hitem, state=state, stateMask=stateMask, text=text, image=image, selimage=selimage, citems=citems, param=param) def testPackUnpack(self): self._testPackUnpack("Hello") def testPackUnpackNone(self): self._testPackUnpack(None) def testEmpty(self): ti, extras = win32gui_struct.EmptyTVITEM(0) hitem, state, stateMask, text, image, selimage, citems, param = \ win32gui_struct.UnpackTVITEM(ti) self.failUnlessEqual(hitem, 0) self.failUnlessEqual(state, 0) self.failUnlessEqual(stateMask, 0) self.failUnlessEqual(text, '') self.failUnlessEqual(image, 0) self.failUnlessEqual(selimage, 0) self.failUnlessEqual(citems, 0) self.failUnlessEqual(param, 0) class TestListViewItem(TestBase): def _testPackUnpack(self, text): vals = dict(item=None, subItem=None, state=1, stateMask=2, text=text, image=3, param=4, indent=5) ti, extra = win32gui_struct.PackLVITEM(**vals) item, subItem, state, stateMask, text, image, param, indent = \ win32gui_struct.UnpackLVITEM(ti) # patch expected values. vals['item'] = 0 vals['subItem'] = 0 self.assertDictEquals(vals, item=item, subItem=subItem, state=state, stateMask=stateMask, text=text, image=image, param=param, indent=indent) def testPackUnpack(self): self._testPackUnpack("Hello") def testPackUnpackNone(self): self._testPackUnpack(None) def testEmpty(self): ti, extras = win32gui_struct.EmptyLVITEM(1, 2) item, subItem, state, stateMask, text, image, param, indent = \ win32gui_struct.UnpackLVITEM(ti) self.failUnlessEqual(item, 1) self.failUnlessEqual(subItem, 2) self.failUnlessEqual(state, 0) self.failUnlessEqual(stateMask, 0) self.failUnlessEqual(text, '') self.failUnlessEqual(image, 0) self.failUnlessEqual(param, 0) self.failUnlessEqual(indent, 0) class TestLVColumn(TestBase): def _testPackUnpack(self, text): vals = dict(fmt=1, cx=2, text=text, subItem=3, image=4, order=5) ti, extra = win32gui_struct.PackLVCOLUMN(**vals) fmt, cx, text, subItem, image, order = \ win32gui_struct.UnpackLVCOLUMN(ti) self.assertDictEquals(vals, fmt=fmt, cx=cx, text=text, subItem=subItem, image=image, order=order) def testPackUnpack(self): self._testPackUnpack("Hello") def testPackUnpackNone(self): self._testPackUnpack(None) def testEmpty(self): ti, extras = win32gui_struct.EmptyLVCOLUMN() fmt, cx, text, subItem, image, order = \ win32gui_struct.UnpackLVCOLUMN(ti) self.failUnlessEqual(fmt, 0) self.failUnlessEqual(cx, 0) self.failUnlessEqual(text, '') self.failUnlessEqual(subItem, 0) self.failUnlessEqual(image, 0) self.failUnlessEqual(order, 0) if __name__=='__main__': unittest.main() |
