status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-24 23:28:12 +00:00
Code Issues Projects Releases Wiki Activity

Return NSString instead of SEL

Browse Source 
Reviewed By: javache

Differential Revision: D6211964

fbshipit-source-id: 4a55d56d0cc4be10460087810f62134676983203
This commit is contained in:
Aditya Kumar 2017-11-03 16:28:47 -07:00 committed by Facebook Github Bot
parent 2a24b7b967
commit 7c95db11d7
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m
View File

@ -19,14 +19,14 @@
@implementation RCTMethodArgumentTests @implementation RCTMethodArgumentTests
extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTypes); extern NSString *RCTParseMethodSignature(const char *methodSignature, NSArray **argTypes);
- (void)testOneArgument - (void)testOneArgument
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(NSInteger)foo"; const char *methodSignature = "foo:(NSInteger)foo";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:"); XCTAssertEqualObjects(selector, @"foo:");
XCTAssertEqual(arguments.count, (NSUInteger)1); XCTAssertEqual(arguments.count, (NSUInteger)1);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSInteger"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSInteger");
} }
@ -35,8 +35,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(NSInteger)foo bar:(BOOL)bar"; const char *methodSignature = "foo:(NSInteger)foo bar:(BOOL)bar";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:bar:"); XCTAssertEqualObjects(selector, @"foo:bar:");
XCTAssertEqual(arguments.count, (NSUInteger)2); XCTAssertEqual(arguments.count, (NSUInteger)2);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSInteger"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSInteger");
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL");
@ -46,8 +46,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo : (NSInteger)foo bar : (BOOL) bar"; const char *methodSignature = "foo : (NSInteger)foo bar : (BOOL) bar";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:bar:"); XCTAssertEqualObjects(selector, @"foo:bar:");
XCTAssertEqual(arguments.count, (NSUInteger)2); XCTAssertEqual(arguments.count, (NSUInteger)2);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSInteger"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSInteger");
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL");
@ -57,8 +57,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo : (NSInteger)foo\nbar : (BOOL) bar"; const char *methodSignature = "foo : (NSInteger)foo\nbar : (BOOL) bar";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:bar:"); XCTAssertEqualObjects(selector, @"foo:bar:");
XCTAssertEqual(arguments.count, (NSUInteger)2); XCTAssertEqual(arguments.count, (NSUInteger)2);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSInteger"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSInteger");
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL");
@ -68,8 +68,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(NSInteger)foo:(BOOL)bar"; const char *methodSignature = "foo:(NSInteger)foo:(BOOL)bar";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo::"); XCTAssertEqualObjects(selector, @"foo::");
XCTAssertEqual(arguments.count, (NSUInteger)2); XCTAssertEqual(arguments.count, (NSUInteger)2);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSInteger"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSInteger");
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL");
@ -79,8 +79,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:foo:bar:bar"; const char *methodSignature = "foo:foo:bar:bar";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:::"); XCTAssertEqualObjects(selector, @"foo:::");
XCTAssertEqual(arguments.count, (NSUInteger)3); XCTAssertEqual(arguments.count, (NSUInteger)3);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"id"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"id");
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"id"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"id");
@ -91,8 +91,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(foo::type &)foo bar:(bar::type &)bar"; const char *methodSignature = "foo:(foo::type &)foo bar:(bar::type &)bar";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:bar:"); XCTAssertEqualObjects(selector, @"foo:bar:");
XCTAssertEqual(arguments.count, (NSUInteger)2); XCTAssertEqual(arguments.count, (NSUInteger)2);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"foo::type"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"foo::type");
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"bar::type"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"bar::type");
@ -102,8 +102,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(__attribute__((unused)) NSString *)foo bar:(__unused BOOL)bar"; const char *methodSignature = "foo:(__attribute__((unused)) NSString *)foo bar:(__unused BOOL)bar";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:bar:"); XCTAssertEqualObjects(selector, @"foo:bar:");
XCTAssertEqual(arguments.count, (NSUInteger)2); XCTAssertEqual(arguments.count, (NSUInteger)2);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSString"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSString");
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL");
@ -113,8 +113,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(nullable NSString *)foo bar:(nonnull NSNumber *)bar baz:(id)baz"; const char *methodSignature = "foo:(nullable NSString *)foo bar:(nonnull NSNumber *)bar baz:(id)baz";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:bar:baz:"); XCTAssertEqualObjects(selector, @"foo:bar:baz:");
XCTAssertEqual(arguments.count, (NSUInteger)3); XCTAssertEqual(arguments.count, (NSUInteger)3);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSString"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSString");
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"NSNumber"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"NSNumber");
@ -128,8 +128,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(NSString *)foo bar:(BOOL)bar;"; const char *methodSignature = "foo:(NSString *)foo bar:(BOOL)bar;";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:bar:"); XCTAssertEqualObjects(selector, @"foo:bar:");
XCTAssertEqual(arguments.count, (NSUInteger)2); XCTAssertEqual(arguments.count, (NSUInteger)2);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSString"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSString");
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"BOOL");
@ -139,8 +139,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(__unused NSString *)foo bar:(NSNumber *)bar"; const char *methodSignature = "foo:(__unused NSString *)foo bar:(NSNumber *)bar";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:bar:"); XCTAssertEqualObjects(selector, @"foo:bar:");
XCTAssertEqual(arguments.count, (NSUInteger)2); XCTAssertEqual(arguments.count, (NSUInteger)2);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSString"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSString");
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"NSNumber"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"NSNumber");
@ -152,8 +152,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(NSArray<NSString *> *)foo;"; const char *methodSignature = "foo:(NSArray<NSString *> *)foo;";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:"); XCTAssertEqualObjects(selector, @"foo:");
XCTAssertEqual(arguments.count, (NSUInteger)1); XCTAssertEqual(arguments.count, (NSUInteger)1);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSStringArray"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSStringArray");
} }
@ -162,8 +162,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(NSArray<NSArray<NSString *> *> *)foo;"; const char *methodSignature = "foo:(NSArray<NSArray<NSString *> *> *)foo;";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:"); XCTAssertEqualObjects(selector, @"foo:");
XCTAssertEqual(arguments.count, (NSUInteger)1); XCTAssertEqual(arguments.count, (NSUInteger)1);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSStringArrayArray"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSStringArrayArray");
} }
@ -172,8 +172,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(NSSet<NSNumber *> *)foo;"; const char *methodSignature = "foo:(NSSet<NSNumber *> *)foo;";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:"); XCTAssertEqualObjects(selector, @"foo:");
XCTAssertEqual(arguments.count, (NSUInteger)1); XCTAssertEqual(arguments.count, (NSUInteger)1);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSNumberSet"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSNumberSet");
} }
@ -182,8 +182,8 @@ extern SEL RCTParseMethodSignature(const char *methodSignature, NSArray **argTyp
{ {
NSArray *arguments; NSArray *arguments;
const char *methodSignature = "foo:(NSDictionary<NSString *, NSNumber *> *)foo;"; const char *methodSignature = "foo:(NSDictionary<NSString *, NSNumber *> *)foo;";
SEL selector = RCTParseMethodSignature(methodSignature, &arguments); NSString *selector = RCTParseMethodSignature(methodSignature, &arguments);
XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:"); XCTAssertEqualObjects(selector, @"foo:");
XCTAssertEqual(arguments.count, (NSUInteger)1); XCTAssertEqual(arguments.count, (NSUInteger)1);
XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSNumberDictionary"); XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"NSNumberDictionary");
} }

8
React/Base/RCTModuleMethod.mm
View File

@ -129,8 +129,8 @@ static BOOL checkCallbackMultipleInvocations(BOOL *didInvoke) {
} }
#endif #endif
SEL RCTParseMethodSignature(const char *, NSArray<RCTMethodArgument *> **); extern NSString *RCTParseMethodSignature(const char *input, NSArray<RCTMethodArgument *> **arguments);
SEL RCTParseMethodSignature(const char *input, NSArray<RCTMethodArgument *> **arguments) NSString *RCTParseMethodSignature(const char *input, NSArray<RCTMethodArgument *> **arguments)
{ {
RCTSkipWhitespace(&input); RCTSkipWhitespace(&input);
@ -175,7 +175,7 @@ SEL RCTParseMethodSignature(const char *input, NSArray<RCTMethodArgument *> **ar
} }
*arguments = [args copy]; *arguments = [args copy];
return NSSelectorFromString(selector); return selector;
} }
RCT_EXTERN_C_END RCT_EXTERN_C_END
@ -193,7 +193,7 @@ RCT_EXTERN_C_END
- (void)processMethodSignature - (void)processMethodSignature
{ {
NSArray<RCTMethodArgument *> *arguments; NSArray<RCTMethodArgument *> *arguments;
_selector = RCTParseMethodSignature(_methodInfo->objcName, &arguments); _selector = NSSelectorFromString(RCTParseMethodSignature(_methodInfo->objcName, &arguments));
RCTAssert(_selector, @"%s is not a valid selector", _methodInfo->objcName); RCTAssert(_selector, @"%s is not a valid selector", _methodInfo->objcName);
// Create method invocation // Create method invocation