Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions REKitLogicTests/REObserverLogicTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ - (void)test_observationAfterClassChangeCausedByDynamicBlock
// Add read method
NSString *key;
key = @"key";
[obj respondsToSelector:@selector(read) withKey:key usingBlock:^(id receiver) {
[obj respondsToSelector:NSSelectorFromString(@"read") withKey:key usingBlock:^(id receiver) {
return @"Dynamic";
}];

Expand Down Expand Up @@ -574,7 +574,7 @@ - (void)test_observationAfterClassChangeCausedByDynamicBlock
STAssertEqualObjects([obj observedInfos], observedInfos, @"");

// Remove block
[obj removeBlockForSelector:@selector(read) withKey:key];
[obj removeBlockForSelector:NSSelectorFromString(@"read") withKey:key];
STAssertEqualObjects([observer observingInfos], observingInfos, @"");
STAssertEqualObjects([obj observedInfos], observedInfos, @"");

Expand Down
14 changes: 7 additions & 7 deletions REKitLogicTests/REResponderLogicTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -726,19 +726,19 @@ - (void)test_allowArguments
obj = [[[NSObject alloc] init] autorelease];

// Add block with arguments
[obj respondsToSelector:@selector(logWithSuffix:) withKey:nil usingBlock:^NSString*(id receiver, NSString *suffix) {
[obj respondsToSelector:NSSelectorFromString(@"logWithSuffix:") withKey:nil usingBlock:^NSString*(id receiver, NSString *suffix) {
return [NSString stringWithFormat:@"block1-%@", suffix];
}];

// Call logWithSuffix: method
log = [obj performSelector:@selector(logWithSuffix:) withObject:@"suffix"];
log = [obj performSelector:NSSelectorFromString(@"logWithSuffix:") withObject:@"suffix"];
STAssertEqualObjects(log, @"block1-suffix", @"");
}

- (void)test_allowStructures
{
id obj;
SEL sel = @selector(makeRectWithOrigin:size:);
SEL sel = NSSelectorFromString(@"makeRectWithOrigin:size:");
CGRect rect;

// Make obj
Expand Down Expand Up @@ -774,14 +774,14 @@ - (void)test_methodForSelector_executeReturnedIMP
obj = [[[NSObject alloc] init] autorelease];

// Add doSomething method
[obj respondsToSelector:@selector(doSomething) withKey:nil usingBlock:^(id receiver) {
[obj respondsToSelector:NSSelectorFromString(@"doSomething") withKey:nil usingBlock:^(id receiver) {
called = YES;
}];

// Call imp
REVoidIMP imp;
imp = (REVoidIMP)[obj methodForSelector:@selector(doSomething)];
imp(obj, @selector(doSomething));
imp = (REVoidIMP)[obj methodForSelector:NSSelectorFromString(@"doSomething")];
imp(obj, NSSelectorFromString(@"doSomething"));
STAssertTrue(called, @"");
}

Expand Down Expand Up @@ -937,7 +937,7 @@ - (void)test_performDummyBlock
obj = [RETestObject testObject];

// Add block1
[obj respondsToSelector:(sel = @selector(readThis:)) withKey:@"block1" usingBlock:^(id receiver, NSString *string) {
[obj respondsToSelector:(sel = NSSelectorFromString(@"readThis:")) withKey:@"block1" usingBlock:^(id receiver, NSString *string) {
return string;
}];
string = [obj performSelector:sel withObject:@"Read"];
Expand Down