Skip to content

Commit a33715a

Browse files
fix analyzer issues
1 parent eb9dc77 commit a33715a

21 files changed

+85
-85
lines changed

UnitTests/MPBackendControllerTests.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ @interface MPKitContainer_PRIVATE(Tests)
6868
#pragma mark - MPBackendController+Tests category
6969
@interface MPBackendController_PRIVATE(Tests)
7070

71-
@property (nonatomic, strong) MPNetworkCommunication *networkCommunication;
71+
@property (nonatomic, strong) MPNetworkCommunication_PRIVATE *networkCommunication;
7272
@property (nonatomic, strong) NSMutableDictionary *userAttributes;
7373
@property (nonatomic, strong) NSMutableArray *userIdentities;
7474

7575
- (NSString *)caseInsensitiveKeyInDictionary:(NSDictionary *)dictionary withKey:(NSString *)key;
7676
- (void)cleanUp;
7777
- (void)handleApplicationDidFinishLaunching:(NSNotification *)notification;
7878
- (void)handleApplicationDidBecomeActive:(NSNotification *)notification;
79-
- (void)logRemoteNotificationWithNotificationController:(MPNotificationController *const)notificationController;
79+
- (void)logRemoteNotificationWithNotificationController:(MPNotificationController_PRIVATE *const)notificationController;
8080
- (void)parseConfigResponse:(NSDictionary *)configurationDictionary;
8181
- (void)parseResponseHeader:(NSDictionary *)responseDictionary session:(MPSession *)session;
8282
- (NSNumber *)previousSessionSuccessfullyClosed;
@@ -105,7 +105,7 @@ @interface MPBackendControllerTests : MPBaseTestCase <MPBackendControllerDelegat
105105

106106
@property (nonatomic, strong) MPBackendController_PRIVATE *backendController;
107107
@property (nonatomic, strong) MPSession *session;
108-
@property (nonatomic, strong) MPNotificationController *notificationController;
108+
@property (nonatomic, strong) MPNotificationController_PRIVATE *notificationController;
109109

110110
@end
111111

@@ -187,12 +187,12 @@ - (NSDictionary *)remoteNotificationDictionary {
187187
return remoteNotificationDictionary;
188188
}
189189

190-
- (MPNotificationController *)notificationController {
190+
- (MPNotificationController_PRIVATE *)notificationController {
191191
if (_notificationController) {
192192
return _notificationController;
193193
}
194194

195-
_notificationController = [[MPNotificationController alloc] init];
195+
_notificationController = [[MPNotificationController_PRIVATE alloc] init];
196196

197197
return _notificationController;
198198
}

UnitTests/MPBaseTestCase.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ - (void)setUpWithCompletionHandler:(void (^)(NSError * _Nullable))completion {
4343
}
4444

4545
[instance reset:^{
46-
MPNetworkCommunication.connectorFactory = [[MPTestConnectorFactory alloc] init];
46+
MPNetworkCommunication_PRIVATE.connectorFactory = [[MPTestConnectorFactory alloc] init];
4747
completion(nil);
4848
}];
4949
}
5050

5151
- (void)tearDown {
52-
MPNetworkCommunication.connectorFactory = nil;
52+
MPNetworkCommunication_PRIVATE.connectorFactory = nil;
5353
[super tearDown];
5454
}
5555

UnitTests/MPIdentityTests.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ - (void)onModifyRequestComplete:(MPIdentityApiRequest *)request httpResponse:(MP
4343
- (NSArray<MParticleUser *> *)sortedUserArrayByLastSeen:(NSMutableArray<MParticleUser *> *)userArray;
4444
@end
4545

46-
@interface MPNetworkCommunication ()
46+
@interface MPNetworkCommunication_PRIVATE ()
4747
- (void)modifyWithIdentityChanges:(NSArray *)identityChanges blockOtherRequests:(BOOL)blockOtherRequests completion:(nullable MPIdentityApiManagerModifyCallback)completion;
4848
- (void)identityApiRequestWithURL:(NSURL*)url identityRequest:(MPIdentityHTTPBaseRequest *_Nonnull)identityRequest blockOtherRequests: (BOOL) blockOtherRequests completion:(nullable MPIdentityApiManagerCallback)completion;
4949
@end
@@ -502,7 +502,7 @@ - (void)testConstructIdentityApiRequestWithAuthorizedATTStatus {
502502
}
503503

504504
- (void)testNoEmptyModifyRequests {
505-
MPNetworkCommunication *network = [[MPNetworkCommunication alloc] init];
505+
MPNetworkCommunication_PRIVATE *network = [[MPNetworkCommunication_PRIVATE alloc] init];
506506

507507
id partialMock = OCMPartialMock(network);
508508

UnitTests/MPNetworkCommunication+Tests.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
extern NSString * _Nonnull const kMPURLHostEventSubdomain;
66
extern NSString * _Nonnull const kMPURLHostIdentitySubdomain;
77

8-
@interface MPNetworkCommunication(Tests)
8+
@interface MPNetworkCommunication_PRIVATE(Tests)
99

1010
- (nonnull NSString *)defaultHostWithSubdomain:(nonnull NSString *)subdomain apiKey:(nonnull NSString *)apiKey enableDirectRouting:(BOOL)enableDirectRouting;
1111
- (nonnull NSString *)defaultEventHost;

UnitTests/MPNetworkCommunicationTests.m

Lines changed: 38 additions & 38 deletions
Large diffs are not rendered by default.

UnitTests/MPNotificationController+Tests.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import "MPNotificationController.h"
22

3-
@interface MPNotificationController(Tests)
3+
@interface MPNotificationController_PRIVATE(Tests)
44

55
- (void)handleApplicationDidFinishLaunching:(NSNotification *)notification;
66
- (void)handleApplicationDidEnterBackground:(NSNotification *)notification;

UnitTests/MPResponseEventsTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ - (void)testParseConfiguration {
6060
kMPRemoteConfigUniqueIdentifierKey: newDas
6161
}};
6262

63-
[MPNetworkCommunication parseConfiguration:response];
63+
[MPNetworkCommunication_PRIVATE parseConfiguration:response];
6464
XCTAssertEqualObjects([MPPersistenceController mpId], originalMpId);
6565
XCTAssertEqualObjects(stateMachine.consumerInfo.uniqueIdentifier, originalDas);
6666
XCTAssertTrue(areEqual(stateMachine.consumerInfo.cookiesDictionaryRepresentation, originalCookies));

UnitTests/MPURLRequestBuilderTests.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ - (void)testCustomUserAgent {
103103

104104
XCTestExpectation *expectation = [self expectationWithDescription:@"User-Agent"];
105105

106-
MPNetworkCommunication *networkCommunication = [[MPNetworkCommunication alloc] init];
106+
MPNetworkCommunication_PRIVATE *networkCommunication = [[MPNetworkCommunication_PRIVATE alloc] init];
107107

108108
MPMessage *message = [[MPMessage alloc] initWithSession:nil messageType:@"e" messageInfo:@{@"key":@"value"} uploadStatus:MPUploadStatusBatch UUID:[[NSUUID UUID] UUIDString] timestamp:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId] dataPlanId:@"test" dataPlanVersion:@(1)];
109109
MPUpload *upload = [[MPUpload alloc] initWithSessionId:nil uploadDictionary:@{} dataPlanId:@"test" dataPlanVersion:@(1) uploadSettings:[MPUploadSettings currentUploadSettings]];
@@ -130,7 +130,7 @@ - (void)testDisableCollectUserAgent {
130130

131131
XCTestExpectation *expectation = [self expectationWithDescription:@"User-Agent"];
132132

133-
MPNetworkCommunication *networkCommunication = [[MPNetworkCommunication alloc] init];
133+
MPNetworkCommunication_PRIVATE *networkCommunication = [[MPNetworkCommunication_PRIVATE alloc] init];
134134

135135
MPMessage *message = [[MPMessage alloc] initWithSession:nil messageType:@"e" messageInfo:@{@"key":@"value"} uploadStatus:MPUploadStatusBatch UUID:[[NSUUID UUID] UUIDString] timestamp:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId] dataPlanId:@"test" dataPlanVersion:@(1)];
136136
MPUpload *upload = [[MPUpload alloc] initWithSessionId:nil uploadDictionary:@{} dataPlanId:@"test" dataPlanVersion:@(1) uploadSettings:[MPUploadSettings currentUploadSettings]];
@@ -182,7 +182,7 @@ - (void)testInvalidHMACSha256Encode {
182182
}
183183

184184
- (void)testURLRequestComposition {
185-
MPNetworkCommunication *networkCommunication = [[MPNetworkCommunication alloc] init];
185+
MPNetworkCommunication_PRIVATE *networkCommunication = [[MPNetworkCommunication_PRIVATE alloc] init];
186186
MPURLRequestBuilder *urlRequestBuilder = [MPURLRequestBuilder newBuilderWithURL:[networkCommunication configURL] message:nil httpMethod:@"GET"];
187187
NSMutableURLRequest *asyncURLRequest = [urlRequestBuilder build];
188188

@@ -250,7 +250,7 @@ - (void)testEtag {
250250
NSTimeInterval requestTimestamp = [[NSDate date] timeIntervalSince1970];
251251
[[MPIUserDefaults standardUserDefaults] setConfiguration:responseConfiguration eTag:eTag requestTimestamp:requestTimestamp currentAge:@"0" maxAge:nil];
252252

253-
MPNetworkCommunication *networkCommunication = [[MPNetworkCommunication alloc] init];
253+
MPNetworkCommunication_PRIVATE *networkCommunication = [[MPNetworkCommunication_PRIVATE alloc] init];
254254
MPURLRequestBuilder *urlRequestBuilder = [MPURLRequestBuilder newBuilderWithURL:[networkCommunication configURL] message:nil httpMethod:@"GET"];
255255
NSMutableURLRequest *asyncURLRequest = [urlRequestBuilder build];
256256

@@ -397,7 +397,7 @@ - (void)testEventRequest {
397397

398398
XCTAssertEqual([MPURLRequestBuilder requestTimeout], 10, @"Should have been equal.");
399399

400-
MPNetworkCommunication *networkCommunication = [[MPNetworkCommunication alloc] init];
400+
MPNetworkCommunication_PRIVATE *networkCommunication = [[MPNetworkCommunication_PRIVATE alloc] init];
401401

402402
MPMessage *message = [[MPMessage alloc] initWithSession:nil messageType:@"e" messageInfo:@{@"key":@"value"} uploadStatus:MPUploadStatusBatch UUID:[[NSUUID UUID] UUIDString] timestamp:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId] dataPlanId:@"test" dataPlanVersion:@(1)];
403403
MPUpload *upload = [[MPUpload alloc] initWithSessionId:nil uploadDictionary:@{} dataPlanId:@"test" dataPlanVersion:@(1) uploadSettings:[MPUploadSettings currentUploadSettings]];
@@ -435,7 +435,7 @@ - (void)testEventRequest {
435435
}
436436

437437
- (void)testSignatureRelativePath {
438-
MPNetworkCommunication *networkCommunication = [[MPNetworkCommunication alloc] init];
438+
MPNetworkCommunication_PRIVATE *networkCommunication = [[MPNetworkCommunication_PRIVATE alloc] init];
439439
MPNetworkOptions *networkOptions = [[MPNetworkOptions alloc] init];
440440
MParticle *sharedInstance = [MParticle sharedInstance];
441441
id mockMParticle = OCMPartialMock(sharedInstance);

mParticle-Apple-SDK.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,6 @@
921921
53A79AAE29CDFB1E00E7489F /* MPConnector.m */,
922922
53A79AAF29CDFB1E00E7489F /* MPConnectorProtocol.h */,
923923
53A79AB029CDFB1E00E7489F /* MPConnectorFactoryProtocol.h */,
924-
53A79AB129CDFB1E00E7489F /* MPNetworkCommunication.h */,
925924
53A79AB229CDFB1E00E7489F /* MPURLRequestBuilder.m */,
926925
53A79AB329CDFB1E00E7489F /* MPURL.h */,
927926
53A79AB429CDFB1E00E7489F /* MPNetworkPerformance.m */,
@@ -1047,7 +1046,6 @@
10471046
53A79B3329CDFB1F00E7489F /* Notifications */ = {
10481047
isa = PBXGroup;
10491048
children = (
1050-
53A79B3429CDFB1F00E7489F /* MPNotificationController.h */,
10511049
53A79B3529CDFB1F00E7489F /* MPNotificationController.m */,
10521050
);
10531051
path = Notifications;
@@ -1171,7 +1169,9 @@
11711169
53A79B0629CDFB1F00E7489F /* MPStateMachine.h */,
11721170
53A79C4429CDFB4800E7489F /* MPTransactionAttributes+Dictionary.h */,
11731171
53A79B5B29CDFB1F00E7489F /* MPKitContainer.h */,
1172+
53A79AB129CDFB1E00E7489F /* MPNetworkCommunication.h */,
11741173
53A79B2429CDFB1F00E7489F /* MPApplication.h */,
1174+
53A79B3429CDFB1F00E7489F /* MPNotificationController.h */,
11751175
53A79AA329CDFB1E00E7489F /* MPBackendController.h */,
11761176
);
11771177
path = Include;

mParticle-Apple-SDK/AppNotifications/MPAppDelegateProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@class MPSurrogateAppDelegate;
55

66
#if TARGET_OS_IOS == 1
7-
@class MPNotificationController;
7+
@class MPNotificationController_PRIVATE;
88
#endif
99

1010
@interface MPAppDelegateProxy : NSProxy <UIApplicationDelegate>

0 commit comments

Comments
 (0)