Run CLANGFORMAT for FlipperKitTests

Summary:
This diff runs CLANGFORMAT lint on FlipperKitTestUtils. I have added CLANGFORMAT as the lint engined for objc files in xplat/sonar. Right now the iOS folder is not formatted according to CLANGFORMAT.
Ran `arc lint -a --paths-cmd "find ./iOS/FlipperKitTests -type f" --verbose`

Reviewed By: passy

Differential Revision: D19942172

fbshipit-source-id: 58322ef6a3a93f9666b3114e872a3a81a3c1cb35
This commit is contained in:
Pritesh Nandgaonkar
2020-02-17 10:46:43 -08:00
committed by Facebook Github Bot
parent 36deab1d52
commit 38478842df
3 changed files with 260 additions and 175 deletions

View File

@@ -8,14 +8,14 @@
#import <XCTest/XCTest.h> #import <XCTest/XCTest.h>
#if FB_SONARKIT_ENABLED #if FB_SONARKIT_ENABLED
#import <FlipperKit/FlipperPlugin.h>
#import <FlipperKit/FlipperClient.h>
#import <FlipperKit/FlipperClient+Testing.h> #import <FlipperKit/FlipperClient+Testing.h>
#import <FlipperKit/FlipperClient.h>
#import <FlipperKit/FlipperConnection.h> #import <FlipperKit/FlipperConnection.h>
#import <FlipperKit/FlipperPlugin.h>
#import <FlipperKitTestUtils/BlockBasedSonarPlugin.h> #import <FlipperKitTestUtils/BlockBasedSonarPlugin.h>
#import <FlipperTestLib/FlipperResponderMock.h>
#import <FlipperTestLib/FlipperConnectionManagerMock.h> #import <FlipperTestLib/FlipperConnectionManagerMock.h>
#import <FlipperTestLib/FlipperPluginMock.h> #import <FlipperTestLib/FlipperPluginMock.h>
#import <FlipperTestLib/FlipperResponderMock.h>
#import <folly/json.h> #import <folly/json.h>
#import <vector> #import <vector>
@@ -29,48 +29,64 @@ facebook::flipper::test::FlipperConnectionManagerMock *socket;
FlipperClient* objcClient; FlipperClient* objcClient;
- (void)setUp { - (void)setUp {
// Put setup code here. This method is called before the invocation of each test method in the class. // Put setup code here. This method is called before the invocation of each
// test method in the class.
socket = new facebook::flipper::test::FlipperConnectionManagerMock; socket = new facebook::flipper::test::FlipperConnectionManagerMock;
auto state = std::make_shared<FlipperState>(); auto state = std::make_shared<FlipperState>();
client = new facebook::flipper::FlipperClient(std::unique_ptr<facebook::flipper::test::FlipperConnectionManagerMock>{socket}, state); client = new facebook::flipper::FlipperClient(
std::unique_ptr<facebook::flipper::test::FlipperConnectionManagerMock>{
socket},
state);
objcClient = [[FlipperClient alloc] initWithCppClient:client]; objcClient = [[FlipperClient alloc] initWithCppClient:client];
} }
- (void)tearDown { - (void)tearDown {
// Put teardown code here. This method is called after the invocation of each test method in the class. // Put teardown code here. This method is called after the invocation of each
// test method in the class.
delete client; delete client;
} }
- (void)testGetPlugin { - (void)testGetPlugin {
BlockBasedSonarPlugin* cat =
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:nil disconnect:nil]; [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat"
BlockBasedSonarPlugin *dog = [[BlockBasedSonarPlugin alloc] initIdentifier:@"dog" connect:nil disconnect:nil]; connect:nil
disconnect:nil];
BlockBasedSonarPlugin* dog =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"dog"
connect:nil
disconnect:nil];
[objcClient addPlugin:cat]; [objcClient addPlugin:cat];
[objcClient addPlugin:dog]; [objcClient addPlugin:dog];
NSObject<FlipperPlugin> *retrievedPlugin = [objcClient pluginWithIdentifier:@"cat"]; NSObject<FlipperPlugin>* retrievedPlugin =
[objcClient pluginWithIdentifier:@"cat"];
XCTAssertEqual(retrievedPlugin, cat); XCTAssertEqual(retrievedPlugin, cat);
retrievedPlugin = [objcClient pluginWithIdentifier:@"dog"]; retrievedPlugin = [objcClient pluginWithIdentifier:@"dog"];
XCTAssertEqual(retrievedPlugin, dog); XCTAssertEqual(retrievedPlugin, dog);
} }
- (void)testRemovePlugin { - (void)testRemovePlugin {
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:nil disconnect:nil]; BlockBasedSonarPlugin* cat =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"cat"
connect:nil
disconnect:nil];
[objcClient addPlugin:cat]; [objcClient addPlugin:cat];
[objcClient removePlugin:cat]; [objcClient removePlugin:cat];
folly::dynamic message = folly::dynamic::object("id", 1)("method", "getPlugins"); folly::dynamic message =
folly::dynamic::object("id", 1)("method", "getPlugins");
std::vector<folly::dynamic> successes = std::vector<folly::dynamic>(); std::vector<folly::dynamic> successes = std::vector<folly::dynamic>();
std::vector<folly::dynamic> errors = std::vector<folly::dynamic>(); std::vector<folly::dynamic> errors = std::vector<folly::dynamic>();
std::unique_ptr<facebook::flipper::FlipperResponderMock> responder = std::make_unique<facebook::flipper::FlipperResponderMock>(&successes, &errors); std::unique_ptr<facebook::flipper::FlipperResponderMock> responder =
std::make_unique<facebook::flipper::FlipperResponderMock>(
&successes, &errors);
socket->callbacks->onMessageReceived(message, std::move(responder)); socket->callbacks->onMessageReceived(message, std::move(responder));
folly::dynamic expected = folly::dynamic::object("plugins", folly::dynamic::array()); folly::dynamic expected =
folly::dynamic::object("plugins", folly::dynamic::array());
XCTAssertEqual(successes.size(), 1); XCTAssertEqual(successes.size(), 1);
XCTAssertEqual(errors.size(), 0); XCTAssertEqual(errors.size(), 0);
XCTAssertEqual(successes[0], expected); XCTAssertEqual(successes[0], expected);
@@ -78,12 +94,15 @@ FlipperClient *objcClient;
- (void)testPluginActivatedInBackgroundMode { - (void)testPluginActivatedInBackgroundMode {
__block BOOL pluginConnected = NO; __block BOOL pluginConnected = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:^(id<FlipperConnection>) { BlockBasedSonarPlugin* cat =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"cat"
connect:^(id<FlipperConnection>) {
pluginConnected = YES; pluginConnected = YES;
} disconnect:^{ }
disconnect:^{
pluginConnected = NO; pluginConnected = NO;
}
} runInBackground: YES]; runInBackground:YES];
[objcClient addPlugin:cat]; [objcClient addPlugin:cat];
[objcClient start]; [objcClient start];
@@ -92,12 +111,15 @@ FlipperClient *objcClient;
- (void)testPluginNotActivatedInNonBackgroundMode { - (void)testPluginNotActivatedInNonBackgroundMode {
__block BOOL pluginConnected = NO; __block BOOL pluginConnected = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:^(id<FlipperConnection>) { BlockBasedSonarPlugin* cat =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"cat"
connect:^(id<FlipperConnection>) {
pluginConnected = YES; pluginConnected = YES;
} disconnect:^{ }
disconnect:^{
pluginConnected = NO; pluginConnected = NO;
}
} runInBackground: NO]; runInBackground:NO];
[objcClient addPlugin:cat]; [objcClient addPlugin:cat];
[objcClient start]; [objcClient start];
@@ -106,17 +128,23 @@ FlipperClient *objcClient;
- (void)testConnectAndDisconnectCallbackForNonBackgroundCase { - (void)testConnectAndDisconnectCallbackForNonBackgroundCase {
__block BOOL pluginConnected = NO; __block BOOL pluginConnected = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:^(id<FlipperConnection>) { BlockBasedSonarPlugin* cat =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"cat"
connect:^(id<FlipperConnection>) {
pluginConnected = YES; pluginConnected = YES;
} disconnect:^{ }
disconnect:^{
pluginConnected = NO; pluginConnected = NO;
} runInBackground: NO]; }
runInBackground:NO];
[objcClient addPlugin:cat]; [objcClient addPlugin:cat];
[objcClient start]; [objcClient start];
folly::dynamic messageInit = folly::dynamic::object("method", "init")("params", folly::dynamic::object("plugin", "cat")); folly::dynamic messageInit = folly::dynamic::object("method", "init")(
std::unique_ptr<facebook::flipper::FlipperResponder> responder = std::make_unique<facebook::flipper::FlipperResponderMock>(); "params", folly::dynamic::object("plugin", "cat"));
std::unique_ptr<facebook::flipper::FlipperResponder> responder =
std::make_unique<facebook::flipper::FlipperResponderMock>();
socket->callbacks->onMessageReceived(messageInit, std::move(responder)); socket->callbacks->onMessageReceived(messageInit, std::move(responder));
XCTAssertTrue(pluginConnected); XCTAssertTrue(pluginConnected);
@@ -126,11 +154,15 @@ FlipperClient *objcClient;
- (void)testConnectAndDisconnectCallbackForBackgroundCase { - (void)testConnectAndDisconnectCallbackForBackgroundCase {
__block BOOL pluginConnected = YES; __block BOOL pluginConnected = YES;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:^(id<FlipperConnection>) { BlockBasedSonarPlugin* cat =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"cat"
connect:^(id<FlipperConnection>) {
pluginConnected = YES; pluginConnected = YES;
} disconnect:^{ }
disconnect:^{
pluginConnected = NO; pluginConnected = NO;
} runInBackground: YES]; }
runInBackground:YES];
[objcClient addPlugin:cat]; [objcClient addPlugin:cat];
[objcClient start]; [objcClient start];
@@ -141,51 +173,72 @@ FlipperClient *objcClient;
- (void)testCrashSuppressionInDidConnectCallback { - (void)testCrashSuppressionInDidConnectCallback {
__block BOOL pluginConnected = NO; __block BOOL pluginConnected = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:^(id<FlipperConnection>) { BlockBasedSonarPlugin* cat = [[BlockBasedSonarPlugin alloc]
initIdentifier:@"cat"
connect:^(id<FlipperConnection>) {
pluginConnected = YES; pluginConnected = YES;
NSArray* array = @[]; NSArray* array = @[];
[array objectAtIndex:10]; // This will throw an exception [array objectAtIndex:10]; // This will throw an exception
} disconnect:nil runInBackground: YES]; }
disconnect:nil
runInBackground:YES];
[objcClient addPlugin:cat]; [objcClient addPlugin:cat];
// Since background plugin's didconnect is called as soon as flipper client starts // Since background plugin's didconnect is called as soon as flipper client
// starts
XCTAssertNoThrow([objcClient start]); XCTAssertNoThrow([objcClient start]);
XCTAssertTrue(pluginConnected); // To be sure that connect block is called XCTAssertTrue(pluginConnected); // To be sure that connect block is called
} }
- (void)testCrashSuppressionInDisconnectCallback { - (void)testCrashSuppressionInDisconnectCallback {
__block BOOL isCalled = NO; __block BOOL isCalled = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:nil disconnect:^{ BlockBasedSonarPlugin* cat = [[BlockBasedSonarPlugin alloc]
initIdentifier:@"cat"
connect:nil
disconnect:^{
isCalled = YES; isCalled = YES;
NSArray* array = @[]; NSArray* array = @[];
[array objectAtIndex:10]; // This will throw an exception [array objectAtIndex:10]; // This will throw an exception
} runInBackground: YES]; }
runInBackground:YES];
[objcClient addPlugin:cat]; [objcClient addPlugin:cat];
[objcClient start]; [objcClient start];
XCTAssertNoThrow([objcClient stop]); // Stopping client will call disconnect of the plugin XCTAssertNoThrow(
[objcClient stop]); // Stopping client will call disconnect of the plugin
XCTAssertTrue(isCalled); // To be sure that connect block is called XCTAssertTrue(isCalled); // To be sure that connect block is called
} }
- (void)testMethodBlockIsCalledNonBackgroundCase { - (void)testMethodBlockIsCalledNonBackgroundCase {
__block BOOL isCalled = NO; __block BOOL isCalled = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"PluginIdentifier" connect:^(id<FlipperConnection> connection) { BlockBasedSonarPlugin* cat = [[BlockBasedSonarPlugin alloc]
initIdentifier:@"PluginIdentifier"
[connection receive:@"MethodName" withBlock:^(NSDictionary * dict, id<FlipperResponder> responder) { connect:^(id<FlipperConnection> connection) {
[connection
receive:@"MethodName"
withBlock:^(
NSDictionary* dict, id<FlipperResponder> responder) {
isCalled = YES; isCalled = YES;
}]; }];
} disconnect:nil]; }
disconnect:nil];
[objcClient addPlugin:cat]; [objcClient addPlugin:cat];
[objcClient start]; [objcClient start];
folly::dynamic messageInit = folly::dynamic::object("method", "init")("params", folly::dynamic::object("plugin", "PluginIdentifier")); folly::dynamic messageInit = folly::dynamic::object("method", "init")(
std::unique_ptr<facebook::flipper::FlipperResponder> responder1 = std::make_unique<facebook::flipper::FlipperResponderMock>(); "params", folly::dynamic::object("plugin", "PluginIdentifier"));
std::unique_ptr<facebook::flipper::FlipperResponder> responder1 =
std::make_unique<facebook::flipper::FlipperResponderMock>();
socket->callbacks->onMessageReceived(messageInit, std::move(responder1)); socket->callbacks->onMessageReceived(messageInit, std::move(responder1));
folly::dynamic message = folly::dynamic::object("id", 1)("method", "execute")("params", folly::dynamic::object("api", "PluginIdentifier")("method", "MethodName")); folly::dynamic message = folly::dynamic::object("id", 1)("method", "execute")(
std::unique_ptr<facebook::flipper::FlipperResponder> responder2 = std::make_unique<facebook::flipper::FlipperResponderMock>(); "params",
folly::dynamic::object("api", "PluginIdentifier")(
"method", "MethodName"));
std::unique_ptr<facebook::flipper::FlipperResponder> responder2 =
std::make_unique<facebook::flipper::FlipperResponderMock>();
socket->callbacks->onMessageReceived(message, std::move(responder2)); socket->callbacks->onMessageReceived(message, std::move(responder2));
@@ -195,18 +248,28 @@ FlipperClient *objcClient;
- (void)testMethodBlockIsCalledBackgroundCase { - (void)testMethodBlockIsCalledBackgroundCase {
__block BOOL isCalled = NO; __block BOOL isCalled = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"PluginIdentifier" connect:^(id<FlipperConnection> connection) { BlockBasedSonarPlugin* cat = [[BlockBasedSonarPlugin alloc]
initIdentifier:@"PluginIdentifier"
[connection receive:@"MethodName" withBlock:^(NSDictionary * dict, id<FlipperResponder> responder) { connect:^(id<FlipperConnection> connection) {
[connection
receive:@"MethodName"
withBlock:^(
NSDictionary* dict, id<FlipperResponder> responder) {
isCalled = YES; isCalled = YES;
}]; }];
} disconnect:nil runInBackground:YES]; }
disconnect:nil
runInBackground:YES];
[objcClient addPlugin:cat]; [objcClient addPlugin:cat];
[objcClient start]; [objcClient start];
folly::dynamic message = folly::dynamic::object("id", 1)("method", "execute")("params", folly::dynamic::object("api", "PluginIdentifier")("method", "MethodName")); folly::dynamic message = folly::dynamic::object("id", 1)("method", "execute")(
std::unique_ptr<facebook::flipper::FlipperResponder> responder = std::make_unique<facebook::flipper::FlipperResponderMock>(); "params",
folly::dynamic::object("api", "PluginIdentifier")(
"method", "MethodName"));
std::unique_ptr<facebook::flipper::FlipperResponder> responder =
std::make_unique<facebook::flipper::FlipperResponderMock>();
socket->callbacks->onMessageReceived(message, std::move(responder)); socket->callbacks->onMessageReceived(message, std::move(responder));
XCTAssertTrue(isCalled); XCTAssertTrue(isCalled);
@@ -215,24 +278,36 @@ FlipperClient *objcClient;
- (void)testExceptionSuppressionInMethodBlock { - (void)testExceptionSuppressionInMethodBlock {
__block BOOL isCalled = NO; __block BOOL isCalled = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"PluginIdentifier" connect:^(id<FlipperConnection> connection) { BlockBasedSonarPlugin* cat = [[BlockBasedSonarPlugin alloc]
initIdentifier:@"PluginIdentifier"
[connection receive:@"MethodName" withBlock:^(NSDictionary * dict, id<FlipperResponder> responder) { connect:^(id<FlipperConnection> connection) {
[connection
receive:@"MethodName"
withBlock:^(
NSDictionary* dict, id<FlipperResponder> responder) {
isCalled = YES; isCalled = YES;
NSArray* array = @[]; NSArray* array = @[];
[array objectAtIndex:10]; // This will throw an exception [array objectAtIndex:10]; // This will throw an exception
}]; }];
} disconnect:nil runInBackground:YES]; }
disconnect:nil
runInBackground:YES];
[objcClient addPlugin:cat]; [objcClient addPlugin:cat];
[objcClient start]; [objcClient start];
folly::dynamic message = folly::dynamic::object("id", 1)("method", "execute")("params", folly::dynamic::object("api", "PluginIdentifier")("method", "MethodName")); folly::dynamic message = folly::dynamic::object("id", 1)("method", "execute")(
"params",
folly::dynamic::object("api", "PluginIdentifier")(
"method", "MethodName"));
std::vector<folly::dynamic> successes = std::vector<folly::dynamic>(); std::vector<folly::dynamic> successes = std::vector<folly::dynamic>();
std::vector<folly::dynamic> errors = std::vector<folly::dynamic>(); std::vector<folly::dynamic> errors = std::vector<folly::dynamic>();
std::unique_ptr<facebook::flipper::FlipperResponderMock> responder = std::make_unique<facebook::flipper::FlipperResponderMock>(&successes, &errors); std::unique_ptr<facebook::flipper::FlipperResponderMock> responder =
std::make_unique<facebook::flipper::FlipperResponderMock>(
&successes, &errors);
XCTAssertNoThrow(socket->callbacks->onMessageReceived(message, std::move(responder))); XCTAssertNoThrow(
socket->callbacks->onMessageReceived(message, std::move(responder)));
XCTAssertTrue(isCalled); XCTAssertTrue(isCalled);
XCTAssertEqual(successes.size(), 0); XCTAssertEqual(successes.size(), 0);
XCTAssertEqual(errors.size(), 1); XCTAssertEqual(errors.size(), 1);

View File

@@ -18,9 +18,13 @@ using facebook::flipper::FlipperCppWrapperPlugin;
@end @end
@implementation DummyPlugin @implementation DummyPlugin
- (NSString *)identifier { return @"Dummy"; } - (NSString*)identifier {
- (void)didConnect:(id<FlipperConnection>)connection {} return @"Dummy";
- (void)didDisconnect {} }
- (void)didConnect:(id<FlipperConnection>)connection {
}
- (void)didDisconnect {
}
@end @end
@interface FlipperCppBridgingTests : XCTestCase @interface FlipperCppBridgingTests : XCTestCase

View File

@@ -8,10 +8,10 @@
#import <XCTest/XCTest.h> #import <XCTest/XCTest.h>
#if FB_SONARKIT_ENABLED #if FB_SONARKIT_ENABLED
#import <FlipperKit/FlipperPlugin.h>
#import <FlipperKit/FlipperClient.h>
#import <FlipperKit/FlipperClient+Testing.h> #import <FlipperKit/FlipperClient+Testing.h>
#import <FlipperKit/FlipperClient.h>
#import <FlipperKit/FlipperConnection.h> #import <FlipperKit/FlipperConnection.h>
#import <FlipperKit/FlipperPlugin.h>
#import <FlipperKitTestUtils/BlockBasedSonarPlugin.h> #import <FlipperKitTestUtils/BlockBasedSonarPlugin.h>
#import <FlipperKitTestUtils/FlipperResponderMock.h> #import <FlipperKitTestUtils/FlipperResponderMock.h>
#import <FlipperTestLib/FlipperConnectionManagerMock.h> #import <FlipperTestLib/FlipperConnectionManagerMock.h>
@@ -29,30 +29,36 @@
FlipperResponderMock* responder; FlipperResponderMock* responder;
} }
- (void)setUp { - (void)setUp {
responder = [FlipperResponderMock new]; responder = [FlipperResponderMock new];
} }
- (void)testPerformOnMainThreadSuccess { - (void)testPerformOnMainThreadSuccess {
FlipperPerformBlockOnMainThread(^{}, responder); FlipperPerformBlockOnMainThread(
^{
},
responder);
NSAssert([responder.successes count] == 0, @"No successes are output"); NSAssert([responder.successes count] == 0, @"No successes are output");
NSAssert([responder.errors count] == 0, @"No errors are output"); NSAssert([responder.errors count] == 0, @"No errors are output");
} }
- (void)testPerformOnMainThreadStdException { - (void)testPerformOnMainThreadStdException {
FlipperPerformBlockOnMainThread(^{ FlipperPerformBlockOnMainThread(
^{
throw new std::exception(); throw new std::exception();
}, responder); },
responder);
NSAssert([responder.successes count] == 0, @"No successes are output"); NSAssert([responder.successes count] == 0, @"No successes are output");
NSAssert([responder.errors count] == 1, @"1 error is output"); NSAssert([responder.errors count] == 1, @"1 error is output");
} }
- (void)testPerformOnMainThreadNSException { - (void)testPerformOnMainThreadNSException {
FlipperPerformBlockOnMainThread(^{ FlipperPerformBlockOnMainThread(
^{
NSArray* a = [NSArray init]; NSArray* a = [NSArray init];
[a objectAtIndex:1]; [a objectAtIndex:1];
}, responder); },
responder);
NSAssert([responder.successes count] == 0, @"No successes are output"); NSAssert([responder.successes count] == 0, @"No successes are output");
NSAssert([responder.errors count] == 1, @"1 error is output"); NSAssert([responder.errors count] == 1, @"1 error is output");
} }