mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 07:10:46 +00:00
Fixup testcase to actually work on gcc systems etc
This commit is contained in:
parent
d312fbe168
commit
71b82ee7a2
1 changed files with 33 additions and 17 deletions
|
@ -7,30 +7,42 @@
|
|||
|
||||
int main()
|
||||
{
|
||||
NSString* mask = @"NSKeyEquivModMask";
|
||||
NSMenuItem* item = [[NSMenuItem alloc] init];
|
||||
START_SET("NSMenuItem key equivalent mask")
|
||||
|
||||
NSString *mask = @"NSKeyEquivModMask";
|
||||
NSMenuItem *item = [[NSMenuItem alloc] init];
|
||||
NSMutableData *data = [NSMutableData data];
|
||||
NSNumber *encodedKeyMask;
|
||||
NSError *error = nil;
|
||||
NSDictionary *dict = nil;
|
||||
NSArray *topLevelObjects;
|
||||
NSKeyedArchiver *archiver;
|
||||
NSDictionary *archive;
|
||||
NSEnumerator *enumerator;
|
||||
id element;
|
||||
|
||||
item.keyEquivalentModifierMask = NSShiftKeyMask;
|
||||
|
||||
NSMutableData *data = [NSMutableData data];
|
||||
NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
|
||||
archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData: data];
|
||||
|
||||
[archiver encodeRootObject:item];
|
||||
[archiver encodeRootObject: item];
|
||||
[archiver finishEncoding];
|
||||
|
||||
NSError* error;
|
||||
NSDictionary* archive = [NSPropertyListSerialization propertyListWithData:data options:NSPropertyListImmutable format:nil error:&error];
|
||||
archive = [NSPropertyListSerialization propertyListWithData: data
|
||||
options: NSPropertyListImmutable
|
||||
format: nil
|
||||
error: &error];
|
||||
|
||||
NSArray* topLevelObjects = [archive objectForKey:@"$objects"];
|
||||
topLevelObjects = [archive objectForKey: @"$objects"];
|
||||
enumerator = [topLevelObjects objectEnumerator];
|
||||
|
||||
NSDictionary* dict;
|
||||
|
||||
for (id element in topLevelObjects)
|
||||
while ((element = [enumerator nextObject]) != nil)
|
||||
{
|
||||
if ([element isKindOfClass:[NSDictionary class]])
|
||||
if ([element isKindOfClass: [NSDictionary class]])
|
||||
{
|
||||
dict = (NSDictionary*)element;
|
||||
|
||||
if ([[dict allKeys] containsObject:mask])
|
||||
if ([[dict allKeys] containsObject: mask])
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
@ -43,7 +55,11 @@ int main()
|
|||
|
||||
PASS(dict != nil, "Found a dict with a NSKeyEquivModMask entry");
|
||||
|
||||
NSNumber* encodedKeyMask = [dict valueForKey:mask];
|
||||
PASS(encodedKeyMask != nil, "Retrieved the NSKeyEquivModMask value");
|
||||
PASS([encodedKeyMask intValue] == NSShiftKeyMask, "Encoded key mask 0x%x matches expected key mask 0x%x", [encodedKeyMask intValue], NSShiftKeyMask);
|
||||
}
|
||||
encodedKeyMask = [dict valueForKey: mask];
|
||||
PASS(encodedKeyMask != nil, "Retrieved the NSKeyEquivModMask value")
|
||||
PASS([encodedKeyMask intValue] == NSShiftKeyMask,
|
||||
"Encoded key mask 0x%x matches expected key mask 0x%x",
|
||||
[encodedKeyMask intValue], NSShiftKeyMask)
|
||||
|
||||
END_SET("NSMenuItem key equivalent mask")
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue