Squash of my previous local commits for Database Interop

Register Database with Interop: + Add AuthInterop dependency + Have Database register with Interop component container + Add weak dependency on Auth ~ Cleaned up imports Use Interop for Auth token fetching: + Use macro to get auth component ~ Change `getTokenForcingRefresh:withCallback:` call to use Interop component version of Auth ~ Clean up imports Implement necessary protocols: + Added FIRComponentRegistrant and FIRDatabaseNilProtocol to FIRDatabase Clean up Database tests: - Removed all unnecessary header files ~ Ran style.sh across all the tests Cleaned Up project file: Some header removals were missed in the last commit. Sorted some test files Fix Database Fake App Tests: + Added container property + Added an Auth fake in the container + Added the Shared utils files to the necessary targets + Added a missing XCTest reference in a test that didn't compile for me

Author: bstpierr

Example/Database/Tests/Helpers/FDevice.h

@@ -18,6 +18,7 @@
 
 @class FIRDatabaseReference;
 @class SenTest;
+@class XCTest;
 
 @interfaceFDevice : NSObject
 - (id)initOnline;
@@ -28,8 +29,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,122 +14,133 @@
  * limitations under the License.
 */
 
-#import<XCTest/XCTest.h>
 #import"FDevice.h"
+#import<XCTest/XCTest.h>
 
 #import<FirebaseDatabase/FIRDatabaseReference.h>
 
-#import"FRepoManager.h"
-#import"FIRDatabaseReference_Private.h"
 #import"FIRDatabaseConfig_Private.h"
-#import"SenTest+FWaiter.h"
+#import"FIRDatabaseReference_Private.h"
+#import"FRepoManager.h"
 #import"FTestHelpers.h"
+#import"SenTest+FWaiter.h"
 
-@interfaceFDevice() {
-FIRDatabaseConfig *config;
-NSString *url;
-BOOL isOnline;
-BOOL disposed;
+@interfaceFDevice() {
+ FIRDatabaseConfig *config;
+NSString *url;
+BOOL isOnline;
+BOOL disposed;
 }
 @end
 
 @implementationFDevice
 
 - (id)initOnline {
-FIRDatabaseReference *ref = [FTestHelpers getRandomNode];
-return [selfinitOnlineWithUrl:[ref description]];
+ FIRDatabaseReference *ref = [FTestHelpers getRandomNode];
+return [selfinitOnlineWithUrl:[ref description]];
 }
 
 - (id)initOffline {
-FIRDatabaseReference *ref = [FTestHelpers getRandomNode];
-return [selfinitOfflineWithUrl:[ref description]];
+ FIRDatabaseReference *ref = [FTestHelpers getRandomNode];
+return [selfinitOfflineWithUrl:[ref description]];
 }
 
 - (id)initOnlineWithUrl:(NSString *)firebaseUrl {
-return [selfinitWithUrl:firebaseUrl andOnline:YES];
+return [selfinitWithUrl:firebaseUrl andOnline:YES];
 }
 
 - (id)initOfflineWithUrl:(NSString *)firebaseUrl {
-return [selfinitWithUrl:firebaseUrl andOnline:NO];
+return [selfinitWithUrl:firebaseUrl andOnline:NO];
 }
 
 staticNSUInteger deviceId = 0;
 
 - (id)initWithUrl:(NSString *)firebaseUrlandOnline:(BOOL)online {
- self = [superinit];
-if (self) {
- config = [FIRDatabaseConfig configForName:[NSStringstringWithFormat:@"device-%lu", deviceId++]];
- config.persistenceEnabled = YES;
- url = firebaseUrl;
- isOnline = online;
- }
-return self;
+ self = [superinit];
+if (self) {
+ config =
+ [FIRDatabaseConfig configForName:[NSStringstringWithFormat:@"device-%lu", deviceId++]];
+ config.persistenceEnabled = YES;
+ url = firebaseUrl;
+ isOnline = online;
+ }
+return self;
 }
 
-- (void) dealloc
-{
-if (!self->disposed) {
- [NSExceptionraise:NSInternalInconsistencyExceptionformat:@"Forgot to dispose device"];
- }
+- (void)dealloc {
+if (!self->disposed) {
+ [NSExceptionraise:NSInternalInconsistencyExceptionformat:@"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 {
- [selfdo:^(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 {
+ [selfdo:^(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];
- }
-action(ref);
+- (void) do:(void (^)(FIRDatabaseReference *))action {
+ @autoreleasepool {
+ FIRDatabaseReference *ref = [[[[FIRDatabaseReference alloc] initWithConfig:self->config]
+database] referenceFromURL:self->url];
+if (!isOnline) {
+ [FRepoManager interrupt:config];
  }
+action(ref);
+ }
 }
 
 @end

Example/Database/Tests/Helpers/FEventTester.h

@@ -19,19 +19,19 @@
 
 @interfaceFEventTester : 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