[PyObjC-svn] r2254 - trunk/pyobjc/pyobjc-core/PyObjCTest

Author: ronaldoussoren
Date: Sun May 31 07:55:00 2009
New Revision: 2254

Log:
Tiny tweaks in the tests to fix some issues


Modified:
   trunk/pyobjc/pyobjc-core/PyObjCTest/loader.py
   trunk/pyobjc/pyobjc-core/PyObjCTest/test_corefoundation.py
   trunk/pyobjc/pyobjc-core/PyObjCTest/test_leaks.py
   trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata.py
   trunk/pyobjc/pyobjc-core/PyObjCTest/test_opaque.py
   trunk/pyobjc/pyobjc-core/PyObjCTest/test_subclass.py

Modified: trunk/pyobjc/pyobjc-core/PyObjCTest/loader.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/PyObjCTest/loader.py	(original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/loader.py	Sun May 31 07:55:00 2009
@@ -64,4 +64,9 @@
         
     suite = unittest.TestSuite((plain_suite, deja_suite))
 
+    # the libffi tests don't work unless we use our own
+    # copy of libffi.
+    import __main__
+    if __main__.USE_SYSTEM_FFI:
+        return plain_suite
     return suite

Modified: trunk/pyobjc/pyobjc-core/PyObjCTest/test_corefoundation.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/PyObjCTest/test_corefoundation.py	(original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_corefoundation.py	Sun May 31 07:55:00 2009
@@ -45,6 +45,7 @@
     def testBridged(self):
 
         obj = OC_TestCoreFoundation.newUUID()
+        print obj, type(obj)
 
         self.assert_( isinstance(obj, CFUUIDRef) )
         self.assert_( isinstance(obj, objc.lookUpClass("NSCFType")) )

Modified: trunk/pyobjc/pyobjc-core/PyObjCTest/test_leaks.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/PyObjCTest/test_leaks.py	(original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_leaks.py	Sun May 31 07:55:00 2009
@@ -21,14 +21,14 @@
     __slots__ = ('slot1',)
 
     def init(self):
-        self = NSObject.init(self)
+        NSObject.pyobjc_instanceMethods.init(self)
         self.slot1 = LeaksClass.alloc().init()
         return self
 
 class MemberClass (NSObject):
 
     def init(self):
-        self = NSObject.init(self)
+        self = NSObject.pyobjc_instanceMethods.init(self)
         self.slot1 = LeaksClass.alloc().init()
         return self
 

Modified: trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata.py	(original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata.py	Sun May 31 07:55:00 2009
@@ -963,7 +963,7 @@
         meta = OC_MetaDataTest.alloc.__metadata__()
         self.assertEquals(meta['classmethod'], True)
 
-        meta = OC_MetaDataTest.init.__metadata__()
+        meta = OC_MetaDataTest.pyobjc_instanceMethods.init.__metadata__()
         self.assertEquals(meta['classmethod'], False)
 
 

Modified: trunk/pyobjc/pyobjc-core/PyObjCTest/test_opaque.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/PyObjCTest/test_opaque.py	(original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_opaque.py	Sun May 31 07:55:00 2009
@@ -1,6 +1,6 @@
 from PyObjCTools.TestSupport import *
 import objc
-from PyObjCTools.opaque import *
+from PyObjCTest.opaque import *
 
 class TestFromPython (TestCase):
     def testBasic (self):

Modified: trunk/pyobjc/pyobjc-core/PyObjCTest/test_subclass.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/PyObjCTest/test_subclass.py	(original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_subclass.py	Sun May 31 07:55:00 2009
@@ -154,7 +154,7 @@
 
         class MITestClass1 (NSObject, MixinClass1):
             def init(self):
-                return NSObject.init(self)
+                return NSObject.pyobjc_instanceMethods.init(self)
 
         self.assert_(hasattr(MITestClass1, 'mixinMethod'))
 
@@ -169,7 +169,7 @@
 
         class MITestClass2 (NSObject, MixinClass2):
             def init(self):
-                return NSObject.init(self)
+                return NSObject.pyobjc_instanceMethods.init(self)
 
         self.assert_(hasattr(MITestClass2, 'mixinMethod'))
 

------------------------------------------------------------------------------
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 as they present alongside digital heavyweights like Barbarian 
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com