[PyObjC-svn] r2282 - in trunk/pyobjc/pyobjc-framework-SyncServices: Lib/SyncServices PyObjCTest

Author: ronaldoussoren
Date: Tue Sep  1 14:03:00 2009
New Revision: 2282

Log:
Port to SnowLeopard

Modified:
   trunk/pyobjc/pyobjc-framework-SyncServices/Lib/SyncServices/PyObjC.bridgesupport
   trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncchange.py
   trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncclient.py
   trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncmanager.py
   trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncsessiondriver.py
   trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_syncserviceserrors.py

Modified: trunk/pyobjc/pyobjc-framework-SyncServices/Lib/SyncServices/PyObjC.bridgesupport
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SyncServices/Lib/SyncServices/PyObjC.bridgesupport	(original)
+++ trunk/pyobjc/pyobjc-framework-SyncServices/Lib/SyncServices/PyObjC.bridgesupport	Tue Sep  1 14:03:00 2009
@@ -24,6 +24,15 @@
   <constant name='ISyncSessionCancelledException' type='@' />
   <constant name='ISyncSessionUnavailableException' type='@' />
   <constant name='ISyncUnsupportedEntityException' type='@' />
+  <constant name='ISyncChangePropertyValueIsDefaultKey' type='@' />
+  <constant name='ISyncInvalidSchemaException' type='@' />
+  <constant name='ISyncInvalidArgumentsException' type='@' />
+  <enum name='ISyncServerDisabledReasonNone' value='1000' />
+  <enum name='ISyncServerDisabledReasonByPreference' value='1001' />
+  <enum name='ISyncServerDisabledReasonSharedNetworkHome' value='1002' />
+  <enum name='ISyncServerDisabledReasonUnresponsive' value='1003' />
+  <enum name='ISyncServerDisabledReasonUnknown' value='1004' />
+  <enum name='ISyncChangeTypeNone' value='0' />
   <enum name='ISyncChangeTypeAdd' value='1' />
   <enum name='ISyncChangeTypeDelete' value='3' />
   <enum name='ISyncChangeTypeModify' value='2' />
@@ -73,6 +82,12 @@
     <method selector='attributedStringForPropertiesWithNames:inRecord:comparisonRecords:defaultAttributes:' type='@@:@@@@' />
   </informal_protocol>
   <class name='ISyncClient'>
+    <method selector='formatsRelationships'>
+      <retval type='B' />
+    </method>
+    <method selector='setFormatsRelationships:'>
+      <arg index='0' type='B' />
+    </method>
     <method selector='canPullChangesForEntityName:'>
       <retval type='B' />
     </method>
@@ -102,6 +117,9 @@
     </method>
   </class>
   <class name='ISyncManager'>
+    <method selector='clientWithIdentifier:needsSyncing:'>
+      <arg index='1' type='B' />
+    </method>
     <method selector='isEnabled'>
       <retval type='B' />
     </method>
@@ -195,19 +213,31 @@
     </method>
     <method selector='recordsForEntityName:moreComing:error:'>
       <arg index='1' type='^B' type_modifier='o' />
-      <arg index='2' type_modifier='o' />
+      <arg index='2' type_modifier='o' type='^@'/>
+    </method>
+    <method selector='sessionDriver:willNegotiateAndReturnError:'>
+      <retval type='B' />
+      <arg index='1' type_modifier='o' type='^@'/>
+    </method>
+    <method selector='sessionDriver:didReceiveSyncAlertAndReturnError:'>
+      <retval type='B' />
+      <arg index='1' type_modifier='o' type='^@'/>
+    </method>
+    <method selector='sessionDriver:didNegotiateAndReturnError:'>
+      <retval type='B' />
+      <arg index='1' type_modifier='o' type='^@'/>
     </method>
     <method selector='sessionDriver:didPullAndReturnError:'>
       <retval type='B' />
-      <arg index='1' type_modifier='o' />
+      <arg index='1' type_modifier='o' type='^@'/>
     </method>
     <method selector='sessionDriver:didPushAndReturnError:'>
       <retval type='B' />
-      <arg index='1' type_modifier='o' />
+      <arg index='1' type_modifier='o' type='^@'/>
     </method>
     <method selector='sessionDriver:didRegisterClientAndReturnError:'>
       <retval type='B' />
-      <arg index='1' type_modifier='o' />
+      <arg index='1' type_modifier='o' type='^@'/>
     </method>
     <method selector='sessionDriver:willFinishSessionAndReturnError:'>
       <retval type='B' />

Modified: trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncchange.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncchange.py	(original)
+++ trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncchange.py	Tue Sep  1 14:03:00 2009
@@ -4,6 +4,7 @@
 
 class TestISyncChange (TestCase):
     def testConstants(self):
+        self.failUnlessEqual(ISyncChangeTypeNone, 0)
         self.failUnlessEqual(ISyncChangeTypeAdd, 1)
         self.failUnlessEqual(ISyncChangeTypeModify, 2)
         self.failUnlessEqual(ISyncChangeTypeDelete, 3)
@@ -13,6 +14,7 @@
         self.failUnlessIsInstance(ISyncChangePropertyClear, unicode)
         self.failUnlessIsInstance(ISyncChangePropertyNameKey, unicode)
         self.failUnlessIsInstance(ISyncChangePropertyValueKey, unicode)
+        self.failUnlessIsInstance(ISyncChangePropertyValueIsDefaultKey, unicode)
 
 if __name__ == "__main__":
     main()

Modified: trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncclient.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncclient.py	(original)
+++ trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncclient.py	Tue Sep  1 14:03:00 2009
@@ -28,5 +28,10 @@
         self.failUnlessResultIsBOOL(ISyncClient.shouldSynchronizeWithClientsOfType_)
         self.failUnlessArgIsBOOL(ISyncClient.setShouldSynchronize_withClientsOfType_, 0)
 
+    @min_os_level('10.6')
+    def testMethods10_6(self):
+        self.failUnlessResultIsBOOL(ISyncClient.formatsRelationships)
+        self.failUnlessArgIsBOOL(ISyncClient.setFormatsRelationships_, 0)
+
 if __name__ == "__main__":
     main()

Modified: trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncmanager.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncmanager.py	(original)
+++ trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncmanager.py	Tue Sep  1 14:03:00 2009
@@ -11,6 +11,9 @@
         self.failUnlessIsInstance(ISyncAvailabilityChangedNotification, unicode)
         self.failUnlessIsInstance(ISyncServerUnavailableException, unicode)
 
+    @min_os_level('10.6')
+    def testMethods10_6(self):
+        self.failUnlessArgIsBOOL(ISyncManager.clientWithIdentifier_needsSyncing_, 1)
 
 if __name__ == "__main__":
     main()

Modified: trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncsessiondriver.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncsessiondriver.py	(original)
+++ trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_isyncsessiondriver.py	Tue Sep  1 14:03:00 2009
@@ -3,6 +3,10 @@
 from SyncServices import *
 
 class TestISyncSessionDriverHelper (NSObject):
+    def sessionDriver_didNegotiateAndReturnError_(self, d, e): return 1
+    def sessionDriver_willNegotiateAndReturnError_(self, d, e): return 1
+    def sessionDriver_didReceiveSyncAlertAndReturnError_(self, d, e): return 1
+
     def recordsForEntityName_moreComing_error_(self, e, m, o):
         return (None, True, None)
     def applyChange_forEntityName_remappedRecordIdentifier_formattedRecord_error_(self, c, e, i, r, err):
@@ -61,7 +65,7 @@
     def testProtocols(self):
         self.failUnlessIsInstance(protocols.ISyncSessionDriverDataSourceOptionalMethods, objc.informal_protocol)
         self.failUnlessArgHasType(TestISyncSessionDriverHelper.recordsForEntityName_moreComing_error_, 1, objc._C_OUT + objc._C_PTR + objc._C_NSBOOL)
-        self.failUnlessArgHasType(TestISyncSessionDriverHelper.recordsForEntityName_moreComing_error_, 2, objc._C_OUT + objc._C_ID)
+        self.failUnlessArgHasType(TestISyncSessionDriverHelper.recordsForEntityName_moreComing_error_, 2, objc._C_OUT + objc._C_PTR + objc._C_ID)
 
         self.failUnlessResultHasType(TestISyncSessionDriverHelper.applyChange_forEntityName_remappedRecordIdentifier_formattedRecord_error_, objc._C_INT)
         self.failUnlessArgIsOut(TestISyncSessionDriverHelper.applyChange_forEntityName_remappedRecordIdentifier_formattedRecord_error_, 2)
@@ -95,6 +99,13 @@
         self.failUnlessResultIsBOOL(TestISyncSessionDriverHelper.sessionDriver_willFinishSessionAndReturnError_)
         self.failUnlessArgIsOut(TestISyncSessionDriverHelper.sessionDriver_willFinishSessionAndReturnError_, 1)
 
+        self.failUnlessResultIsBOOL(TestISyncSessionDriverHelper.sessionDriver_didNegotiateAndReturnError_)
+        self.failUnlessArgIsOut(TestISyncSessionDriverHelper.sessionDriver_didNegotiateAndReturnError_, 1)
+        self.failUnlessResultIsBOOL(TestISyncSessionDriverHelper.sessionDriver_willNegotiateAndReturnError_)
+        self.failUnlessArgIsOut(TestISyncSessionDriverHelper.sessionDriver_willNegotiateAndReturnError_, 1)
+        self.failUnlessResultIsBOOL(TestISyncSessionDriverHelper.sessionDriver_didReceiveSyncAlertAndReturnError_)
+        self.failUnlessArgIsOut(TestISyncSessionDriverHelper.sessionDriver_didReceiveSyncAlertAndReturnError_, 1)
+
 
 if __name__ == "__main__":
     main()

Modified: trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_syncserviceserrors.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_syncserviceserrors.py	(original)
+++ trunk/pyobjc/pyobjc-framework-SyncServices/PyObjCTest/test_syncserviceserrors.py	Tue Sep  1 14:03:00 2009
@@ -13,5 +13,17 @@
         self.failUnlessEqual(ISyncSessionDriverPullFailureError, 201)
         self.failUnlessEqual(ISyncSessionDriverFatalError, 300)
 
+    @min_os_level('10.6')
+    def testConstants10_6(self):
+        self.failUnlessEqual(ISyncServerDisabledReasonNone, 1000)
+        self.failUnlessEqual(ISyncServerDisabledReasonByPreference, 1001)
+        self.failUnlessEqual(ISyncServerDisabledReasonSharedNetworkHome, 1002)
+        self.failUnlessEqual(ISyncServerDisabledReasonUnresponsive, 1003)
+        self.failUnlessEqual(ISyncServerDisabledReasonUnknown, 1004)
+
+        self.failUnlessIsInstance(ISyncInvalidSchemaException, unicode)
+        self.failUnlessIsInstance(ISyncInvalidArgumentsException, unicode)
+
+
 if __name__ == "__main__":
     main()

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july