[PyObjC-svn] r2572 - trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest
[email protected] Fri, 13 Aug 2010 06:17:27 -0500
| Newsgroups | gmane.comp.python.pyobjc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ronaldoussoren
Date: Fri Aug 13 06:17:27 2010
New Revision: 2572
Log:
Some small test changes that seem to ensure that these tests pass
reliably.
The actual change is a hack, but good enough for the test cases.
Modified:
trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfrunloop.py
trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfusernotification.py
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfrunloop.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfrunloop.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfrunloop.py Fri Aug 13 06:17:27 2010
@@ -30,6 +30,9 @@
self.assertIsInstance(CFRunLoopObserverGetTypeID(), (int, long))
self.assertIsInstance(CFRunLoopTimerGetTypeID(), (int, long))
def testRunloop(self):
+ runloop_mode = kCFRunLoopDefaultMode
+ runloop_mode = "pyobjctest.cfrunloop"
+
loop = CFRunLoopGetCurrent()
self.assertIsInstance(loop, CFRunLoopRef)
loop = CFRunLoopGetMain()
@@ -46,7 +49,7 @@
CFRunLoopAddCommonMode(loop, "pyobjctest")
allmodes = CFRunLoopCopyAllModes(loop)
- tm = CFRunLoopGetNextTimerFireDate(loop, kCFRunLoopDefaultMode)
+ tm = CFRunLoopGetNextTimerFireDate(loop, runloop_mode)
self.assertIsInstance(tm, float)
b = CFRunLoopIsWaiting(loop)
self.assertIsInstance(b, bool)
@@ -59,7 +62,10 @@
# CFRunLoopRun is hard to test reliably
self.assertHasAttr(CoreFoundation, 'CFRunLoopRun')
+
def testObserver(self):
+ runloop_mode = kCFRunLoopDefaultMode
+ runloop_mode = "pyobjctest.cfrunloop"
rl = CFRunLoopGetCurrent()
@@ -84,29 +90,31 @@
observer = CFRunLoopObserverCreate(None, kCFRunLoopEntry|kCFRunLoopExit,
True, 4, callback, data)
self.assertIsInstance(observer, CFRunLoopObserverRef)
- self.assertIs(CFRunLoopContainsObserver(rl, observer, kCFRunLoopDefaultMode), False)
- CFRunLoopAddObserver(rl, observer, kCFRunLoopDefaultMode)
- self.assertIs(CFRunLoopContainsObserver(rl, observer, kCFRunLoopDefaultMode), True)
+ self.assertIs(CFRunLoopContainsObserver(rl, observer, runloop_mode), False)
+ CFRunLoopAddObserver(rl, observer, runloop_mode)
+ self.assertIs(CFRunLoopContainsObserver(rl, observer, runloop_mode), True)
# Use dummy stream to ensure that the runloop actually performs work
strval = b'hello world'
stream = CFReadStreamCreateWithBytesNoCopy(None,
strval, len(strval), kCFAllocatorNull)
self.assertIsInstance(stream, CFReadStreamRef)
- CFReadStreamScheduleWithRunLoop(stream, rl, kCFRunLoopDefaultMode)
- res = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 1.0, True)
- CFReadStreamUnscheduleFromRunLoop(stream, rl, kCFRunLoopDefaultMode)
+ CFReadStreamScheduleWithRunLoop(stream, rl, runloop_mode)
+ res = CFRunLoopRunInMode(runloop_mode, 1.0, True)
+ CFReadStreamUnscheduleFromRunLoop(stream, rl, runloop_mode)
self.assertNotEqual(len(state) , 0 )
for item in state:
self.assertIs(item[0], observer)
self.assertIsIn(item[1], (kCFRunLoopEntry, kCFRunLoopExit))
self.assertIs(item[2], data)
- CFRunLoopRemoveObserver(rl, observer, kCFRunLoopDefaultMode)
- self.assertIs(CFRunLoopContainsObserver(rl, observer, kCFRunLoopDefaultMode), False)
+ CFRunLoopRemoveObserver(rl, observer, runloop_mode)
+ self.assertIs(CFRunLoopContainsObserver(rl, observer, runloop_mode), False)
def testTimer(self):
+ runloop_mode = kCFRunLoopDefaultMode
+ runloop_mode = "pyobjctest.cfrunloop"
rl = CFRunLoopGetCurrent()
state = []
@@ -133,19 +141,22 @@
self.assertIs(CFRunLoopTimerIsValid(timer), False)
self.assertIs(CFRunLoopTimerGetContext(timer, None), objc.NULL)
timer = CFRunLoopTimerCreate(None, 0, 0.5, 0, 0, callback, data)
- self.assertIs(CFRunLoopContainsTimer(rl, timer, kCFRunLoopDefaultMode), False)
- CFRunLoopAddTimer(rl, timer, kCFRunLoopDefaultMode)
- self.assertIs(CFRunLoopContainsTimer(rl, timer, kCFRunLoopDefaultMode), True)
- res = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 1.3, True)
+ self.assertIs(CFRunLoopContainsTimer(rl, timer, runloop_mode), False)
+ CFRunLoopAddTimer(rl, timer, runloop_mode)
+ self.assertIs(CFRunLoopContainsTimer(rl, timer, runloop_mode), True)
+ res = CFRunLoopRunInMode(runloop_mode, 1.3, True)
CFRunLoopTimerInvalidate(timer)
- CFRunLoopRemoveTimer(rl, timer, kCFRunLoopDefaultMode)
- self.assertIs(CFRunLoopContainsTimer(rl, timer, kCFRunLoopDefaultMode), False)
+ CFRunLoopRemoveTimer(rl, timer, runloop_mode)
+ self.assertIs(CFRunLoopContainsTimer(rl, timer, runloop_mode), False)
self.assertFalse(len(state) < 3)
for item in state:
self.assertIs(item[0], timer)
self.assertIs(item[1], data)
def testSource(self):
+ runloop_mode = kCFRunLoopDefaultMode
+ runloop_mode = "pyobjctest.cfrunloop"
+
rl = CFRunLoopGetCurrent()
state = []
@@ -175,17 +186,17 @@
source = CFRunLoopSourceCreate(None, 55,
(0, schedule, cancel, perform, data))
self.assertIsInstance(source, CFRunLoopSourceRef)
- self.assertIs(CFRunLoopContainsSource(rl, source, kCFRunLoopDefaultMode), False)
- CFRunLoopAddSource(rl, source, kCFRunLoopDefaultMode)
- self.assertIs(CFRunLoopContainsSource(rl, source, kCFRunLoopDefaultMode), True)
+ self.assertIs(CFRunLoopContainsSource(rl, source, runloop_mode), False)
+ CFRunLoopAddSource(rl, source, runloop_mode)
+ self.assertIs(CFRunLoopContainsSource(rl, source, runloop_mode), True)
self.assertEqual(len(state) , 1)
self.assertEqual(state[0][0] , 'schedule')
self.assertIs(state[0][1], data)
self.assertIs(state[0][2], rl)
- self.assertEqual(state[0][3] , kCFRunLoopDefaultMode)
+ self.assertEqual(state[0][3] , runloop_mode)
del state[:]
- res = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.5, True)
+ res = CFRunLoopRunInMode(runloop_mode, 0.5, True)
self.assertIsInstance(res, (int, long))
#self.assertEqual(res, kCFRunLoopRunTimedOut)
@@ -193,7 +204,7 @@
CFRunLoopSourceSignal(source)
- res = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.5, True)
+ res = CFRunLoopRunInMode(runloop_mode, 0.5, True)
self.assertIsInstance(res, (int, long))
self.assertEqual(res, kCFRunLoopRunHandledSource)
@@ -202,13 +213,13 @@
self.assertIs(state[0][1], data)
del state[:]
- CFRunLoopRemoveSource(rl, source, kCFRunLoopDefaultMode)
- self.assertIs(CFRunLoopContainsSource(rl, source, kCFRunLoopDefaultMode), False)
+ CFRunLoopRemoveSource(rl, source, runloop_mode)
+ self.assertIs(CFRunLoopContainsSource(rl, source, runloop_mode), False)
self.assertEqual(len(state), 1)
self.assertEqual(state[0][0] , 'cancel')
self.assertIs(state[0][1], data)
self.assertIs(state[0][2], rl)
- self.assertEqual(state[0][3] , kCFRunLoopDefaultMode)
+ self.assertEqual(state[0][3] , runloop_mode)
@min_os_level('10.6')
def testFunctions10_6(self):
self.assertArgIsBlock(CFRunLoopPerformBlock, 2, b'v')
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfusernotification.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfusernotification.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfusernotification.py Fri Aug 13 06:17:27 2010
@@ -9,6 +9,9 @@
id = CFUserNotificationGetTypeID()
self.assertIsInstance(id, (int, long))
def testCreation(self):
+ runloop_mode = kCFRunLoopDefaultMode
+ runloop_mode = u"pyobjctest.cfusernotificaton"
+
rl = CFRunLoopGetCurrent()
infoDict = {
@@ -30,12 +33,12 @@
self.assertArgIsFunction(CFUserNotificationCreateRunLoopSource, 2, b'v^{__CFUserNotification=}' + objc._C_NSInteger, True)
rls = CFUserNotificationCreateRunLoopSource(None, ref, callout, 1)
self.assertIsInstance(rls, CFRunLoopSourceRef)
- CFRunLoopAddSource(rl, rls, kCFRunLoopDefaultMode)
- CFRunLoopRunInMode(kCFRunLoopDefaultMode, 2.0, True)
+ CFRunLoopAddSource(rl, rls, runloop_mode)
+ CFRunLoopRunInMode(runloop_mode, 2.0, True)
CFUserNotificationCancel(ref)
- CFRunLoopRunInMode(kCFRunLoopDefaultMode, 5.0, True)
- CFRunLoopRemoveSource(rl, rls, kCFRunLoopDefaultMode)
+ CFRunLoopRunInMode(runloop_mode, 5.0, True)
+ CFRunLoopRemoveSource(rl, rls, runloop_mode)
self.assertEqual(len(values), 1)
self.assertIs(values[0][0], ref)
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev