From 4fde511f5c4a8bb7d11a1ccfe6a6b06ff36fa208 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Wed, 23 Dec 2015 14:41:39 -0800
Subject: [PATCH] Remove warnings in RCTBridgeTests

Reviewed By: majak

Differential Revision: D2771228

fb-gh-sync-id: dd935094ceeff196c272565bf7efea5112059a1a
---
 .../UIExplorerUnitTests/RCTBridgeTests.m      | 19 +++++++++++--------
 React/Base/RCTBatchedBridge.m                 |  5 +----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m
index 1a0afe0bf..fe2f48c5c 100644
--- a/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m
+++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m
@@ -51,16 +51,16 @@ RCT_EXPORT_MODULE()
   onComplete(nil, nil);
 }
 
-- (void)callFunctionOnModule:(NSString *)module
-                      method:(NSString *)method
-                   arguments:(NSArray *)args
+- (void)callFunctionOnModule:(__unused NSString *)module
+                      method:(__unused NSString *)method
+                   arguments:(__unused NSArray *)args
                     callback:(RCTJavaScriptCallback)onComplete
 {
   onComplete(nil, nil);
 }
 
-- (void)invokeCallbackID:(NSNumber *)cbID
-               arguments:(NSArray *)args
+- (void)invokeCallbackID:(__unused NSNumber *)cbID
+               arguments:(__unused NSArray *)args
                 callback:(RCTJavaScriptCallback)onComplete
 {
   onComplete(nil, nil);
@@ -121,7 +121,9 @@ RCT_EXPORT_MODULE(TestModule)
 - (void)tearDown
 {
   [super tearDown];
+
   [_bridge invalidate];
+  _testMethodCalled = NO;
 }
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
@@ -169,21 +171,22 @@ _Pragma("clang diagnostic pop")
   RUN_RUNLOOP_WHILE(!(injectedStuff = executor.injectedStuff[@"__fbBatchedBridgeConfig"]));
 
   __block NSNumber *testModuleID = nil;
-  __block NSDictionary<NSString *, id> *testConstants = nil;
   __block NSNumber *testMethodID = nil;
 
   NSArray *remoteModuleConfig = RCTJSONParse(injectedStuff, NULL)[@"remoteModuleConfig"];
   [remoteModuleConfig enumerateObjectsUsingBlock:^(id moduleConfig, NSUInteger i, __unused BOOL *stop) {
     if ([moduleConfig isKindOfClass:[NSArray class]] && [moduleConfig[0] isEqualToString:@"TestModule"]) {
       testModuleID = @(i);
-      testConstants = moduleConfig[1];
       testMethodID = @([moduleConfig[2] indexOfObject:@"testMethod"]);
       *stop = YES;
     }
   }];
 
+  XCTAssertNotNil(testModuleID);
+  XCTAssertNotNil(testMethodID);
+
   NSArray *args = @[@1234, @5678, @"stringy", @{@"a": @1}, @42];
-  NSArray *buffer = @[@[testModuleID], @[testMethodID], @[args], @[], @1234567];
+  NSArray *buffer = @[@[testModuleID], @[testMethodID], @[args]];
 
   [_bridge.batchedBridge handleBuffer:buffer];
 
diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m
index 8e00e93f7..4946cd012 100644
--- a/React/Base/RCTBatchedBridge.m
+++ b/React/Base/RCTBatchedBridge.m
@@ -818,10 +818,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithBundleURL:(__unused NSURL *)bundleUR
     dispatch_block_t block = ^{
       RCTProfileEndFlowEvent();
 
-#if RCT_DEV
-      NSString *_threadName = RCTCurrentThreadName();
-      RCT_PROFILE_BEGIN_EVENT(0, _threadName, nil);
-#endif
+      RCT_PROFILE_BEGIN_EVENT(0, RCTCurrentThreadName(), nil);
 
       NSOrderedSet *calls = [buckets objectForKey:queue];
       @autoreleasepool {