Update of /cvsroot/pywin32/pywin32/win32/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13175/test
Modified Files:
test_clipboard.py
Log Message:
Merge win32clipboard changes from py3k branch, with a change to
SetClipboardText which should be more backwards compatible.
Index: test_clipboard.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_clipboard.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_clipboard.py 1 Jun 2007 13:36:53 -0000 1.6
--- test_clipboard.py 26 Nov 2008 01:11:54 -0000 1.7
***************
*** 34,38 ****
self.bmp_name = os.path.join(os.path.abspath(this_dir),
"..", "Demos", "images", "smiley.bmp")
! self.failUnless(os.path.isfile(self.bmp_name))
flags = win32con.LR_DEFAULTSIZE | win32con.LR_LOADFROMFILE
self.bmp_handle = win32gui.LoadImage(0, self.bmp_name,
--- 34,38 ----
self.bmp_name = os.path.join(os.path.abspath(this_dir),
"..", "Demos", "images", "smiley.bmp")
! self.failUnless(os.path.isfile(self.bmp_name), self.bmp_name)
flags = win32con.LR_DEFAULTSIZE | win32con.LR_LOADFROMFILE
self.bmp_handle = win32gui.LoadImage(0, self.bmp_name,
***************
*** 60,64 ****
CloseClipboard()
def test_unicode(self):
! val = unicode("test-\xe0\xf2", "mbcs")
SetClipboardData(win32con.CF_UNICODETEXT, val)
self.failUnlessEqual(GetClipboardData(win32con.CF_UNICODETEXT), val)
--- 60,64 ----
CloseClipboard()
def test_unicode(self):
! val = u"test-\a9har"
SetClipboardData(win32con.CF_UNICODETEXT, val)
self.failUnlessEqual(GetClipboardData(win32con.CF_UNICODETEXT), val)
***************
*** 66,72 ****
val = "test-val"
SetClipboardText(val)
! self.failUnlessEqual(GetClipboardData(win32con.CF_TEXT), val)
def test_string(self):
! val = "test"
SetClipboardData(win32con.CF_TEXT, val)
self.failUnlessEqual(GetClipboardData(win32con.CF_TEXT), val)
--- 66,77 ----
val = "test-val"
SetClipboardText(val)
! # GetClipboardData doesn't to auto string conversions - so on py3k,
! # CF_TEXT returns bytes.
! expected = val.encode("ascii")
! self.failUnlessEqual(GetClipboardData(win32con.CF_TEXT), expected)
! SetClipboardText(val, win32con.CF_UNICODETEXT)
! self.failUnlessEqual(GetClipboardData(win32con.CF_UNICODETEXT), val)
def test_string(self):
! val = "test".encode("ascii")
SetClipboardData(win32con.CF_TEXT, val)
self.failUnlessEqual(GetClipboardData(win32con.CF_TEXT), val)
***************
*** 78,93 ****
CloseClipboard()
def test_mem(self):
! val = "test"
SetClipboardData(win32con.CF_TEXT, val)
# Get the raw data - this will include the '\0'
raw_data = GetGlobalMemory(GetClipboardDataHandle(win32con.CF_TEXT))
! self.failUnlessEqual(val + '\0', raw_data)
def test_bad_mem(self):
- if sys.getwindowsversion()[0] > 5:
- print "skipping test_bad_mem - fails on Vista (x64 at least - not sure about x32...)"
- return
self.failUnlessRaises(pywintypes.error, GetGlobalMemory, 0)
- self.failUnlessRaises(pywintypes.error, GetGlobalMemory, 1)
self.failUnlessRaises(pywintypes.error, GetGlobalMemory, -1)
def test_custom_mem(self):
test_data = "hello\x00\xff"
--- 83,100 ----
CloseClipboard()
def test_mem(self):
! val = "test".encode("ascii")
! expected = "test\0".encode("ascii")
SetClipboardData(win32con.CF_TEXT, val)
# Get the raw data - this will include the '\0'
raw_data = GetGlobalMemory(GetClipboardDataHandle(win32con.CF_TEXT))
! self.failUnlessEqual(expected, raw_data)
def test_bad_mem(self):
self.failUnlessRaises(pywintypes.error, GetGlobalMemory, 0)
self.failUnlessRaises(pywintypes.error, GetGlobalMemory, -1)
+ if sys.getwindowsversion()[0] <= 5:
+ # For some reason, the value '1' dies from a 64bit process, but
+ # "works" (ie, gives the correct exception) from a 32bit process.
+ # just silently skip this value on Vista.
+ self.failUnlessRaises(pywintypes.error, GetGlobalMemory, 1)
def test_custom_mem(self):
test_data = "hello\x00\xff"
|
