From 9b1f6c9e3062e7425dfc39b03f7b7f3d269c0978 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Fri, 4 Sep 2015 03:21:57 -0700 Subject: [PATCH] Make RCTTestRunner wait for JS context to deallocate --- Libraries/RCTTest/RCTTestRunner.m | 102 +++++++++++++++++------------- React/Base/RCTRootView.m | 1 - 2 files changed, 57 insertions(+), 46 deletions(-) diff --git a/Libraries/RCTTest/RCTTestRunner.m b/Libraries/RCTTest/RCTTestRunner.m index b0c932bc1..41316360b 100644 --- a/Libraries/RCTTest/RCTTestRunner.m +++ b/Libraries/RCTTest/RCTTestRunner.m @@ -16,13 +16,8 @@ #import "RCTTestModule.h" #import "RCTUtils.h" -#define TIMEOUT_SECONDS 60 - -@interface RCTBridge (RCTTestRunner) - -@property (nonatomic, weak) RCTBridge *batchedBridge; - -@end +static const NSTimeInterval kTestTimeoutSeconds = 60; +static const NSTimeInterval kTestTeardownTimeoutSeconds = 30; @implementation RCTTestRunner { @@ -49,7 +44,7 @@ _scriptURL = [[NSBundle bundleForClass:[RCTBridge class]] URLForResource:@"main" withExtension:@"jsbundle"]; RCTAssert(_scriptURL != nil, @"Could not locate main.jsBundle"); #else - _scriptURL = [NSURL URLWithString:[NSString stringWithFormat:@"http://localhost:8081/%@.bundle?dev=true&platform=ios", app]]; + _scriptURL = [NSURL URLWithString:[NSString stringWithFormat:@"http://localhost:8081/%@.bundle?platform=ios&dev=true", app]]; #endif } return self; @@ -83,52 +78,69 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init) - (void)runTest:(SEL)test module:(NSString *)moduleName initialProps:(NSDictionary *)initialProps expectErrorBlock:(BOOL(^)(NSString *error))expectErrorBlock { - __block NSString *error = nil; - RCTSetLogFunction(^(RCTLogLevel level, NSString *fileName, NSNumber *lineNumber, NSString *message) { - if (level >= RCTLogLevelError) { - error = message; + __weak id weakJSContext; + + @autoreleasepool { + __block NSString *error = nil; + RCTSetLogFunction(^(RCTLogLevel level, NSString *fileName, NSNumber *lineNumber, NSString *message) { + if (level >= RCTLogLevelError) { + error = message; + } + }); + + RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:_scriptURL + moduleProvider:_moduleProvider + launchOptions:nil]; + + RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProps]; + rootView.frame = CGRectMake(0, 0, 320, 2000); // Constant size for testing on multiple devices + + NSString *testModuleName = RCTBridgeModuleNameForClass([RCTTestModule class]); + RCTTestModule *testModule = rootView.bridge.modules[testModuleName]; + RCTAssert(_testController != nil, @"_testController should not be nil"); + testModule.controller = _testController; + testModule.testSelector = test; + testModule.view = rootView; + + UIViewController *vc = [UIApplication sharedApplication].delegate.window.rootViewController; + vc.view = [UIView new]; + [vc.view addSubview:rootView]; // Add as subview so it doesn't get resized + + NSDate *date = [NSDate dateWithTimeIntervalSinceNow:kTestTimeoutSeconds]; + while (date.timeIntervalSinceNow > 0 && testModule.status == RCTTestStatusPending && error == nil) { + [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; + [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; } - }); - RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:_scriptURL - moduleProvider:_moduleProvider - launchOptions:nil]; + // Take a weak reference to the JS context, so we track its deallocation later + // (we can only do this now, since it's been lazily initialized) + weakJSContext = [[[bridge valueForKey:@"batchedBridge"] valueForKey:@"javaScriptExecutor"] valueForKey:@"context"]; + [rootView removeFromSuperview]; - RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProps]; - rootView.frame = CGRectMake(0, 0, 320, 2000); // Constant size for testing on multiple devices + RCTSetLogFunction(RCTDefaultLogFunction); - NSString *testModuleName = RCTBridgeModuleNameForClass([RCTTestModule class]); - RCTTestModule *testModule = rootView.bridge.batchedBridge.modules[testModuleName]; - RCTAssert(_testController != nil, @"_testController should not be nil"); - testModule.controller = _testController; - testModule.testSelector = test; - testModule.view = rootView; + NSArray *nonLayoutSubviews = [vc.view.subviews filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id subview, NSDictionary *bindings) { + return ![NSStringFromClass([subview class]) isEqualToString:@"_UILayoutGuide"]; + }]]; + RCTAssert(nonLayoutSubviews.count == 0, @"There shouldn't be any other views: %@", nonLayoutSubviews); - UIViewController *vc = [UIApplication sharedApplication].delegate.window.rootViewController; - vc.view = [UIView new]; - [vc.view addSubview:rootView]; // Add as subview so it doesn't get resized + if (expectErrorBlock) { + RCTAssert(expectErrorBlock(error), @"Expected an error but nothing matched."); + } else { + RCTAssert(error == nil, @"RedBox error: %@", error); + RCTAssert(testModule.status != RCTTestStatusPending, @"Test didn't finish within %0.f seconds", kTestTimeoutSeconds); + RCTAssert(testModule.status == RCTTestStatusPassed, @"Test failed"); + } + [bridge invalidate]; + } - NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS]; - while (date.timeIntervalSinceNow > 0 && testModule.status == RCTTestStatusPending && error == nil) { + // Wait for the executor to have shut down completely before returning + NSDate *teardownTimeout = [NSDate dateWithTimeIntervalSinceNow:kTestTeardownTimeoutSeconds]; + while (teardownTimeout.timeIntervalSinceNow > 0 && weakJSContext) { [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; } - [rootView removeFromSuperview]; - - RCTSetLogFunction(RCTDefaultLogFunction); - - NSArray *nonLayoutSubviews = [vc.view.subviews filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id subview, NSDictionary *bindings) { - return ![NSStringFromClass([subview class]) isEqualToString:@"_UILayoutGuide"]; - }]]; - RCTAssert(nonLayoutSubviews.count == 0, @"There shouldn't be any other views: %@", nonLayoutSubviews); - - if (expectErrorBlock) { - RCTAssert(expectErrorBlock(error), @"Expected an error but nothing matched."); - } else { - RCTAssert(error == nil, @"RedBox error: %@", error); - RCTAssert(testModule.status != RCTTestStatusPending, @"Test didn't finish within %d seconds", TIMEOUT_SECONDS); - RCTAssert(testModule.status == RCTTestStatusPassed, @"Test failed"); - } + RCTAssert(!weakJSContext, @"JS context was not deallocated after being invalidated"); } @end diff --git a/React/Base/RCTRootView.m b/React/Base/RCTRootView.m index 400842288..15ed227af 100644 --- a/React/Base/RCTRootView.m +++ b/React/Base/RCTRootView.m @@ -13,7 +13,6 @@ #import "RCTAssert.h" #import "RCTBridge.h" -#import "RCTContextExecutor.h" #import "RCTEventDispatcher.h" #import "RCTKeyCommands.h" #import "RCTLog.h"