[PyObjC-svn] r2229 - in trunk/pyobjc/pyobjc-core: . Lib/objc/test PyObjCTest Scripts setup-lib
[email protected] Thu, 21 May 2009 05:37:29 -0500
| Newsgroups | gmane.comp.python.pyobjc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ronaldoussoren
Date: Thu May 21 05:37:29 2009
New Revision: 2229
Log:
This moves the testcases from objc.test to
PyObjCTest. The latter package is not installed.
Added:
trunk/pyobjc/pyobjc-core/PyObjCTest/
- copied from r2025, /trunk/pyobjc/pyobjc-core/Lib/objc/test/
trunk/pyobjc/pyobjc-core/PyObjCTest/__init__.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/__init__.py
trunk/pyobjc/pyobjc-core/PyObjCTest/dejagnu.py (contents, props changed)
trunk/pyobjc/pyobjc-core/PyObjCTest/fnd.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/fnd.py
trunk/pyobjc/pyobjc-core/PyObjCTest/keyvaluehelper.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/keyvaluehelper.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_NULL.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_NULL.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_allocatebuffer.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_allocatebuffer.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_archive_python.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_archive_python.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_arrays.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_arrays.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_bundleFunctions.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_bundleFunctions.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_bundleVariables.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_bundleVariables.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_classandinst.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_classandinst.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_clinmeth.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_clinmeth.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_conversion.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_conversion.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_copying.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_copying.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_corefoundation.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_corefoundation.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_ctests.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_ctests.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_dict_proxy.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_dict_proxy.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_exceptions.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_exceptions.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_filepointer.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_filepointer.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_fsref.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_fsref.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_identity.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_identity.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_imp.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_imp.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_initialized.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_initialized.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_ivar.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_ivar.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_keyvalue.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_keyvalue.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_keyvalue_prop.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_keyvalue_prop.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_leaks.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_leaks.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_list_proxy.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_list_proxy.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_locking.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_locking.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_function.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_function.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_imp.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_imp.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_py.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_py.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_py2py.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_py2py.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_method_prototypes.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_method_prototypes.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_methodaccess.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_methodaccess.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_methodedits.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_methodedits.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_methods.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_methods.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_methods2.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_methods2.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_nsdate_proxy.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_nsdate_proxy.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_number_proxy.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_number_proxy.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_objc.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_objc.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_opaque.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_opaque.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_outputinitializer.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_outputinitializer.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_pickle.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_pickle.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_pickling_objc.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_pickling_objc.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_posing.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_posing.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_protected.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_protected.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_protocol.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_protocol.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_protocolNamed.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_protocolNamed.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_regr.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_regr.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_set_proxy.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_set_proxy.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_signatures.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_signatures.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_sockaddr.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_sockaddr.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_charbyte.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_charbyte.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_charint.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_charint.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_methdef.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_methdef.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_nsbool.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_nsbool.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_struct.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_struct.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_unichar.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_unichar.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_splitsig.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_splitsig.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_structpointer.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_structpointer.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_structs.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_structs.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_subclass.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_subclass.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_varargs.py
- copied unchanged from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_varargs.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_voidpointer.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_voidpointer.py
trunk/pyobjc/pyobjc-core/PyObjCTest/test_weakref.py
- copied, changed from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_weakref.py
Removed:
trunk/pyobjc/pyobjc-core/Lib/objc/test/
trunk/pyobjc/pyobjc-core/Scripts/gen_test_methods.py
trunk/pyobjc/pyobjc-core/setup-lib/
Modified:
trunk/pyobjc/pyobjc-core/MANIFEST.in
trunk/pyobjc/pyobjc-core/NEWS.txt
trunk/pyobjc/pyobjc-core/setup.py
Modified: trunk/pyobjc/pyobjc-core/MANIFEST.in
==============================================================================
--- trunk/pyobjc/pyobjc-core/MANIFEST.in (original)
+++ trunk/pyobjc/pyobjc-core/MANIFEST.in Thu May 21 05:37:29 2009
@@ -1,7 +1,6 @@
include *.txt MANIFEST.in setup.py
graft Doc
graft Examples
-graft Installer?Package
graft Lib
graft Modules
graft Scripts
@@ -9,6 +8,5 @@
graft setup-lib
graft source-deps
global-exclude .DS_Store
-global-exclude *.pbxuser
global-exclude *.pyc
global-exclude *.so
Modified: trunk/pyobjc/pyobjc-core/NEWS.txt
==============================================================================
--- trunk/pyobjc/pyobjc-core/NEWS.txt (original)
+++ trunk/pyobjc/pyobjc-core/NEWS.txt Thu May 21 05:37:29 2009
@@ -7,6 +7,14 @@
Version 2.2 (...)
-----------------
+- Move the testsuite from ``objc.test`` to ``PyObjCTest`` and no longer
+ install the tests.
+
+ The tests are no longer installed because they aren't needed for
+ day-to-day usage of PyObjC. Furthermore this change will make it possible
+ to copy all of the pyobjc-core "egg" into an application bundle without
+ adding unnecessary files to that bundle.
+
- BUGFIX: Storing pure python objects in a ``NSKeydArchiver`` archive didn't
work 100% reliably for Python floats. I've changed the implementation on
for encoding floats a little and now floats do get rounddtripped properly.
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/__init__.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/__init__.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/__init__.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/__init__.py Thu May 21 05:37:29 2009
@@ -1,3 +1,3 @@
"""
-objc.test package - unittests for the pyobjc core
+PyObjCTest package - unittests for the pyobjc core
"""
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/keyvaluehelper.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/keyvaluehelper.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/keyvaluehelper.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/keyvaluehelper.py Thu May 21 05:37:29 2009
@@ -1,7 +1,7 @@
"""
Helper module for KeyValue tests
"""
-from objc.test.testbndl import PyObjCTest_KVBaseClass, PyObjCTest_KVPathClass
+from PyObjCTest.testbndl import PyObjCTest_KVBaseClass, PyObjCTest_KVPathClass
import objc
NSObject = objc.lookUpClass('NSObject')
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_NULL.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_NULL.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_NULL.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_NULL.py Thu May 21 05:37:29 2009
@@ -58,7 +58,7 @@
},
))
-from objc.test.NULL import *
+from PyObjCTest.NULL import *
class TestNULL (TestCase):
def testNULL(self):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_archive_python.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_archive_python.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_archive_python.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_archive_python.py Thu May 21 05:37:29 2009
@@ -9,10 +9,10 @@
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSArchiver, NSUnarchiver
-from objc.test.fnd import NSKeyedArchiver, NSKeyedUnarchiver
-from objc.test.fnd import NSData, NSArray, NSDictionary
-from objc.test.fnd import NSMutableArray, NSMutableDictionary
+from PyObjCTest.fnd import NSArchiver, NSUnarchiver
+from PyObjCTest.fnd import NSKeyedArchiver, NSKeyedUnarchiver
+from PyObjCTest.fnd import NSData, NSArray, NSDictionary
+from PyObjCTest.fnd import NSMutableArray, NSMutableDictionary
#
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_arrays.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_arrays.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_arrays.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_arrays.py Thu May 21 05:37:29 2009
@@ -6,8 +6,8 @@
from PyObjCTools.TestSupport import *
import objc
import array
-from objc.test.arrays import *
-from objc.test.fnd import NSObject
+from PyObjCTest.arrays import *
+from PyObjCTest.fnd import NSObject
class TestArrayCalling (TestCase):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_bundleFunctions.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_bundleFunctions.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_bundleFunctions.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_bundleFunctions.py Thu May 21 05:37:29 2009
@@ -1,5 +1,5 @@
import objc
-import objc.test.fnd as Foundation
+import PyObjCTest.fnd as Foundation
from PyObjCTools.TestSupport import *
import os
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_bundleVariables.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_bundleVariables.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_bundleVariables.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_bundleVariables.py Thu May 21 05:37:29 2009
@@ -1,5 +1,5 @@
import objc
-import objc.test.fnd as Foundation
+import PyObjCTest.fnd as Foundation
from PyObjCTools.TestSupport import *
class TestBundleVariables (TestCase):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_classandinst.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_classandinst.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_classandinst.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_classandinst.py Thu May 21 05:37:29 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
import objc
-from objc.test.testclassandinst import PyObjC_TestClassAndInstance, PyObjC_TestUnallocatable
+from PyObjCTest.testclassandinst import PyObjC_TestClassAndInstance, PyObjC_TestUnallocatable
class PyObjC_TestClassAndInstanceSubclass(PyObjC_TestClassAndInstance):
"""Simple subclass, just make sure it still works"""
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_clinmeth.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_clinmeth.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_clinmeth.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_clinmeth.py Thu May 21 05:37:29 2009
@@ -2,7 +2,7 @@
Tests for accessing methods through classes and instances
"""
from PyObjCTools.TestSupport import *
-from objc.test.clinmeth import *
+from PyObjCTest.clinmeth import *
import objc
class TestClassMethods (TestCase):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_conversion.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_conversion.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_conversion.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_conversion.py Thu May 21 05:37:29 2009
@@ -4,16 +4,16 @@
TODO: This only tests C values at the moment.
"""
from PyObjCTools.TestSupport import *
-from objc.test.testbndl import pyObjCPy, carrayMaker
-from objc.test.testbndl import UCHAR_MAX
-from objc.test.testbndl import CHAR_MAX, CHAR_MIN
-from objc.test.testbndl import SCHAR_MAX, SCHAR_MIN
-from objc.test.testbndl import USHRT_MAX, SHRT_MAX, SHRT_MIN
-from objc.test.testbndl import UINT_MAX, INT_MAX, INT_MIN
-from objc.test.testbndl import ULONG_MAX, LONG_MAX, LONG_MIN
-from objc.test.testbndl import ULLONG_MAX, LLONG_MAX, LLONG_MIN
-from objc.test.testbndl import DBL_MAX, DBL_MIN, DBL_EPSILON
-from objc.test.testbndl import FLT_MAX, FLT_MIN, FLT_EPSILON
+from PyObjCTest.testbndl import pyObjCPy, carrayMaker
+from PyObjCTest.testbndl import UCHAR_MAX
+from PyObjCTest.testbndl import CHAR_MAX, CHAR_MIN
+from PyObjCTest.testbndl import SCHAR_MAX, SCHAR_MIN
+from PyObjCTest.testbndl import USHRT_MAX, SHRT_MAX, SHRT_MIN
+from PyObjCTest.testbndl import UINT_MAX, INT_MAX, INT_MIN
+from PyObjCTest.testbndl import ULONG_MAX, LONG_MAX, LONG_MIN
+from PyObjCTest.testbndl import ULLONG_MAX, LLONG_MAX, LLONG_MIN
+from PyObjCTest.testbndl import DBL_MAX, DBL_MIN, DBL_EPSILON
+from PyObjCTest.testbndl import FLT_MAX, FLT_MIN, FLT_EPSILON
import objc
import array, sys
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_copying.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_copying.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_copying.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_copying.py Thu May 21 05:37:29 2009
@@ -3,7 +3,7 @@
NSObject = objc.lookUpClass("NSObject")
NSAutoreleasePool = objc.lookUpClass("NSAutoreleasePool")
-from objc.test.copying import OC_CopyHelper, OC_CopyBase
+from PyObjCTest.copying import OC_CopyHelper, OC_CopyBase
def funcattr(**kwds):
def annotate(func):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_corefoundation.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_corefoundation.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_corefoundation.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_corefoundation.py Thu May 21 05:37:29 2009
@@ -5,7 +5,7 @@
from PyObjCTools.TestSupport import *
import re
-from objc.test.corefoundation import *
+from PyObjCTest.corefoundation import *
# registerCFSignature(name, encoding, typeId [, tollfreeName]) -> type
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_ctests.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_ctests.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_ctests.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_ctests.py Thu May 21 05:37:29 2009
@@ -8,7 +8,7 @@
"""
import sys, platform
from PyObjCTools.TestSupport import *
-from objc.test import ctests
+from PyObjCTest import ctests
names = [ x for x in dir (ctests) if not x.startswith('_') ]
methods = {}
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_dict_proxy.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_dict_proxy.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_dict_proxy.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_dict_proxy.py Thu May 21 05:37:29 2009
@@ -5,8 +5,8 @@
"""
import sys
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSDictionary, NSMutableDictionary, NSPredicate, NSObject, NSNull
-from objc.test.pythonset import OC_TestSet
+from PyObjCTest.fnd import NSDictionary, NSMutableDictionary, NSPredicate, NSObject, NSNull
+from PyObjCTest.pythonset import OC_TestSet
import objc
OC_PythonDictionary = objc.lookUpClass("OC_PythonDictionary")
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_exceptions.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_exceptions.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_exceptions.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_exceptions.py Thu May 21 05:37:29 2009
@@ -3,7 +3,7 @@
# XXX: we should centralize all exception handling tests into this file, this
# is now mostly used to check general unicode support in exceptions.
#
-from objc.test.exceptions import *
+from PyObjCTest.exceptions import *
from PyObjCTools.TestSupport import *
import objc
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_filepointer.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_filepointer.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_filepointer.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_filepointer.py Thu May 21 05:37:29 2009
@@ -1,4 +1,4 @@
-from objc.test.filepointer import OC_TestFilePointer
+from PyObjCTest.filepointer import OC_TestFilePointer
from PyObjCTools.TestSupport import *
fp = open('/etc/passwd', 'r')
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_fsref.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_fsref.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_fsref.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_fsref.py Thu May 21 05:37:29 2009
@@ -1,7 +1,7 @@
from PyObjCTools.TestSupport import *
import objc
-from objc.test.fsref import *
+from PyObjCTest.fsref import *
"""
@interface OC_TestFSRefHelper : NSObject
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_identity.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_identity.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_identity.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_identity.py Thu May 21 05:37:29 2009
@@ -10,7 +10,7 @@
import sys, os
import objc
-from objc.test.identity import *
+from PyObjCTest.identity import *
from PyObjCTools.TestSupport import *
class TestPythonRoundTrip (TestCase):
@@ -288,8 +288,8 @@
# said code, although unsuccesfully...
def tearDown(self):
- if os.path.exists("/tmp/pyobjc.test.identity"):
- os.unlink("/tmp/pyobjc.test.identity")
+ if os.path.exists("/tmp/pyPyObjCTest.identity"):
+ os.unlink("/tmp/pyPyObjCTest.identity")
def testMakePlist(self):
container = OC_TestIdentity.alloc().init()
@@ -298,7 +298,7 @@
value.append(value[3])
container.setStoredObject_(value)
- container.writeStoredObjectToFile_(u"/tmp/pyobjc.test.identity")
+ container.writeStoredObjectToFile_(u"/tmp/pyPyObjCTest.identity")
value = {
u"hello": [ 1, 2, 3],
@@ -308,7 +308,7 @@
}
}
container.setStoredObject_(value)
- container.writeStoredObjectToFile_(u"/tmp/pyobjc.test.identity")
+ container.writeStoredObjectToFile_(u"/tmp/pyPyObjCTest.identity")
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_initialized.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_initialized.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_initialized.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_initialized.py Thu May 21 05:37:29 2009
@@ -1,5 +1,5 @@
from PyObjCTools.TestSupport import *
-from objc.test.initialize import OC_TestInitialize
+from PyObjCTest.initialize import OC_TestInitialize
class OC_TestInitializePython (OC_TestInitialize):
def init(self):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_ivar.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_ivar.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_ivar.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_ivar.py Thu May 21 05:37:29 2009
@@ -2,7 +2,7 @@
import objc
import sys
-from objc.test.instanceVariables import ClassWithVariables
+from PyObjCTest.instanceVariables import ClassWithVariables
NSObject = objc.lookUpClass('NSObject')
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_keyvalue.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_keyvalue.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_keyvalue.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_keyvalue.py Thu May 21 05:37:29 2009
@@ -6,15 +6,15 @@
"""
import objc
from PyObjCTools.TestSupport import *
-from objc.test.fnd import *
+from PyObjCTest.fnd import *
# Native code is needed to access the python class from Objective-C, otherwise
# the Key-Value support cannot be tested.
-from objc.test.testbndl import PyObjC_TestClass3 as STUB
-from objc.test.testbndl import PyObjCTest_KeyValueObserver
-from objc.test.testbndl import *
-from objc.test.keyvaluehelper import *
+from PyObjCTest.testbndl import PyObjC_TestClass3 as STUB
+from PyObjCTest.testbndl import PyObjCTest_KeyValueObserver
+from PyObjCTest.testbndl import *
+from PyObjCTest.keyvaluehelper import *
class KeyValueClass2 (object):
def __init__(self):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_leaks.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_leaks.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_leaks.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_leaks.py Thu May 21 05:37:29 2009
@@ -3,7 +3,7 @@
"""
from PyObjCTools.TestSupport import *
import objc, gc
-from objc.test.fnd import *
+from PyObjCTest.fnd import *
LeaksDel = 0
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_list_proxy.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_list_proxy.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_list_proxy.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_list_proxy.py Thu May 21 05:37:29 2009
@@ -5,8 +5,8 @@
"""
import sys
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSArray, NSMutableArray, NSPredicate, NSObject, NSNull
-from objc.test.pythonset import OC_TestSet
+from PyObjCTest.fnd import NSArray, NSMutableArray, NSPredicate, NSObject, NSNull
+from PyObjCTest.pythonset import OC_TestSet
import objc
OC_PythonArray = objc.lookUpClass("OC_PythonArray")
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_locking.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_locking.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_locking.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_locking.py Thu May 21 05:37:29 2009
@@ -10,7 +10,7 @@
import threading
import time
-from objc.test.locking import OC_LockTest
+from PyObjCTest.locking import OC_LockTest
NSAutoreleasePool = objc.lookUpClass("NSAutoreleasePool")
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata.py Thu May 21 05:37:29 2009
@@ -14,7 +14,7 @@
import warnings
import array
-from objc.test.metadata import *
+from PyObjCTest.metadata import *
def setupMetaData():
# Note to self: what we think of as the first argument of a method is
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_function.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_function.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_function.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_function.py Thu May 21 05:37:29 2009
@@ -7,7 +7,7 @@
from PyObjCTools.TestSupport import *
import warnings
-from objc.test.metadatafunction import *
+from PyObjCTest.metadatafunction import *
_FunctionTable = [
("makeArrayWithFormat_", '@@', '',
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_imp.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_imp.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_imp.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_imp.py Thu May 21 05:37:29 2009
@@ -12,8 +12,8 @@
import objc
from PyObjCTools.TestSupport import *
-from objc.test.metadata import *
-import objc.test.test_metadata # to get the right metadata
+from PyObjCTest.metadata import *
+import PyObjCTest.test_metadata # to get the right metadata
import warnings
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_py.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_py.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_py.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_py.py Thu May 21 05:37:29 2009
@@ -13,10 +13,10 @@
from PyObjCTools.TestSupport import *
import warnings
-from objc.test.metadata import *
+from PyObjCTest.metadata import *
# To ensure we have the right metadata
-import objc.test.test_metadata
+import PyObjCTest.test_metadata
def setupMetaData():
# Note to self: what we think of as the first argument of a method is
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_py2py.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_py2py.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_metadata_py2py.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_metadata_py2py.py Thu May 21 05:37:29 2009
@@ -15,14 +15,14 @@
import objc
from PyObjCTools.TestSupport import *
-from objc.test.metadata import *
+from PyObjCTest.metadata import *
# To ensure we have the right metadata
-import objc.test.test_metadata
-from objc.test.test_metadata_py import Py_MetaDataTest_AllArgs
+import PyObjCTest.test_metadata
+from PyObjCTest.test_metadata_py import Py_MetaDataTest_AllArgs
if 0:
- from objc.test.test_metadata_py2 import Py_MetaDataTest_OutputOptional
+ from PyObjCTest.test_metadata_py2 import Py_MetaDataTest_OutputOptional
class TestArraysOut_AllArgs (TestCase):
def testFixedSize(self):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_method_prototypes.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_method_prototypes.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_method_prototypes.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_method_prototypes.py Thu May 21 05:37:29 2009
@@ -12,7 +12,7 @@
"""
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSObject
+from PyObjCTest.fnd import NSObject
class TestInheritedProtoype (TestCase):
#
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_methods.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_methods.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_methods.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_methods.py Thu May 21 05:37:29 2009
@@ -88,7 +88,7 @@
dict(arguments=argmeta))
-from objc.test.testbndl import *
+from PyObjCTest.testbndl import *
def makeCFloat(value):
"""
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_methods2.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_methods2.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_methods2.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_methods2.py Thu May 21 05:37:29 2009
@@ -1,10 +1,10 @@
from PyObjCTools.TestSupport import *
import objc
from objc import YES, NO, nil
-from objc.test.fnd import NSPriorDayDesignations
+from PyObjCTest.fnd import NSPriorDayDesignations
import sys
-from objc.test import ctests
+from PyObjCTest import ctests
# Several types are encoded slightly different on 32-bit vs. 64-bit
# - NSPoint and NSRect: the actual type is different
@@ -268,7 +268,7 @@
dict(arguments=argmeta))
-from objc.test.testbndl2 import *
+from PyObjCTest.testbndl2 import *
class PyToObjC (TestCase):
# Test calling Objective-C from Python
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_nsdate_proxy.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_nsdate_proxy.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_nsdate_proxy.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_nsdate_proxy.py Thu May 21 05:37:29 2009
@@ -1,5 +1,5 @@
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSDateFormatter, NSArray, NSDate
+from PyObjCTest.fnd import NSDateFormatter, NSArray, NSDate
import datetime
class TestNSDateProxy (TestCase):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_number_proxy.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_number_proxy.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_number_proxy.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_number_proxy.py Thu May 21 05:37:29 2009
@@ -6,8 +6,8 @@
"""
import sys, os
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSNumber, NSNumberFormatter
-from objc.test.pythonnumber import OC_TestNumber
+from PyObjCTest.fnd import NSNumber, NSNumberFormatter
+from PyObjCTest.pythonnumber import OC_TestNumber
import objc
OC_PythonNumber = objc.lookUpClass("OC_PythonNumber")
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_objc.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_objc.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_objc.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_objc.py Thu May 21 05:37:29 2009
@@ -1,8 +1,8 @@
from PyObjCTools.TestSupport import *
import objc
-from objc.test.testbndl import PyObjC_TestClass4
+from PyObjCTest.testbndl import PyObjC_TestClass4
import fnd as Foundation
-from objc.test.fnd import NSObject, NSArray, NSAttributedString
+from PyObjCTest.fnd import NSObject, NSArray, NSAttributedString
class TestConstants(TestCase):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_opaque.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_opaque.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_opaque.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_opaque.py Thu May 21 05:37:29 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
import objc
-from objc.test.opaque import *
+from PyObjCTools.opaque import *
class TestFromPython (TestCase):
def testBasic (self):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_outputinitializer.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_outputinitializer.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_outputinitializer.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_outputinitializer.py Thu May 21 05:37:29 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
import objc
-from objc.test.testoutputinitializer import PyObjC_TestOutputInitializer
+from PyObjCTest.testoutputinitializer import PyObjC_TestOutputInitializer
objc.registerMetaDataForSelector("PyObjC_TestOutputInitializer",
"initWithBooleanOutput:", dict(arguments={
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_pickle.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_pickle.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_pickle.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_pickle.py Thu May 21 05:37:29 2009
@@ -1,4 +1,4 @@
-from objc.test.fnd import NSNumber
+from PyObjCTest.fnd import NSNumber
from PyObjCTools.TestSupport import *
from objc._pythonify import OC_PythonInt, OC_PythonFloat, OC_PythonLong
import pickle
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_protected.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_protected.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_protected.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_protected.py Thu May 21 05:37:29 2009
@@ -1,5 +1,5 @@
from PyObjCTools.TestSupport import *
-from objc.test.protected import *
+from PyObjCTest.protected import *
class TestProtected (TestCase):
def testProtectedNotInDir(self):
@@ -14,4 +14,4 @@
self.assertEquals(None, o.publicMethod())
if __name__ == "__main__":
- objc.test.main()
+ PyObjCTest.main()
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_protocol.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_protocol.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_protocol.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_protocol.py Thu May 21 05:37:29 2009
@@ -11,7 +11,7 @@
# Defining protocols in an MH_BUNDLE makes < 10.3 explode
OC_TestProtocol = None
else:
- from objc.test.protocol import OC_TestProtocol
+ from PyObjCTest.protocol import OC_TestProtocol
MyProto = objc.informal_protocol("MyProto", (
objc.selector(None, selector="testMethod", signature="I@:", isRequired=1),
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_regr.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_regr.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_regr.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_regr.py Thu May 21 05:37:29 2009
@@ -1,9 +1,9 @@
from PyObjCTools.TestSupport import *
-from objc.test import structargs
-from objc.test import testbndl
+from PyObjCTest import structargs
+from PyObjCTest import testbndl
import objc, sys
-from objc.test.fnd import NSObject
+from PyObjCTest.fnd import NSObject
rct = structargs.StructArgClass.someRect.__metadata__()['retval']['type']
@@ -55,7 +55,7 @@
def testOneWayMethods(self):
# This one should be in test_methods*.py
- from objc.test.initialize import OC_TestInitialize
+ from PyObjCTest.initialize import OC_TestInitialize
o = OC_TestInitialize.alloc().init()
self.assertEquals(objc.splitSignature(o.onewayVoidMethod.signature), (objc._C_ONEWAY + objc._C_VOID, objc._C_ID, objc._C_SEL))
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_set_proxy.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_set_proxy.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_set_proxy.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_set_proxy.py Thu May 21 05:37:29 2009
@@ -3,8 +3,8 @@
"""
import sys
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSSet, NSMutableSet, NSPredicate, NSObject, NSNull
-from objc.test.pythonset import OC_TestSet
+from PyObjCTest.fnd import NSSet, NSMutableSet, NSPredicate, NSObject, NSNull
+from PyObjCTest.pythonset import OC_TestSet
import objc
import os
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_sockaddr.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_sockaddr.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_sockaddr.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_sockaddr.py Thu May 21 05:37:29 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
import objc
-from objc.test.sockaddr import PyObjCTestSockAddr
+from PyObjCTest.sockaddr import PyObjCTestSockAddr
objc.registerMetaDataForSelector("PyObjCTestSockAddr", "sockAddrToValue:",
dict(
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_charbyte.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_charbyte.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_charbyte.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_charbyte.py Thu May 21 05:37:29 2009
@@ -9,9 +9,9 @@
"""
import weakref, objc
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSObject
+from PyObjCTest.fnd import NSObject
-from objc.test.specialtypecodes import *
+from PyObjCTest.specialtypecodes import *
import array
def setupMetaData():
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_charint.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_charint.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_charint.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_charint.py Thu May 21 05:37:29 2009
@@ -8,10 +8,10 @@
- Add tests for calling methods from ObjC
"""
import weakref
-from objc.test.fnd import NSObject
+from PyObjCTest.fnd import NSObject
from PyObjCTools.TestSupport import *
-from objc.test.specialtypecodes import *
+from PyObjCTest.specialtypecodes import *
import array
def setupMetaData():
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_methdef.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_methdef.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_methdef.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_methdef.py Thu May 21 05:37:29 2009
@@ -10,9 +10,9 @@
"""
import weakref
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSObject
+from PyObjCTest.fnd import NSObject
-from objc.test.specialtypecodes import *
+from PyObjCTest.specialtypecodes import *
class TestTypeCodeLeaks (TestCase):
def testSimpleTypes(self):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_nsbool.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_nsbool.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_nsbool.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_nsbool.py Thu May 21 05:37:29 2009
@@ -19,9 +19,9 @@
"""
import weakref
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSObject
+from PyObjCTest.fnd import NSObject
-from objc.test.specialtypecodes import *
+from PyObjCTest.specialtypecodes import *
import array
def setupMetaData():
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_struct.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_struct.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_struct.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_struct.py Thu May 21 05:37:29 2009
@@ -6,9 +6,9 @@
"""
import weakref
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSObject
+from PyObjCTest.fnd import NSObject
-from objc.test.specialtypecodes import *
+from PyObjCTest.specialtypecodes import *
EmbeddedBoolStruct = objc.createStructType(
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_unichar.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_unichar.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_specialtypecodes_unichar.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_specialtypecodes_unichar.py Thu May 21 05:37:29 2009
@@ -9,9 +9,9 @@
"""
import weakref
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSObject
+from PyObjCTest.fnd import NSObject
-from objc.test.specialtypecodes import *
+from PyObjCTest.specialtypecodes import *
import array
def setupMetaData():
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_structpointer.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_structpointer.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_structpointer.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_structpointer.py Thu May 21 05:37:29 2009
@@ -1,7 +1,7 @@
from PyObjCTools.TestSupport import *
import objc
-from objc.test.structpointer2 import *
-from objc.test.structpointer1 import *
+from PyObjCTest.structpointer2 import *
+from PyObjCTest.structpointer1 import *
class TestOpaqueStructPointer (TestCase):
def testPointer(self):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_structs.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_structs.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_structs.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_structs.py Thu May 21 05:37:29 2009
@@ -9,8 +9,8 @@
"""
from PyObjCTools.TestSupport import *
import objc
-from objc.test.structs import *
-from objc.test.fnd import NSObject
+from PyObjCTest.structs import *
+from PyObjCTest.fnd import NSObject
class TestStructs (TestCase):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_subclass.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_subclass.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_subclass.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_subclass.py Thu May 21 05:37:29 2009
@@ -1,6 +1,6 @@
from PyObjCTools.TestSupport import *
import objc
-from objc.test.testbndl import PyObjC_TestClass3
+from PyObjCTest.testbndl import PyObjC_TestClass3
import sys
import types
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_voidpointer.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_voidpointer.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_voidpointer.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_voidpointer.py Thu May 21 05:37:29 2009
@@ -1,6 +1,6 @@
import sys
from PyObjCTools.TestSupport import *
-from objc.test.voidpointer import OC_TestVoidPointer
+from PyObjCTest.voidpointer import OC_TestVoidPointer
class TestVoidPointer (TestCase):
def testVoidPointerMethods(self):
Copied: trunk/pyobjc/pyobjc-core/PyObjCTest/test_weakref.py (from r2228, /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_weakref.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-core/Lib/objc/test/test_weakref.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/test_weakref.py Thu May 21 05:37:29 2009
@@ -1,6 +1,6 @@
import weakref
from PyObjCTools.TestSupport import *
-from objc.test.fnd import NSObject
+from PyObjCTest.fnd import NSObject
class OC_WeakrefTest1 (NSObject):
pass
Modified: trunk/pyobjc/pyobjc-core/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/setup.py (original)
+++ trunk/pyobjc/pyobjc-core/setup.py Thu May 21 05:37:29 2009
@@ -23,12 +23,6 @@
vstr = '.'.join(map(str, MIN_PYTHON))
raise SystemExit('PyObjC: Need at least Python ' + vstr)
-# Add our utility library to the path
-sys.path.insert(1, os.path.abspath('setup-lib'))
-
-OPTIONS = {'egg_info': {'egg_base': 'Lib'}}
-from pyobjc_commands import extra_cmdclass, extra_options
-OPTIONS.update(extra_options)
# Some PiPy stuff
LONG_DESCRIPTION="""
@@ -51,9 +45,19 @@
"""
from setuptools import setup, Extension, find_packages
+from setuptools.command import build_ext
import os
+class pyobjc_build_ext (build_ext.build_ext):
+ def run(self):
+ build_ext.build_ext.run(self)
+ extensions = self.extensions
+ self.extensions = [
+ e for e in extensions if e.name.startswith('PyObjCTest') ]
+ self.copy_extensions_to_source()
+ self.extensions = extensions
+
def frameworks(*args):
lst = []
for arg in args:
@@ -249,7 +253,7 @@
for test_source in glob.glob(os.path.join('Modules', 'objc', 'test', '*.m')):
name, ext = os.path.splitext(os.path.basename(test_source))
- ExtensionList.append(Extension('objc.test.' + name,
+ ExtensionList.append(Extension('PyObjCTest.' + name,
[test_source],
extra_compile_args=['-IModules/objc'] + CFLAGS,
extra_link_args=OBJC_LDFLAGS))
@@ -288,15 +292,15 @@
url = "http://pyobjc.sourceforge.net/",
platforms = [ 'MacOS X' ],
ext_modules = ExtensionList,
- packages = [ 'objc', 'objc.test', 'PyObjCTools' ],
+ packages = [ 'objc', 'PyObjCTools' ],
namespace_packages = ['PyObjCTools'],
- package_dir = { '': 'Lib' },
+ package_dir = { '': 'Lib', 'PyObjCTest': 'PyObjCTest' },
extra_path = "PyObjC",
- cmdclass = extra_cmdclass,
- options = OPTIONS,
+ cmdclass = {'build_ext': pyobjc_build_ext },
+ options = {'egg_info': {'egg_base': 'Lib'}},
classifiers = CLASSIFIERS,
license = 'MIT License',
download_url = 'http://pyobjc.sourceforge.net/software/index.php',
- #test_suite='objc.test',
+ test_suite='PyObjCTest.loader.makeTestSuite',
zip_safe = False,
)
------------------------------------------------------------------------------
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