[PyObjC-svn] r2123 - in trunk/pyobjc/pyobjc-framework-Cocoa: Lib/Foundation PyObjCTest
[email protected] Fri, 27 Mar 2009 13:27:52 -0500
Newsgroups
gmane.comp.python.pyobjc.cvs
Message-ID
<[email protected] >
Author: ronaldoussoren
Date: Fri Mar 27 13:27:52 2009
New Revision: 2123
Log:
Improve testcases for AppKit
Added:
trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsslider.py (contents, props changed)
Modified:
trunk/pyobjc/pyobjc-framework-Cocoa/Lib/Foundation/PyObjC.bridgesupport
trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsapplication.py
trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsatstypesetter.py
trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsattributedstring_appkit.py
trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsdata.py
trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsexception.py
trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsxmlnode.py
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Lib/Foundation/PyObjC.bridgesupport
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Lib/Foundation/PyObjC.bridgesupport (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Lib/Foundation/PyObjC.bridgesupport Fri Mar 27 13:27:52 2009
@@ -13161,9 +13161,12 @@
</method>
<method selector='objectsForXQuery:error:'>
<retval type='@' />
- <arg index='0' type='@' />
<arg index='1' type_modifier='o' />
</method>
+ <method selector='objectsForXQuery:constants:error:'>
+ <retval type='@' />
+ <arg index='2' type_modifier='o' />
+ </method>
<method selector='parent'>
<retval type='@' />
</method>
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsapplication.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsapplication.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsapplication.py Fri Mar 27 13:27:52 2009
@@ -4,7 +4,6 @@
class TestNSApplicationHelper (NSObject):
def copyWithZone_(self, zone):
- print "copyWithZone:"
return self
def writeSelectionToPasteboard_types_(self, pb, tp):
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsatstypesetter.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsatstypesetter.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsatstypesetter.py Fri Mar 27 13:27:52 2009
@@ -2,6 +2,7 @@
from PyObjCTools.TestSupport import *
from AppKit import *
+
class TestNSATSTypesetterHelper (NSATSTypesetter):
def willSetLineFragmentRect_forGlyphRange_usedRect_baselineOffset_(
self, lineRect, glyphRange, usedRect, offset):
@@ -58,9 +59,6 @@
class TestNSATSTypesetter (TestCase):
- def testIncomplete(self):
- self.fail("Add header tests for <AppKit/NSATSTypesetter.h>")
-
def testByRefArguments(self):
self.failUnlessArgIsOut(NSATSTypesetter.lineFragmentRectForProposedRect_remainingRect_, 1)
self.failUnlessArgIsInOut(NSATSTypesetter.layoutParagraphAtPoint_, 0)
@@ -109,8 +107,6 @@
self.failUnlessStartswith(m['arguments'][2]['type'], '{')
self.failUnlessStartswith(m['arguments'][3]['type'], 'o^{')
- self.fail("redo")
-
m = o.getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits_.__metadata__()
self.failUnlessEqual(m['retval']['type'], objc._C_NSUInteger)
self.failUnlessEqual(m['arguments'][2]['type'], NSRange.__typestr__)
@@ -128,8 +124,23 @@
m = o.setBidiLevels_forGlyphRange_.__metadata__()
-
-
+ self.failUnlessResultIsBOOL(NSATSTypesetter.usesFontLeading)
+ self.failUnlessArgIsBOOL(NSATSTypesetter.setUsesFontLeading_, 0)
+ self.failUnlessResultIsBOOL(NSATSTypesetter.bidiProcessingEnabled)
+ self.failUnlessArgIsBOOL(NSATSTypesetter.setBidiProcessingEnabled_, 0)
+ self.failUnlessArgIsBOOL(NSATSTypesetter.setHardInvalidation_forGlyphRange_, 0)
+ self.failUnlessArgIsBOOL(NSATSTypesetter.setNotShownAttribute_forGlyphRange_, 0)
+ self.failUnlessArgIsBOOL(NSATSTypesetter.setDrawsOutsideLineFragment_forGlyphRange_, 0)
+
+
+ self.failUnlessArgIsIn(NSATSTypesetter.setLocation_withAdvancements_forStartOfGlyphRange_, 1)
+ self.failUnlessArgSizeInArg(NSATSTypesetter.setLocation_withAdvancements_forStartOfGlyphRange_, 1, 2)
+ self.failUnlessArgSizeInArg(NSATSTypesetter.setBidiLevels_forGlyphRange_, 0, 1)
+ self.failUnlessArgSizeInArg(NSATSTypesetter.setBidiLevels_forGlyphRange_, 0, 1)
+
+ def testSubclassProtocols(self):
+ self.failUnlessResultIsBOOL(TestNSATSTypesetterHelper.shouldBreakLineByWordBeforeCharacterAtIndex_)
+ self.failUnlessResultIsBOOL(TestNSATSTypesetterHelper.shouldBreakLineByHyphenatingBeforeCharacterAtIndex_)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsattributedstring_appkit.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsattributedstring_appkit.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsattributedstring_appkit.py Fri Mar 27 13:27:52 2009
@@ -98,26 +98,35 @@
self.failUnlessIsInstance(NSUnderlineStrikethroughMask, (int, long))
def testMethods(self):
- self.fail("- (id)initWithURL:(NSURL *)url options:(NSDictionary *)options documentAttributes:(NSDictionary **)dict error:(NSError **)error;")
- self.fail("- (id)initWithData:(NSData *)data options:(NSDictionary *)options documentAttributes:(NSDictionary **)dict error:(NSError **)error;")
- self.fail("- (id)initWithPath:(NSString *)path documentAttributes:(NSDictionary **)dict;")
- self.fail("- (id)initWithURL:(NSURL *)url documentAttributes:(NSDictionary **)dict;")
- self.fail("- (id)initWithRTF:(NSData *)data documentAttributes:(NSDictionary **)dict;")
- self.fail("- (id)initWithRTFD:(NSData *)data documentAttributes:(NSDictionary **)dict;")
- self.fail("- (id)initWithHTML:(NSData *)data documentAttributes:(NSDictionary **)dict;")
- self.fail("- (id)initWithHTML:(NSData *)data baseURL:(NSURL *)base documentAttributes:(NSDictionary **)dict;")
- self.fail("- (id)initWithDocFormat:(NSData *)data documentAttributes:(NSDictionary **)dict;")
- self.fail("- (id)initWithHTML:(NSData *)data options:(NSDictionary *)options documentAttributes:(NSDictionary **)dict;")
- self.fail("- (id)initWithRTFDFileWrapper:(NSFileWrapper *)wrapper documentAttributes:(NSDictionary **)dict;")
+ self.failUnlessArgIsOut(NSAttributedString.initWithURL_options_documentAttributes_error_, 2)
+ self.failUnlessArgIsOut(NSAttributedString.initWithURL_options_documentAttributes_error_, 3)
+ self.failUnlessArgIsOut(NSAttributedString.initWithData_options_documentAttributes_error_, 2)
+ self.failUnlessArgIsOut(NSAttributedString.initWithData_options_documentAttributes_error_, 3)
+ self.failUnlessArgIsOut(NSAttributedString.initWithPath_documentAttributes_, 1)
+ self.failUnlessArgIsOut(NSAttributedString.initWithURL_documentAttributes_, 1)
+ self.failUnlessArgIsOut(NSAttributedString.initWithRTF_documentAttributes_, 1)
+ self.failUnlessArgIsOut(NSAttributedString.initWithRTFD_documentAttributes_, 1)
+ self.failUnlessArgIsOut(NSAttributedString.initWithHTML_documentAttributes_, 1)
+ self.failUnlessArgIsOut(NSAttributedString.initWithHTML_baseURL_documentAttributes_, 2)
+ self.failUnlessArgIsOut(NSAttributedString.initWithDocFormat_documentAttributes_, 1)
+ self.failUnlessArgIsOut(NSAttributedString.initWithHTML_options_documentAttributes_, 2)
+ self.failUnlessArgIsOut(NSAttributedString.initWithRTFDFileWrapper_documentAttributes_, 1)
+
+
+ self.failUnlessResultIsBOOL(NSMutableAttributedString.readFromURL_options_documentAttributes_error_)
+ self.failUnlessArgIsOut(NSMutableAttributedString.readFromURL_options_documentAttributes_error_, 2)
+ self.failUnlessArgIsOut(NSMutableAttributedString.readFromURL_options_documentAttributes_error_, 3)
+
+ self.failUnlessResultIsBOOL(NSMutableAttributedString.readFromData_options_documentAttributes_error_)
+ self.failUnlessArgIsOut(NSMutableAttributedString.readFromData_options_documentAttributes_error_, 2)
+ self.failUnlessArgIsOut(NSMutableAttributedString.readFromData_options_documentAttributes_error_, 3)
+
+ self.failUnlessResultIsBOOL(NSMutableAttributedString.readFromURL_options_documentAttributes_)
+ self.failUnlessArgIsOut(NSMutableAttributedString.readFromURL_options_documentAttributes_, 2)
+ self.failUnlessResultIsBOOL(NSMutableAttributedString.readFromData_options_documentAttributes_)
+ self.failUnlessArgIsOut(NSMutableAttributedString.readFromData_options_documentAttributes_, 2)
-
-
- self.fail("- (BOOL)readFromURL:(NSURL *)url options:(NSDictionary *)opts documentAttributes:(NSDictionary **)dict error:(NSError **)error;")
- self.fail("- (BOOL)readFromData:(NSData *)data options:(NSDictionary *)opts documentAttributes:(NSDictionary **)dict error:(NSError **)error;")
- self.fail("- (BOOL)readFromURL:(NSURL *)url options:(NSDictionary *)options documentAttributes:(NSDictionary **)dict;")
- self.fail("- (BOOL)readFromData:(NSData *)data options:(NSDictionary *)options documentAttributes:(NSDictionary **)dict;")
-
- self.fail("- (NSURL *)URLAtIndex:(NSUInteger)location effectiveRange:(NSRangePointer)effectiveRange;")
+ self.failUnlessArgHasType(NSAttributedString.URLAtIndex_effectiveRange_, 1, 'o^' + NSRange.__typestr__)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsdata.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsdata.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsdata.py Fri Mar 27 13:27:52 2009
@@ -111,19 +111,19 @@
self.failUnless(isinstance(b, NSData))
self.failUnless(err is None)
- b = NSData.alloc().initWithContentsOfFile_options_error_(
+ b2, err = NSData.alloc().initWithContentsOfFile_options_error_(
"/etc/hosts.nosuchfile", 0, None)
self.failUnless(b2 is None)
self.failUnless(isinstance(err, NSError))
url = NSURL.fileURLWithPath_isDirectory_('/etc/hosts', False)
- b = NSData.alloc().initWithContentsOfURL_options_error_(
+ b, err = NSData.alloc().initWithContentsOfURL_options_error_(
url, 0, None)
self.failUnless(isinstance(b, NSData))
self.failUnless(err is None)
url = NSURL.fileURLWithPath_isDirectory_('/etc/hosts.nosuchfile', False)
- b = NSData.alloc().initWithContentsOfURL_options_error_(
+ b2, err = NSData.alloc().initWithContentsOfURL_options_error_(
url, 0, None)
self.failUnless(b2 is None)
self.failUnless(isinstance(err, NSError))
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsexception.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsexception.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsexception.py Fri Mar 27 13:27:52 2009
@@ -66,7 +66,7 @@
self.failUnless(m['variadic'])
self.failUnless(m['arguments'][6]['printf_format'])
- m = o.handleFailureInFunction.__metadata__()
+ m = o.handleFailureInFunction_.__metadata__()
self.failUnless(m['variadic'])
self.failUnless(m['arguments'][5]['printf_format'])
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsxmlnode.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsxmlnode.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nsxmlnode.py Fri Mar 27 13:27:52 2009
@@ -23,13 +23,7 @@
n.nodesForXPath_error_.__metadata__()['arguments'][3]['type'],
'o^@')
- print n.objectsForXQuery_constants_error_.__metadata__()
- self.assertEquals(
- n.objectsForXQuery_constants_error_.__metadata__()['arguments'][4]['type'],
- 'o^@')
- self.assertEquals(
- n.objectsForXQuery_error_.__metadata__()['arguments'][3]['type'],
- 'o^@')
+ self.failUnlessArgIsOut(NSXMLNode.objectsForXQuery_constants_error_, 2)
if __name__ == "__main__":
------------------------------------------------------------------------------