aboutsummaryrefslogtreecommitdiffhomepage
path: root/Example/Messaging
diff options
context:
space:
mode:
authorGravatar Riz <rsattar@gmail.com>2017-05-24 17:29:09 -0700
committerGravatar GitHub <noreply@github.com>2017-05-24 17:29:09 -0700
commit2c133b34b0d3cbbe27b9206d57fe69140e5db6b3 (patch)
tree7c3959cd04e4a9b1c0fced611d51253353f402fa /Example/Messaging
parentdb7f85b9d43906adb99524185d7c375d2161c152 (diff)
Clean up logging and configuration in Messaging (#28)
* Remove mostly unused code from FIRMessagingLogger This cleans up some left-over old logging logic from before we moved to FIRLogger in Firebase Core. We no longer need this logging functionality. * Delete FIRMessagingConfig.{h,m} We no longer need a config class to store an unused log level filter (that filter is no longer needed).
Diffstat (limited to 'Example/Messaging')
-rw-r--r--Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m1
-rw-r--r--Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m6
-rw-r--r--Example/Messaging/Tests/FIRMessagingServiceTest.m1
-rw-r--r--Example/Messaging/Tests/FIRMessagingTest.m6
4 files changed, 4 insertions, 10 deletions
diff --git a/Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m b/Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m
index 2b4f407..5771337 100644
--- a/Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m
+++ b/Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m
@@ -22,7 +22,6 @@
#import "FIRMessaging.h"
#import "FIRMessagingClient.h"
-#import "FIRMessagingConfig.h"
#import "FIRMessagingConnection.h"
#import "FIRMessagingDataMessageManager.h"
#import "FIRMessagingReceiver.h"
diff --git a/Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m b/Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m
index 94ce530..8f93240 100644
--- a/Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m
+++ b/Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m
@@ -19,13 +19,12 @@
#import <OCMock/OCMock.h>
#import "FIRMessaging.h"
-#import "FIRMessagingConfig.h"
#import "FIRMessagingConstants.h"
#import "FIRMessagingTestNotificationUtilities.h"
@interface FIRMessaging ()
-- (instancetype)initWithConfig:(FIRMessagingConfig *)config;
+- (instancetype)initPrivately;
- (NSURL *)linkURLFromMessage:(NSDictionary *)message;
@end
@@ -41,8 +40,7 @@
- (void)setUp {
[super setUp];
- FIRMessagingConfig *config = [FIRMessagingConfig defaultConfig];
- _messaging = [[FIRMessaging alloc] initWithConfig:config];
+ _messaging = [[FIRMessaging alloc] initPrivately];
}
- (void)tearDown {
diff --git a/Example/Messaging/Tests/FIRMessagingServiceTest.m b/Example/Messaging/Tests/FIRMessagingServiceTest.m
index bdbc0c2..b3dce57 100644
--- a/Example/Messaging/Tests/FIRMessagingServiceTest.m
+++ b/Example/Messaging/Tests/FIRMessagingServiceTest.m
@@ -21,7 +21,6 @@
#import "FIRMessaging.h"
#import "FIRMessagingClient.h"
-#import "FIRMessagingConfig.h"
#import "FIRMessagingPubSub.h"
#import "FIRMessagingTopicsCommon.h"
#import "InternalHeaders/FIRMessagingInternalUtilities.h"
diff --git a/Example/Messaging/Tests/FIRMessagingTest.m b/Example/Messaging/Tests/FIRMessagingTest.m
index 3d7c95f..09cdffc 100644
--- a/Example/Messaging/Tests/FIRMessagingTest.m
+++ b/Example/Messaging/Tests/FIRMessagingTest.m
@@ -19,7 +19,6 @@
#import <OCMock/OCMock.h>
#import "FIRMessaging.h"
-#import "FIRMessagingConfig.h"
#import "FIRMessagingInstanceIDProxy.h"
extern NSString *const kFIRMessagingFCMTokenFetchAPNSOption;
@@ -30,7 +29,7 @@ extern NSString *const kFIRMessagingFCMTokenFetchAPNSOption;
@property(nonatomic, readwrite, strong) NSData *apnsTokenData;
@property(nonatomic, readwrite, strong) FIRMessagingInstanceIDProxy *instanceIDProxy;
-- (instancetype)initWithConfig:(FIRMessagingConfig *)config;
+- (instancetype)initPrivately;
// Direct Channel Methods
- (void)updateAutomaticClientConnection;
- (BOOL)shouldBeConnectedAutomatically;
@@ -49,8 +48,7 @@ extern NSString *const kFIRMessagingFCMTokenFetchAPNSOption;
- (void)setUp {
[super setUp];
- FIRMessagingConfig *config = [FIRMessagingConfig defaultConfig];
- _messaging = [[FIRMessaging alloc] initWithConfig:config];
+ _messaging = [[FIRMessaging alloc] initPrivately];
_mockMessaging = OCMPartialMock(self.messaging);
_mockInstanceIDProxy = OCMPartialMock(self.messaging.instanceIDProxy);
self.messaging.instanceIDProxy = _mockInstanceIDProxy;