Skip to content

Commit

Permalink
* Tests/gui/NSBezierPath/windingCountAtPoint.m
Browse files Browse the repository at this point in the history
	* Tests/gui/NSCell/basic.m
	* Tests/gui/NSEvent/delta.m
	* Tests/gui/NSPasteboard/lazy_copy.m
	* Tests/gui/NSSavePanel/setDelegate_reload.m
	* Tests/gui/NSSliderCell/minMax.m
	* Tests/gui/NSView/NSView_visibleRect.m
	Remove comipler warnings in test code.
	* Tests/gui/TextSystem/deallocation.m
	Move auto release pool inside of the test set to get the test
	working again.
  • Loading branch information
fredkiefer committed Dec 28, 2017
1 parent 441af14 commit d6a1c11
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 15 deletions.
13 changes: 13 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
2017-12-28 Fred Kiefer <[email protected]>

* Tests/gui/NSBezierPath/windingCountAtPoint.m
* Tests/gui/NSCell/basic.m
* Tests/gui/NSEvent/delta.m
* Tests/gui/NSPasteboard/lazy_copy.m
* Tests/gui/NSSavePanel/setDelegate_reload.m
* Tests/gui/NSSliderCell/minMax.m
Remove comipler warnings in test code.
* Tests/gui/TextSystem/deallocation.m
Move auto release pool inside of the test set to get the test
working again.

2017-12-28 Fred Kiefer <[email protected]>

* Printing/GSCUPS/GSCUPSPrinter.m,
Expand Down
2 changes: 0 additions & 2 deletions Tests/gui/NSBezierPath/windingCountAtPoint.m
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ int main(int argc, char **argv)
{
CREATE_AUTORELEASE_POOL(arp);
NSBezierPath *p=[[NSBezierPath alloc] init];
NSRect r;
float x;
int i;
const char *str;
int X=-1000;
Expand Down
13 changes: 7 additions & 6 deletions Tests/gui/NSCell/basic.m
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,21 @@ - (BOOL) isEqual: (id)anObject
return YES;
if (![anObject isKindOfClass: [NSCell class]])
return NO;
if (![[anObject stringValue] isEqual: [self stringValue]])
if (![[(NSCell *)anObject stringValue] isEqual: [self stringValue]])
return NO;
if (![[anObject title] isEqual: [self title]])
if (![[(NSCell *)anObject title] isEqual: [self title]])
return NO;
if (!([anObject image] == [self image]) && ![[anObject image] isEqual: [self image]])
if (!([(NSCell *)anObject image] == [self image])
&& ![[(NSCell *)anObject image] isEqual: [self image]])
{
NSLog(@"image differ %@ %@", [self image], [anObject image]);
return NO;
}
if ([anObject type] != [self type])
if ([(NSCell *)anObject type] != [self type])
return NO;
if ([anObject tag] != [self tag])
if ([(NSCell *)anObject tag] != [self tag])
return NO;
return YES;
}

@end
@end
1 change: 1 addition & 0 deletions Tests/gui/NSEvent/delta.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "Testing.h"

#include <Foundation/NSAutoreleasePool.h>
#include <Foundation/NSDictionary.h>
#include <Foundation/NSString.h>

#include <AppKit/NSApplication.h>
Expand Down
3 changes: 1 addition & 2 deletions Tests/gui/NSPasteboard/lazy_copy.m
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ int main(int argc, char **argv)
CREATE_AUTORELEASE_POOL(arp);

NSPasteboard *pb=[NSPasteboard pasteboardWithName: @"lazy copy test"];
int i;
NSString *s;

i=[pb declareTypes: [NSArray arrayWithObject: NSStringPboardType]
[pb declareTypes: [NSArray arrayWithObject: NSStringPboardType]
owner: [Foo self]];
DESTROY(arp);

Expand Down
6 changes: 4 additions & 2 deletions Tests/gui/NSSavePanel/setDelegate_reload.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

#include <AppKit/AppKit.h>

@interface NSSavePanel (TestDelegate)
- (NSMatrix *)lastColumnMatrix;
@end

@implementation NSSavePanel (TestDelegate)

- (NSMatrix *)lastColumnMatrix
Expand All @@ -23,8 +27,6 @@ @interface Delegate : NSObject

@implementation Delegate

static BOOL pressed;
static NSSavePanel *sp;

+ (BOOL) panel: (NSSavePanel *)p
shouldShowFilename: (NSString *)fname
Expand Down
1 change: 0 additions & 1 deletion Tests/gui/NSSliderCell/minMax.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ int main()
{
CREATE_AUTORELEASE_POOL(arp);
NSSliderCell *cell;
NSNumber *num;

START_SET("NSSliderCell GNUstep minMax")

Expand Down
4 changes: 2 additions & 2 deletions Tests/gui/TextSystem/deallocation.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
NSTextStorage *ts;
NSTextContainer *tc;
NSTextView *tv;
CREATE_AUTORELEASE_POOL(arp);

START_SET("TextSystem GNUstep deallocation")
CREATE_AUTORELEASE_POOL(arp);

NS_DURING
{
Expand Down Expand Up @@ -81,8 +81,8 @@
pass([tv layoutManager] == nil, "NSTextView -layoutManager returns nil");
pass([tv textStorage] == nil, "NSTextView -textStorage returns nil");

DESTROY(arp);
END_SET("TextSystem GNUstep deallocation")

DESTROY(arp);
return 0;
}

0 comments on commit d6a1c11

Please sign in to comment.