Skip to content

Commit cc35492

Browse files
fix: Update placementAttributes to placementAttributesMapping
1 parent ca95ee2 commit cc35492

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

UnitTests/MPRoktTests.m

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
#import "MParticle.h"
44
#import "MPKitContainer.h"
55
#import "MPForwardQueueParameters.h"
6+
#import "MPIConstants.h"
67

78
@interface MPRokt ()
8-
- (NSArray<NSDictionary<NSString *, NSString *> *> *)getRoktPlacementAttributes;
9+
- (NSArray<NSDictionary<NSString *, NSString *> *> *)getRoktPlacementAttributesMapping;
910
@end
1011

1112
@interface MPRokt (Testing)
@@ -30,7 +31,7 @@ - (void)tearDown {
3031
}
3132

3233
- (void)testSelectPlacementsSimpleWithValidParameters {
33-
[[[self.mockRokt stub] andReturn:@[]] getRoktPlacementAttributes];
34+
[[[self.mockRokt stub] andReturn:@[]] getRoktPlacementAttributesMapping];
3435
MParticle *instance = [MParticle sharedInstance];
3536
id mockInstance = OCMPartialMock(instance);
3637
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
@@ -74,7 +75,7 @@ - (void)testSelectPlacementsSimpleWithValidParameters {
7475
}
7576

7677
- (void)testSelectPlacementsExpandedWithValidParameters {
77-
[[[self.mockRokt stub] andReturn:@[]] getRoktPlacementAttributes];
78+
[[[self.mockRokt stub] andReturn:@[]] getRoktPlacementAttributesMapping];
7879
MParticle *instance = [MParticle sharedInstance];
7980
id mockInstance = OCMPartialMock(instance);
8081
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
@@ -132,7 +133,7 @@ - (void)testSelectPlacementsExpandedWithValidParameters {
132133
}
133134

134135
- (void)testSelectPlacementsExpandedWithNilParameters {
135-
[[[self.mockRokt stub] andReturn:@[]] getRoktPlacementAttributes];
136+
[[[self.mockRokt stub] andReturn:@[]] getRoktPlacementAttributesMapping];
136137
MParticle *instance = [MParticle sharedInstance];
137138
id mockInstance = OCMPartialMock(instance);
138139
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
@@ -184,7 +185,7 @@ - (void)testSelectPlacementsExpandedWithNilParameters {
184185
}
185186

186187
- (void)testSelectPlacementsSimpleWithMapping {
187-
[[[self.mockRokt stub] andReturn:@[@{@"map": @"f.name", @"maptype": @"UserAttributeClass.Name", @"value": @"firstname"}, @{@"map": @"zip", @"maptype": @"UserAttributeClass.Name", @"value": @"billingzipcode"}, @{@"map": @"l.name", @"maptype": @"UserAttributeClass.Name", @"value": @"lastname"}]] getRoktPlacementAttributes];
188+
[[[self.mockRokt stub] andReturn:@[@{@"map": @"f.name", @"maptype": @"UserAttributeClass.Name", @"value": @"firstname"}, @{@"map": @"zip", @"maptype": @"UserAttributeClass.Name", @"value": @"billingzipcode"}, @{@"map": @"l.name", @"maptype": @"UserAttributeClass.Name", @"value": @"lastname"}]] getRoktPlacementAttributesMapping];
188189
MParticle *instance = [MParticle sharedInstance];
189190
id mockInstance = OCMPartialMock(instance);
190191
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
@@ -229,7 +230,7 @@ - (void)testSelectPlacementsSimpleWithMapping {
229230
}
230231

231232
- (void)testSelectPlacementsSimpleWithNilMapping {
232-
[[[self.mockRokt stub] andReturn:nil] getRoktPlacementAttributes];
233+
[[[self.mockRokt stub] andReturn:nil] getRoktPlacementAttributesMapping];
233234
MParticle *instance = [MParticle sharedInstance];
234235
id mockInstance = OCMPartialMock(instance);
235236
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
@@ -255,15 +256,15 @@ - (void)testSelectPlacementsSimpleWithNilMapping {
255256
OCMVerifyAll((id)mockContainer);
256257
}
257258

258-
- (void)testGetRoktPlacementAttributes {
259+
- (void)testGetRoktPlacementAttributesMapping {
259260
MParticle *instance = [MParticle sharedInstance];
260261
id mockInstance = OCMPartialMock(instance);
261262
id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
262263
NSArray *kitConfig = @[@{
263264
@"AllowJavaScriptResponse": @"True",
264265
@"accountId": @12345,
265266
@"onboardingExpProvider": @"None",
266-
@"placementAttributes": @"[{\"jsmap\":null,\"map\":\"f.name\",\"maptype\":\"UserAttributeClass.Name\",\"value\":\"firstname\"},{\"jsmap\":null,\"map\":\"zip\",\"maptype\":\"UserAttributeClass.Name\",\"value\":\"billingzipcode\"},{\"jsmap\":null,\"map\":\"l.name\",\"maptype\":\"UserAttributeClass.Name\",\"value\":\"lastname\"}]",
267+
kMPPlacementAttributesMapping: @"[{\"jsmap\":null,\"map\":\"f.name\",\"maptype\":\"UserAttributeClass.Name\",\"value\":\"firstname\"},{\"jsmap\":null,\"map\":\"zip\",\"maptype\":\"UserAttributeClass.Name\",\"value\":\"billingzipcode\"},{\"jsmap\":null,\"map\":\"l.name\",\"maptype\":\"UserAttributeClass.Name\",\"value\":\"lastname\"}]",
267268
@"sandboxMode": @"True",
268269
@"eau": @0,
269270
@"hs": @{
@@ -276,7 +277,7 @@ - (void)testGetRoktPlacementAttributes {
276277
[[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
277278
[[[mockInstance stub] andReturn:mockInstance] sharedInstance];
278279

279-
NSArray<NSDictionary<NSString *, NSString *> *> *testResult = [self.rokt getRoktPlacementAttributes];
280+
NSArray<NSDictionary<NSString *, NSString *> *> *testResult = [self.rokt getRoktPlacementAttributesMapping];
280281
NSArray<NSDictionary<NSString *, NSString *> *> *expectedResult = @[@{@"map": @"f.name", @"maptype": @"UserAttributeClass.Name", @"value": @"firstname", @"jsmap": [NSNull null]}, @{@"map": @"zip", @"maptype": @"UserAttributeClass.Name", @"value": @"billingzipcode", @"jsmap": [NSNull null]}, @{@"map": @"l.name", @"maptype": @"UserAttributeClass.Name", @"value": @"lastname", @"jsmap": [NSNull null]}];
281282

282283
XCTAssertEqualObjects(testResult, expectedResult, @"Mapping does not match .");

mParticle-Apple-SDK/MPIConstants.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,4 +516,7 @@ extern NSString * _Nonnull const kMPDeviceIdentifierKey;
516516
extern NSString * _Nonnull const kMPDeviceLimitAdTrackingKey;
517517
extern NSString * _Nonnull const kMPDeviceIsDaylightSavingTime;
518518
extern NSString * _Nonnull const kMPDeviceInvalidVendorId;
519+
520+
// MPRokt Constants
521+
extern NSString * _Nonnull const kMPPlacementAttributesMapping;
519522
#endif

mParticle-Apple-SDK/MPIConstants.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,10 @@
415415
NSString * const kMPDeviceLimitAdTrackingKey = @"lat";
416416
NSString * const kMPDeviceIsDaylightSavingTime = @"idst";
417417
NSString * const kMPDeviceInvalidVendorId = @"00000000-0000-0000-0000-000000000000";
418+
419+
// MPRokt Constants
420+
NSString * const kMPPlacementAttributesMapping = @"placementAttributesMapping";
421+
418422
//
419423
// Primitive data type constants
420424
//

mParticle-Apple-SDK/mParticle.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ - (void)selectPlacements:(NSString *)identifier
178178
onShouldShowLoadingIndicator:(void (^ _Nullable)(void))onShouldShowLoadingIndicator
179179
onShouldHideLoadingIndicator:(void (^ _Nullable)(void))onShouldHideLoadingIndicator
180180
onEmbeddedSizeChange:(void (^ _Nullable)(NSString * _Nonnull, CGFloat))onEmbeddedSizeChange {
181-
NSArray<NSDictionary<NSString *, NSString *> *> *attributeMap = [self getRoktPlacementAttributes];
181+
NSArray<NSDictionary<NSString *, NSString *> *> *attributeMap = [self getRoktPlacementAttributesMapping];
182182

183183
// If attributeMap is nil the kit hasn't been initialized
184184
if (attributeMap) {
@@ -221,7 +221,7 @@ - (void)selectPlacements:(NSString *)identifier
221221
}
222222
}
223223

224-
- (NSArray<NSDictionary<NSString *, NSString *> *> *)getRoktPlacementAttributes {
224+
- (NSArray<NSDictionary<NSString *, NSString *> *> *)getRoktPlacementAttributesMapping {
225225
NSArray<NSDictionary<NSString *, NSString *> *> *attributeMap = nil;
226226

227227
// Get the kit configuration
@@ -239,8 +239,8 @@ - (void)selectPlacements:(NSString *)identifier
239239
if (roktKitConfig != nil) {
240240
// Rokt Kit is available though there may not be an attribute map
241241
attributeMap = @[];
242-
if (roktKitConfig[@"placementAttributes"] != [NSNull null]) {
243-
strAttributeMap = [roktKitConfig[@"placementAttributes"] stringByRemovingPercentEncoding];
242+
if (roktKitConfig[kMPPlacementAttributesMapping] != [NSNull null]) {
243+
strAttributeMap = [roktKitConfig[kMPPlacementAttributesMapping] stringByRemovingPercentEncoding];
244244
dataAttributeMap = [strAttributeMap dataUsingEncoding:NSUTF8StringEncoding];
245245
}
246246
}

0 commit comments

Comments
 (0)