[pywin32-checkins] pywin32/win32/test test_clipboard.py, 1.6.2.1, 1.6.2.2 test_win32event.py, 1.1, 1.1.4.1 testall.py, 1.6, 1.6.2.1

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14888/win32/test

Modified Files:
      Tag: py3k
	test_clipboard.py test_win32event.py testall.py 
Log Message:
Merge various changes from trunk and py3k-integration bzr branch

Index: testall.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/testall.py,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** testall.py	29 May 2007 12:22:28 -0000	1.6
--- testall.py	26 Nov 2008 07:17:39 -0000	1.6.2.1
***************
*** 6,10 ****
  ui_demos = """GetSaveFileName print_desktop win32cred_demo win32gui_demo
                win32gui_dialog win32gui_menu win32gui_taskbar
!               win32rcparser_demo winprocess win32console_demo""".split()
  # Other demos known as 'bad' (or at least highly unlikely to work)
  # cerapi: no CE module is built (CE via pywin32 appears dead)
--- 6,12 ----
  ui_demos = """GetSaveFileName print_desktop win32cred_demo win32gui_demo
                win32gui_dialog win32gui_menu win32gui_taskbar
!               win32rcparser_demo winprocess win32console_demo
!               win32gui_devicenotify
!               NetValidatePasswordPolicy""".split()
  # Other demos known as 'bad' (or at least highly unlikely to work)
  # cerapi: no CE module is built (CE via pywin32 appears dead)

Index: test_clipboard.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_clipboard.py,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** test_clipboard.py	29 Aug 2008 04:59:28 -0000	1.6.2.1
--- test_clipboard.py	26 Nov 2008 07:17:39 -0000	1.6.2.2
***************
*** 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 = b"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 = b"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 = b"hello\x00\xff"

Index: test_win32event.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32event.py,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** test_win32event.py	25 Jan 2005 07:53:35 -0000	1.1
--- test_win32event.py	26 Nov 2008 07:17:39 -0000	1.1.4.1
***************
*** 21,24 ****
--- 21,47 ----
          self.failUnlessEqual(rc, win32event.WAIT_TIMEOUT)
  
+ class TestWaitFunctions(unittest.TestCase):
+     def testMsgWaitForMultipleObjects(self):
+         # this function used to segfault when called with an empty list
+         res = win32event.MsgWaitForMultipleObjects([], 0, 0, 0)
+         self.assertEquals(res, win32event.WAIT_TIMEOUT)
+ 
+     def testMsgWaitForMultipleObjects2(self):
+         # test with non-empty list
+         event = win32event.CreateEvent(None, 0, 0, None)
+         res = win32event.MsgWaitForMultipleObjects([event], 0, 0, 0)
+         self.assertEquals(res, win32event.WAIT_TIMEOUT)
+ 
+     def testMsgWaitForMultipleObjectsEx(self):
+         # this function used to segfault when called with an empty list
+         res = win32event.MsgWaitForMultipleObjectsEx([], 0, 0, 0)
+         self.assertEquals(res, win32event.WAIT_TIMEOUT)
+ 
+     def testMsgWaitForMultipleObjectsEx2(self):
+         # test with non-empty list
+         event = win32event.CreateEvent(None, 0, 0, None)
+         res = win32event.MsgWaitForMultipleObjectsEx([event], 0, 0, 0)
+         self.assertEquals(res, win32event.WAIT_TIMEOUT)
+ 
  if __name__=='__main__':
      unittest.main()