From 3118814ddcec37af58bd87f4dfb2e490dde63ef3 Mon Sep 17 00:00:00 2001
From: John Knox <jknox@fb.com>
Date: Wed, 26 Sep 2018 07:22:23 -0700
Subject: [PATCH] Add iOS client hang test

Summary: Check that it never hangs or crashes during startup

Reviewed By: priteshrnandgaonkar

Differential Revision: D10034630

fbshipit-source-id: b69ce9e6f91a5499a084c4d7328e6934ec92ece4
---
 iOS/FlipperKit/FlipperClient.mm         |  7 ++++---
 iOS/SonarKitTests/FlipperClientTests.mm | 26 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 iOS/SonarKitTests/FlipperClientTests.mm

diff --git a/iOS/FlipperKit/FlipperClient.mm b/iOS/FlipperKit/FlipperClient.mm
index e7dc24aea..43b566109 100644
--- a/iOS/FlipperKit/FlipperClient.mm
+++ b/iOS/FlipperKit/FlipperClient.mm
@@ -61,14 +61,15 @@ using WrapperPlugin = facebook::flipper::FlipperCppWrapperPlugin;
     deviceName = [NSString stringWithFormat:@"%@ %@", [[UIDevice currentDevice] model], @"Simulator"];
 #endif
 
+    static const std::string UNKNOWN = std::string("unknown");
     facebook::flipper::FlipperClient::init({
       {
         "localhost",
         "iOS",
         [deviceName UTF8String],
-        "unknown",
-        [appName UTF8String],
-        [appId UTF8String],
+        UNKNOWN,
+        [appName UTF8String] ?: UNKNOWN,
+        [appId UTF8String] ?: UNKNOWN,
         [privateAppDirectory UTF8String],
       },
       sonarThread.getEventBase(),
diff --git a/iOS/SonarKitTests/FlipperClientTests.mm b/iOS/SonarKitTests/FlipperClientTests.mm
new file mode 100644
index 000000000..a46f3a2f6
--- /dev/null
+++ b/iOS/SonarKitTests/FlipperClientTests.mm
@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2018-present, Facebook, Inc.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
+ *
+ */
+#import <XCTest/XCTest.h>
+
+#if FB_SONARKIT_ENABLED
+
+#import <FlipperKit/FlipperClient.h>
+
+@interface FlipperClientTests : XCTestCase
+@end
+
+@implementation FlipperClientTests
+
+- (void)testStartingClientDoesntCrashOrHang {
+  FlipperClient *client = [FlipperClient sharedClient];
+  [client start];
+}
+
+@end
+
+#endif