[PyObjC-svn] r2235 - trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest

Author: ronaldoussoren
Date: Sat May 23 02:12:25 2009
New Revision: 2235

Log:
Fix some small issues in the test cases.


Modified:
   trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfbitvector.py
   trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfcalendar.py
   trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfurl.py
   trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsnumber.py

Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfbitvector.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfbitvector.py	(original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfbitvector.py	Sat May 23 02:12:25 2009
@@ -45,9 +45,9 @@
     def testInspection(self):
         bitset = CFBitVectorCreate(None, [0x11, 0x22, 0x33, 0x44], 30)
 
-        self.failUnless( CFBitVectorGetCount(bitset) == 30 )
-        self.failUnless( CFBitVectorGetCountOfBit(bitset, (0, 30), 1) == 13 )
-        self.failUnless( CFBitVectorGetCountOfBit(bitset, (0, 30), 0) == 17 )
+        self.failUnlessEqual( CFBitVectorGetCount(bitset), 30 )
+        self.failUnlessEqual( CFBitVectorGetCountOfBit(bitset, (0, 30), 1), 10 )
+        self.failUnlessEqual( CFBitVectorGetCountOfBit(bitset, (0, 30), 0), 20 )
 
         self.failUnless(  CFBitVectorContainsBit(bitset, (0, 30), 1) )
         self.failIf(  CFBitVectorContainsBit(bitset, (0, 3), 1) )

Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfcalendar.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfcalendar.py	(original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfcalendar.py	Sat May 23 02:12:25 2009
@@ -122,8 +122,8 @@
 
         rng = CFCalendarGetRangeOfUnit(cal, kCFCalendarUnitDay, kCFCalendarUnitYear, CFAbsoluteTimeGetCurrent())
         self.failUnless(isinstance(rng, CFRange))
-        self.failUnless(rng.location == 1)
-        self.failUnless(rng.length == 31)
+        self.failUnlessEqual(rng.location, 1)
+        self.failUnlessEqual(rng.length, 365)
 
 
         v = CFCalendarGetOrdinalityOfUnit(cal, kCFCalendarUnitDay, kCFCalendarUnitYear, CFAbsoluteTimeGetCurrent())

Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfurl.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfurl.py	(original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfurl.py	Sat May 23 02:12:25 2009
@@ -275,22 +275,16 @@
         self.assertEquals(strval, u"http://www.omroep.nl/%73port en %73pel")
 
     def testFSRef(self):
-        try:
-            from  Carbon.File import FSRef
-        except ImportError:
-            # Ignore this test when Carbon.File is not present
-            return
-
         ref = CFURLCreateWithFileSystemPath(None, os.getcwd(), kCFURLPOSIXPathStyle, True)
         self.failUnless( isinstance(ref, CFURLRef) )
 
         ok, fsref = CFURLGetFSRef(ref, None)
         self.failUnless(ok)
-        self.failUnless(isinstance(fsref, FSRef))
-        self.failUnless( fsref.FSRefMakePath() ==  os.getcwd())
+        self.failUnless(isinstance(fsref, objc.FSRef))
+        self.failUnless( fsref.as_pathname() ==  os.getcwd())
 
         ref2 = CFURLCreateFromFSRef(None, fsref)
-        self.failUnless(ref is ref2) 
+        self.failUnlessEqual(ref, ref2) 
 
     def testConstants(self):
         self.failUnless( kCFURLPOSIXPathStyle == 0 )

Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsnumber.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsnumber.py	(original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsnumber.py	Sat May 23 02:12:25 2009
@@ -62,7 +62,7 @@
     def testUnsignedIssues(self):
         # NSNumber stores unsigned numbers as signed numbers
         # This is a bug in Cocoa... (RADAR #4007594), fixed in 10.5
-	if os.uname()[2] < '9.':
+        if sdkForPython() < (10, 5):
 		self.assertEquals(NSNumber.numberWithUnsignedInt_(sys.maxint+1),
 			    -sys.maxint-1)
 	else:

------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, & 
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com