Revert "Squash of my previous local commits for Database Interop"

This reverts commit c0d0421.

Author: bstpierr

Example/Database/Tests/Helpers/FDevice.h

@@ -18,7 +18,6 @@
 
 @class FIRDatabaseReference;
 @class SenTest;
-@class XCTest;
 
 @interface FDevice : NSObject
 - (id)initOnline;
@@ -29,8 +28,8 @@
 - (void)goOnline;
 - (void)restartOnline;
 - (void)restartOffline;
-- (void)waitForIdleUsingWaiter:(XCTest *)waiter;
-- (void) do:(void (^)(FIRDatabaseReference *))action;
+- (void)waitForIdleUsingWaiter:(XCTest*)waiter;
+- (void)do:(void (^)(FIRDatabaseReference *))action;
 
 - (void)dispose;
 

Example/Database/Tests/Helpers/FDevice.m

@@ -14,133 +14,122 @@
  * limitations under the License.
  */
 
-#import "FDevice.h"
 #import <XCTest/XCTest.h>
+#import "FDevice.h"
 
 #import <FirebaseDatabase/FIRDatabaseReference.h>
 
-#import "FIRDatabaseConfig_Private.h"
-#import "FIRDatabaseReference_Private.h"
 #import "FRepoManager.h"
-#import "FTestHelpers.h"
+#import "FIRDatabaseReference_Private.h"
+#import "FIRDatabaseConfig_Private.h"
 #import "SenTest+FWaiter.h"
+#import "FTestHelpers.h"
 
-@interface FDevice () {
-  FIRDatabaseConfig *config;
-  NSString *url;
-  BOOL isOnline;
-  BOOL disposed;
+@interface FDevice() {
+    FIRDatabaseConfig * config;
+    NSString *url;
+    BOOL isOnline;
+    BOOL disposed;
 }
 @end
 
 @implementation FDevice
 
 - (id)initOnline {
-  FIRDatabaseReference *ref = [FTestHelpers getRandomNode];
-  return [self initOnlineWithUrl:[ref description]];
+    FIRDatabaseReference * ref = [FTestHelpers getRandomNode];
+    return [self initOnlineWithUrl:[ref description]];
 }
 
 - (id)initOffline {
-  FIRDatabaseReference *ref = [FTestHelpers getRandomNode];
-  return [self initOfflineWithUrl:[ref description]];
+    FIRDatabaseReference * ref = [FTestHelpers getRandomNode];
+    return [self initOfflineWithUrl:[ref description]];
 }
 
 - (id)initOnlineWithUrl:(NSString *)firebaseUrl {
-  return [self initWithUrl:firebaseUrl andOnline:YES];
+    return [self initWithUrl:firebaseUrl andOnline:YES];
 }
 
 - (id)initOfflineWithUrl:(NSString *)firebaseUrl {
-  return [self initWithUrl:firebaseUrl andOnline:NO];
+    return [self initWithUrl:firebaseUrl andOnline:NO];
 }
 
 static NSUInteger deviceId = 0;
 
 - (id)initWithUrl:(NSString *)firebaseUrl andOnline:(BOOL)online {
-  self = [super init];
-  if (self) {
-    config =
-        [FIRDatabaseConfig configForName:[NSString stringWithFormat:@"device-%lu", deviceId++]];
-    config.persistenceEnabled = YES;
-    url = firebaseUrl;
-    isOnline = online;
-  }
-  return self;
+    self = [super init];
+    if (self) {
+        config = [FIRDatabaseConfig configForName:[NSString stringWithFormat:@"device-%lu", deviceId++]];
+        config.persistenceEnabled = YES;
+        url = firebaseUrl;
+        isOnline = online;
+    }
+    return self;
 }
 
-- (void)dealloc {
-  if (!self->disposed) {
-    [NSException raise:NSInternalInconsistencyException format:@"Forgot to dispose device"];
-  }
+- (void) dealloc
+{
+    if (!self->disposed) {
+        [NSException raise:NSInternalInconsistencyException format:@"Forgot to dispose device"];
+    }
 }
 
-- (void)dispose {
-  // TODO: clear persistence
-  [FRepoManager disposeRepos:self->config];
-  self->disposed = YES;
+- (void) dispose {
+    // TODO: clear persistence
+    [FRepoManager disposeRepos:self->config];
+    self->disposed = YES;
 }
 
 - (void)goOffline {
-  isOnline = NO;
-  [FRepoManager interrupt:config];
+    isOnline = NO;
+    [FRepoManager interrupt:config];
 }
 
 - (void)goOnline {
-  isOnline = YES;
-  [FRepoManager resume:config];
+    isOnline = YES;
+    [FRepoManager resume:config];
 }
 
 - (void)restartOnline {
-  @autoreleasepool {
-    [FRepoManager disposeRepos:config];
-    isOnline = YES;
-  }
+    @autoreleasepool {
+        [FRepoManager disposeRepos:config];
+        isOnline = YES;
+    }
 }
 
 - (void)restartOffline {
-  @autoreleasepool {
-    [FRepoManager disposeRepos:config];
-    isOnline = NO;
-  }
+    @autoreleasepool {
+        [FRepoManager disposeRepos:config];
+        isOnline = NO;
+    }
 }
 
-// Waits for us to connect and then does an extra round-trip to make sure all initial state
-// restoration is completely done.
-- (void)waitForIdleUsingWaiter:(XCTest *)waiter {
-  [self do:^(FIRDatabaseReference *ref) {
-    __block BOOL connected = NO;
-    FIRDatabaseHandle handle =
-        [[ref.root child:@".info/connected"] observeEventType:FIRDataEventTypeValue
-                                                    withBlock:^(FIRDataSnapshot *snapshot) {
-                                                      connected = [snapshot.value boolValue];
-                                                    }];
-    [waiter waitUntil:^BOOL {
-      return connected;
-    }];
-    [ref.root removeObserverWithHandle:handle];
-
-    // HACK: Do a deep setPriority (which we expect to fail because there's no data there) to do a
-    // no-op roundtrip.
-    __block BOOL done = NO;
-    [[ref.root child:@"ENTOHTNUHOE/ONTEHNUHTOE"]
-                setPriority:@"blah"
-        withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
-          done = YES;
+// Waits for us to connect and then does an extra round-trip to make sure all initial state restoration is completely done.
+- (void)waitForIdleUsingWaiter:(XCTest*)waiter {
+    [self do:^(FIRDatabaseReference *ref) {
+        __block BOOL connected = NO;
+        FIRDatabaseHandle handle = [[ref.root child:@".info/connected"] observeEventType:FIRDataEventTypeValue withBlock:^(FIRDataSnapshot *snapshot) {
+            connected = [snapshot.value boolValue];
+        }];
+        [waiter waitUntil:^BOOL { return connected; }];
+        [ref.root removeObserverWithHandle:handle];
+
+        // HACK: Do a deep setPriority (which we expect to fail because there's no data there) to do a no-op roundtrip.
+        __block BOOL done = NO;
+        [[ref.root child:@"ENTOHTNUHOE/ONTEHNUHTOE"] setPriority:@"blah" withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+            done = YES;
         }];
-    [waiter waitUntil:^BOOL {
-      return done;
+        [waiter waitUntil:^BOOL { return done; }];
     }];
-  }];
 }
 
-- (void) do:(void (^)(FIRDatabaseReference *))action {
-  @autoreleasepool {
-    FIRDatabaseReference *ref = [[[[FIRDatabaseReference alloc] initWithConfig:self->config]
-        database] referenceFromURL:self->url];
-    if (!isOnline) {
-      [FRepoManager interrupt:config];
+- (void)do:(void (^)(FIRDatabaseReference *))action {
+    @autoreleasepool {
+        FIRDatabaseReference *ref = [[[[FIRDatabaseReference alloc] initWithConfig:self->config] database] referenceFromURL:self->url];
+        if (!isOnline) {
+            [FRepoManager interrupt:config];
+        }
+        action(ref);
     }
-    action(ref);
-  }
 }
 
 @end

Example/Database/Tests/Helpers/FEventTester.h

@@ -19,19 +19,19 @@
 
 @interface FEventTester : XCTestCase
 
-- (id)initFrom:(XCTestCase*)elsewhere;
-- (void)addLookingFor:(NSArray*)l;
-- (void)wait;
-- (void)waitForInitialization;
-- (void)unregister;
+- (id)initFrom:(XCTestCase *)elsewhere;
+- (void) addLookingFor:(NSArray *)l;
+- (void) wait;
+- (void) waitForInitialization;
+- (void) unregister;
 
-@property(nonatomic, strong) NSMutableArray* lookingFor;
-@property(readwrite) int callbacksCalled;
-@property(nonatomic, strong) NSMutableDictionary* seenFirebaseLocations;
+@property (nonatomic, strong) NSMutableArray* lookingFor;
+@property (readwrite) int callbacksCalled;
+@property (nonatomic, strong) NSMutableDictionary* seenFirebaseLocations;
 //@property (nonatomic, strong) NSMutableDictionary* initializationEvents;
-@property(nonatomic, strong) XCTestCase* from;
-@property(nonatomic, strong) NSMutableArray* errors;
-@property(nonatomic, strong) NSMutableArray* actualPathsAndEvents;
-@property(nonatomic) int initializationEvents;
+@property (nonatomic, strong) XCTestCase* from;
+@property (nonatomic, strong) NSMutableArray* errors;
+@property (nonatomic, strong) NSMutableArray* actualPathsAndEvents;
+@property (nonatomic) int initializationEvents;
 
 @end