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>
#if FB_SONARKIT_ENABLED
#import <FlipperKit/FlipperPlugin.h>
#import <FlipperKit/FlipperClient.h>
#import <FlipperKit/FlipperClient+Testing.h>
#import <FlipperKit/FlipperClient.h>
#import <FlipperKit/FlipperConnection.h>
#import <FlipperKit/FlipperPlugin.h>
#import <FlipperKitTestUtils/BlockBasedSonarPlugin.h>
#import <FlipperTestLib/FlipperResponderMock.h>
#import <FlipperTestLib/FlipperConnectionManagerMock.h>
#import <FlipperTestLib/FlipperPluginMock.h>
#import <FlipperTestLib/FlipperResponderMock.h>
#import <folly/json.h>
#import <vector>
@@ -24,218 +24,293 @@
@end
@implementation FlipperClientTests
facebook::flipper::FlipperClient *client;
facebook::flipper::test::FlipperConnectionManagerMock *socket;
FlipperClient *objcClient;
facebook::flipper::FlipperClient* client;
facebook::flipper::test::FlipperConnectionManagerMock* socket;
FlipperClient* objcClient;
- (void)setUp {
// Put setup code here. This method is called before the invocation of each test method in the class.
socket = new facebook::flipper::test::FlipperConnectionManagerMock;
auto state = std::make_shared<FlipperState>();
client = new facebook::flipper::FlipperClient(std::unique_ptr<facebook::flipper::test::FlipperConnectionManagerMock>{socket}, state);
objcClient = [[FlipperClient alloc] initWithCppClient:client];
// Put setup code here. This method is called before the invocation of each
// test method in the class.
socket = new facebook::flipper::test::FlipperConnectionManagerMock;
auto state = std::make_shared<FlipperState>();
client = new facebook::flipper::FlipperClient(
std::unique_ptr<facebook::flipper::test::FlipperConnectionManagerMock>{
socket},
state);
objcClient = [[FlipperClient alloc] initWithCppClient:client];
}
- (void)tearDown {
// Put teardown code here. This method is called after the invocation of each test method in the class.
delete client;
// Put teardown code here. This method is called after the invocation of each
// test method in the class.
delete client;
}
- (void)testGetPlugin {
BlockBasedSonarPlugin* cat =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"cat"
connect:nil
disconnect:nil];
BlockBasedSonarPlugin* dog =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"dog"
connect:nil
disconnect:nil];
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:nil disconnect:nil];
BlockBasedSonarPlugin *dog = [[BlockBasedSonarPlugin alloc] initIdentifier:@"dog" connect:nil disconnect:nil];
[objcClient addPlugin:cat];
[objcClient addPlugin:dog];
[objcClient addPlugin:cat];
[objcClient addPlugin:dog];
NSObject<FlipperPlugin> *retrievedPlugin = [objcClient pluginWithIdentifier:@"cat"];
XCTAssertEqual(retrievedPlugin, cat);
retrievedPlugin = [objcClient pluginWithIdentifier:@"dog"];
XCTAssertEqual(retrievedPlugin, dog);
NSObject<FlipperPlugin>* retrievedPlugin =
[objcClient pluginWithIdentifier:@"cat"];
XCTAssertEqual(retrievedPlugin, cat);
retrievedPlugin = [objcClient pluginWithIdentifier:@"dog"];
XCTAssertEqual(retrievedPlugin, dog);
}
- (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 removePlugin:cat];
[objcClient addPlugin: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> errors = std::vector<folly::dynamic>();
std::unique_ptr<facebook::flipper::FlipperResponderMock> responder = std::make_unique<facebook::flipper::FlipperResponderMock>(&successes, &errors);
socket->callbacks->onMessageReceived(message, std::move(responder));
folly::dynamic expected = folly::dynamic::object("plugins", folly::dynamic::array());
XCTAssertEqual(successes.size(), 1);
XCTAssertEqual(errors.size(), 0);
XCTAssertEqual(successes[0], expected);
std::vector<folly::dynamic> successes = 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);
socket->callbacks->onMessageReceived(message, std::move(responder));
folly::dynamic expected =
folly::dynamic::object("plugins", folly::dynamic::array());
XCTAssertEqual(successes.size(), 1);
XCTAssertEqual(errors.size(), 0);
XCTAssertEqual(successes[0], expected);
}
- (void) testPluginActivatedInBackgroundMode {
__block BOOL pluginConnected = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:^(id<FlipperConnection>) {
pluginConnected = YES;
} disconnect:^{
pluginConnected = NO;
- (void)testPluginActivatedInBackgroundMode {
__block BOOL pluginConnected = NO;
BlockBasedSonarPlugin* cat =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"cat"
connect:^(id<FlipperConnection>) {
pluginConnected = YES;
}
disconnect:^{
pluginConnected = NO;
}
runInBackground:YES];
} runInBackground: YES];
[objcClient addPlugin:cat];
[objcClient start];
XCTAssertTrue(pluginConnected);
[objcClient addPlugin:cat];
[objcClient start];
XCTAssertTrue(pluginConnected);
}
- (void) testPluginNotActivatedInNonBackgroundMode {
__block BOOL pluginConnected = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:^(id<FlipperConnection>) {
pluginConnected = YES;
} disconnect:^{
pluginConnected = NO;
- (void)testPluginNotActivatedInNonBackgroundMode {
__block BOOL pluginConnected = NO;
BlockBasedSonarPlugin* cat =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"cat"
connect:^(id<FlipperConnection>) {
pluginConnected = YES;
}
disconnect:^{
pluginConnected = NO;
}
runInBackground:NO];
} runInBackground: NO];
[objcClient addPlugin:cat];
[objcClient start];
XCTAssertFalse(pluginConnected);
[objcClient addPlugin:cat];
[objcClient start];
XCTAssertFalse(pluginConnected);
}
- (void)testConnectAndDisconnectCallbackForNonBackgroundCase {
__block BOOL pluginConnected = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:^(id<FlipperConnection>) {
pluginConnected = YES;
} disconnect:^{
pluginConnected = NO;
} runInBackground: NO];
__block BOOL pluginConnected = NO;
BlockBasedSonarPlugin* cat =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"cat"
connect:^(id<FlipperConnection>) {
pluginConnected = YES;
}
disconnect:^{
pluginConnected = NO;
}
runInBackground:NO];
[objcClient addPlugin:cat];
[objcClient start];
[objcClient addPlugin:cat];
[objcClient start];
folly::dynamic messageInit = folly::dynamic::object("method", "init")("params", folly::dynamic::object("plugin", "cat"));
std::unique_ptr<facebook::flipper::FlipperResponder> responder = std::make_unique<facebook::flipper::FlipperResponderMock>();
folly::dynamic messageInit = folly::dynamic::object("method", "init")(
"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));
XCTAssertTrue(pluginConnected);
[objcClient stop];
XCTAssertFalse(pluginConnected);
socket->callbacks->onMessageReceived(messageInit, std::move(responder));
XCTAssertTrue(pluginConnected);
[objcClient stop];
XCTAssertFalse(pluginConnected);
}
- (void)testConnectAndDisconnectCallbackForBackgroundCase {
__block BOOL pluginConnected = YES;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:^(id<FlipperConnection>) {
pluginConnected = YES;
} disconnect:^{
pluginConnected = NO;
} runInBackground: YES];
__block BOOL pluginConnected = YES;
BlockBasedSonarPlugin* cat =
[[BlockBasedSonarPlugin alloc] initIdentifier:@"cat"
connect:^(id<FlipperConnection>) {
pluginConnected = YES;
}
disconnect:^{
pluginConnected = NO;
}
runInBackground:YES];
[objcClient addPlugin:cat];
[objcClient start];
XCTAssertTrue(pluginConnected);
[objcClient stop];
XCTAssertFalse(pluginConnected);
[objcClient addPlugin:cat];
[objcClient start];
XCTAssertTrue(pluginConnected);
[objcClient stop];
XCTAssertFalse(pluginConnected);
}
- (void)testCrashSuppressionInDidConnectCallback {
__block BOOL pluginConnected = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:^(id<FlipperConnection>) {
pluginConnected = YES;
NSArray *array = @[];
[array objectAtIndex:10]; //This will throw an exception
} disconnect:nil runInBackground: YES];
__block BOOL pluginConnected = NO;
BlockBasedSonarPlugin* cat = [[BlockBasedSonarPlugin alloc]
initIdentifier:@"cat"
connect:^(id<FlipperConnection>) {
pluginConnected = YES;
NSArray* array = @[];
[array objectAtIndex:10]; // This will throw an exception
}
disconnect:nil
runInBackground:YES];
[objcClient addPlugin:cat];
// Since background plugin's didconnect is called as soon as flipper client starts
XCTAssertNoThrow([objcClient start]);
XCTAssertTrue(pluginConnected); // To be sure that connect block is called
[objcClient addPlugin:cat];
// Since background plugin's didconnect is called as soon as flipper client
// starts
XCTAssertNoThrow([objcClient start]);
XCTAssertTrue(pluginConnected); // To be sure that connect block is called
}
- (void)testCrashSuppressionInDisconnectCallback {
__block BOOL isCalled = NO;
BlockBasedSonarPlugin *cat = [[BlockBasedSonarPlugin alloc] initIdentifier:@"cat" connect:nil disconnect:^{
isCalled = YES;
NSArray *array = @[];
[array objectAtIndex:10]; //This will throw an exception
} runInBackground: YES];
__block BOOL isCalled = NO;
BlockBasedSonarPlugin* cat = [[BlockBasedSonarPlugin alloc]
initIdentifier:@"cat"
connect:nil
disconnect:^{
isCalled = YES;
NSArray* array = @[];
[array objectAtIndex:10]; // This will throw an exception
}
runInBackground:YES];
[objcClient addPlugin:cat];
[objcClient start];
[objcClient addPlugin:cat];
[objcClient start];
XCTAssertNoThrow([objcClient stop]); // Stopping client will call disconnect of the plugin
XCTAssertTrue(isCalled); // To be sure that connect block is called
XCTAssertNoThrow(
[objcClient stop]); // Stopping client will call disconnect of the plugin
XCTAssertTrue(isCalled); // To be sure that connect block is called
}
- (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"
connect:^(id<FlipperConnection> connection) {
[connection
receive:@"MethodName"
withBlock:^(
NSDictionary* dict, id<FlipperResponder> responder) {
isCalled = YES;
}];
}
disconnect:nil];
[connection receive:@"MethodName" withBlock:^(NSDictionary * dict, id<FlipperResponder> responder) {
isCalled = YES;
}];
} disconnect:nil];
[objcClient addPlugin:cat];
[objcClient start];
[objcClient addPlugin:cat];
[objcClient start];
folly::dynamic messageInit = folly::dynamic::object("method", "init")(
"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));
folly::dynamic message = folly::dynamic::object("id", 1)("method", "execute")(
"params",
folly::dynamic::object("api", "PluginIdentifier")(
"method", "MethodName"));
std::unique_ptr<facebook::flipper::FlipperResponder> responder2 =
std::make_unique<facebook::flipper::FlipperResponderMock>();
folly::dynamic messageInit = folly::dynamic::object("method", "init")("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));
folly::dynamic message = folly::dynamic::object("id", 1)("method", "execute")("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));
XCTAssertTrue(isCalled);
XCTAssertTrue(isCalled);
}
- (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"
connect:^(id<FlipperConnection> connection) {
[connection
receive:@"MethodName"
withBlock:^(
NSDictionary* dict, id<FlipperResponder> responder) {
isCalled = YES;
}];
}
disconnect:nil
runInBackground:YES];
[connection receive:@"MethodName" withBlock:^(NSDictionary * dict, id<FlipperResponder> responder) {
isCalled = YES;
}];
} disconnect:nil runInBackground:YES];
[objcClient addPlugin:cat];
[objcClient start];
[objcClient addPlugin:cat];
[objcClient start];
folly::dynamic message = folly::dynamic::object("id", 1)("method", "execute")(
"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));
folly::dynamic message = folly::dynamic::object("id", 1)("method", "execute")("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));
XCTAssertTrue(isCalled);
XCTAssertTrue(isCalled);
}
- (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"
connect:^(id<FlipperConnection> connection) {
[connection
receive:@"MethodName"
withBlock:^(
NSDictionary* dict, id<FlipperResponder> responder) {
isCalled = YES;
NSArray* array = @[];
[array objectAtIndex:10]; // This will throw an exception
}];
}
disconnect:nil
runInBackground:YES];
[connection receive:@"MethodName" withBlock:^(NSDictionary * dict, id<FlipperResponder> responder) {
isCalled = YES;
NSArray *array = @[];
[array objectAtIndex:10]; //This will throw an exception
}];
} disconnect:nil runInBackground:YES];
[objcClient addPlugin:cat];
[objcClient start];
[objcClient addPlugin:cat];
[objcClient start];
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> errors = std::vector<folly::dynamic>();
std::unique_ptr<facebook::flipper::FlipperResponderMock> responder =
std::make_unique<facebook::flipper::FlipperResponderMock>(
&successes, &errors);
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> errors = std::vector<folly::dynamic>();
std::unique_ptr<facebook::flipper::FlipperResponderMock> responder = std::make_unique<facebook::flipper::FlipperResponderMock>(&successes, &errors);
XCTAssertNoThrow(socket->callbacks->onMessageReceived(message, std::move(responder)));
XCTAssertTrue(isCalled);
XCTAssertEqual(successes.size(), 0);
XCTAssertEqual(errors.size(), 1);
XCTAssertNoThrow(
socket->callbacks->onMessageReceived(message, std::move(responder)));
XCTAssertTrue(isCalled);
XCTAssertEqual(successes.size(), 0);
XCTAssertEqual(errors.size(), 1);
}
@end

View File

@@ -14,13 +14,17 @@
using facebook::flipper::FlipperCppWrapperPlugin;
@interface DummyPlugin : NSObject <FlipperPlugin>
@interface DummyPlugin : NSObject<FlipperPlugin>
@end
@implementation DummyPlugin
- (NSString *)identifier { return @"Dummy"; }
- (void)didConnect:(id<FlipperConnection>)connection {}
- (void)didDisconnect {}
- (NSString*)identifier {
return @"Dummy";
}
- (void)didConnect:(id<FlipperConnection>)connection {
}
- (void)didDisconnect {
}
@end
@interface FlipperCppBridgingTests : XCTestCase
@@ -29,10 +33,10 @@ using facebook::flipper::FlipperCppWrapperPlugin;
@implementation FlipperCppBridgingTests
- (void)testCppWrapperRetainsObjCPlugin {
NSObject<FlipperPlugin> *dummyPlugin = [DummyPlugin new];
auto retainCountBefore = CFGetRetainCount((void *)dummyPlugin);
NSObject<FlipperPlugin>* dummyPlugin = [DummyPlugin new];
auto retainCountBefore = CFGetRetainCount((void*)dummyPlugin);
FlipperCppWrapperPlugin wrapperPlugin(dummyPlugin);
auto retainCountAfter = CFGetRetainCount((void *)dummyPlugin);
auto retainCountAfter = CFGetRetainCount((void*)dummyPlugin);
XCTAssertTrue(retainCountAfter > retainCountBefore);
}

View File

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