Skip to content

Commit

Permalink
Integration tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SpertsyanKM
SpertsyanKM committed Aug 2, 2023
1 parent 3b34a91 commit 92fa75c
Show file tree
Hide file tree
Showing 7 changed files with 146 additions and 33 deletions.
1 change: 1 addition & 0 deletions IntegrationTests/Helpers/XCTestCase+Helpers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ typedef void (^TestBlock)(NSInvocation *);
@interface XCTestCase (Helpers)

- (BOOL)areArraysDeepEqual:(NSArray *)first second:(NSArray *)second;
- (BOOL)areArraysOfDictionariesEqualIgnoringOrder:(NSArray *)first second:(NSArray *)second descriptor:(NSString *)descriptor;
- (BOOL)areDictionariesDeepEqual:(NSDictionary *)first second:(NSDictionary *)second;
- (BOOL)areObjectsEqual:(id _Nonnull)obj1 second:(id _Nonnull)obj2;

Expand Down
26 changes: 24 additions & 2 deletions IntegrationTests/Helpers/XCTestCase+Helpers.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,37 @@ - (BOOL)areArraysDeepEqual:(NSArray *)first second:(NSArray *)second {
NSOrderedCollectionDifference *diff = [first differenceFromArray:second
withOptions:0
usingEquivalenceTest:^BOOL(id _Nonnull obj1, id _Nonnull obj2) {
return [self areObjectsEqual:obj1 second:obj2];
}];
return [self areObjectsEqual:obj1 second:obj2];
}];

return ![diff hasChanges];
} else {
return [first isEqualToArray:second];
}
}

- (BOOL)areArraysOfDictionariesEqualIgnoringOrder:(NSArray *)first second:(NSArray *)second descriptor:(NSString *)descriptor {
if (first.count != second.count) {
return NO;
}

NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:descriptor ascending:YES];
NSArray *sortedFirst = [first sortedArrayUsingDescriptors:@[sortDescriptor]];
NSArray *sortedSecond = [second sortedArrayUsingDescriptors:@[sortDescriptor]];

for (NSUInteger i = 0; i < sortedFirst.count; i++) {
NSDictionary *dict1 = sortedFirst[i];
NSDictionary *dict2 = sortedSecond[i];

if (![dict1 isEqualToDictionary:dict2]) {
NSLog(@"The arrays are not equal.");
return NO;
}
}

return true;
}

- (BOOL)areDictionariesDeepEqual:(NSDictionary *)first second:(NSDictionary *)second {
if (first.count != second.count) {
return NO;
Expand Down
96 changes: 80 additions & 16 deletions IntegrationTests/QNAPIClientIntegrationTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,42 +279,49 @@ - (void)testAttributionError {
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testProperties {
- (void)testSendProperties {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Properties call"];
NSString *uid = [NSString stringWithFormat:@"%@%@", self.kUidPrefix, @"_properties"];
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Send properties call"];
NSString *uid = [NSString stringWithFormat:@"%@%@", self.kUidPrefix, @"_send_properties"];
QNAPIClient *client = [self getClient:uid];

NSDictionary *data = @{
@"customProperty": @"custom property value",
[QNProperties keyForProperty:QONUserPropertyKeyUserID]: @"custom user id",
@"customProperty": @"custom property value",
[QNProperties keyForProperty:QONUserPropertyKeyUserID]: @"custom user id",
};

NSDictionary *expRes = @{
@"data": @{},
@"success": @1,
};
NSArray *expSavedProperties = @[
@{
@"key": @"customProperty",
@"value": @"custom property value"
},
@{
@"key": @"_q_custom_user_id",
@"value": @"custom user id"
}
];

// when
[client launchRequest:^(NSDictionary * _Nullable initRes, NSError * _Nullable createUserError) {
XCTAssertNil(createUserError);
XCTAssertNil(createUserError);

[client sendProperties:data completion:^(NSDictionary *_Nullable res, NSError *_Nullable error) {
XCTAssertNotNil(res);
XCTAssertNil(error);
XCTAssertTrue([self areDictionariesDeepEqual:expRes second:res]);
XCTAssertTrue([self areArraysDeepEqual:res[@"propertyErrors"] second:@[]]);
XCTAssertTrue([self areArraysOfDictionariesEqualIgnoringOrder:res[@"savedProperties"] second:expSavedProperties descriptor:@"key"]);
[completionExpectation fulfill];
}];
}];

// then
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testPropertiesError {
- (void)testSendPropertiesError {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Properties error call"];
NSString *uid = [NSString stringWithFormat:@"%@%@", self.kUidPrefix, @"_properties"];
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Send properties error call"];
NSString *uid = [NSString stringWithFormat:@"%@%@", self.kUidPrefix, @"_send_properties"];
QNAPIClient *client = [self getClient:uid projectKey:self.kIncorrectProjectKey];

NSDictionary *data = @{
Expand All @@ -332,6 +339,63 @@ - (void)testPropertiesError {
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testGetProperties {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Get properties call"];
NSString *uid = [NSString stringWithFormat:@"%@%@", self.kUidPrefix, @"_get_properties"];
QNAPIClient *client = [self getClient:uid];

NSDictionary *data = @{
@"customProperty": @"custom property value",
[QNProperties keyForProperty:QONUserPropertyKeyUserID]: @"custom user id",
};

NSArray *expRes = @[
@{
@"key": @"customProperty",
@"value": @"custom property value"
},
@{
@"key": @"_q_custom_user_id",
@"value": @"custom user id"
}
];

// when
[client launchRequest:^(NSDictionary * _Nullable initRes, NSError * _Nullable createUserError) {
XCTAssertNil(createUserError);

[client sendProperties:data completion:^(NSDictionary *_Nullable sendPropertiesRes, NSError *_Nullable sendPropertiesError) {
XCTAssertNil(sendPropertiesError);

[client getProperties:^(NSArray *res, NSError *error) {
XCTAssertNil(error);
XCTAssertTrue([self areArraysOfDictionariesEqualIgnoringOrder:res second:expRes descriptor:@"key"]);
[completionExpectation fulfill];
}];
}];
}];

// then
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testGetPropertiesError {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Get properties error call"];
NSString *uid = [NSString stringWithFormat:@"%@%@", self.kUidPrefix, @"_get_properties"];
QNAPIClient *client = [self getClient:uid projectKey:self.kIncorrectProjectKey];

// when
[client getProperties:^(NSArray *_Nullable res, NSError *_Nullable error) {
[self assertAccessDeniedError:res error:error];
[completionExpectation fulfill];
}];

// then
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testCheckTrialIntroEligibility {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"CheckTrialIntroEligibility call"];
Expand Down
46 changes: 36 additions & 10 deletions IntegrationTests/QNOutagerIntegrationTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,21 +211,27 @@ - (void)testAttribution {
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testProperties {
- (void)testSendProperties {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Properties call"];
NSString *uid = [NSString stringWithFormat:@"%@%@", self.kUidPrefix, @"_properties"];
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Send properties call"];
NSString *uid = [NSString stringWithFormat:@"%@%@", self.kUidPrefix, @"_send_properties"];
QNAPIClient *client = [self getClient:uid];

NSDictionary *data = @{
@"customProperty": @"custom property value",
[QNProperties keyForProperty:QONUserPropertyKeyUserID]: @"custom user id",
};

NSDictionary *expRes = @{
@"data": @{},
@"success": @1,
};

NSArray *expSavedProperties = @[
@{
@"key": @"customProperty",
@"value": @"custom property value"
},
@{
@"key": @"_q_custom_user_id",
@"value": @"custom user id"
}
];

// when
[client launchRequest:^(NSDictionary * _Nullable initRes, NSError * _Nullable createUserError) {
Expand All @@ -234,7 +240,8 @@ - (void)testProperties {
[client sendProperties:data completion:^(NSDictionary *_Nullable res, NSError *_Nullable error) {
XCTAssertNotNil(res);
XCTAssertNil(error);
XCTAssertTrue([self areDictionariesDeepEqual:expRes second:res]);
XCTAssertTrue([self areArraysDeepEqual:res[@"propertyErrors"] second:@[]]);
XCTAssertTrue([self areArraysOfDictionariesEqualIgnoringOrder:res[@"savedProperties"] second:expSavedProperties descriptor:@"key"]);
[completionExpectation fulfill];
}];
}];
Expand All @@ -243,6 +250,25 @@ - (void)testProperties {
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testGetProperties {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Get properties call"];
NSString *uid = [NSString stringWithFormat:@"%@%@", self.kUidPrefix, @"_get_properties"];
QNAPIClient *client = [self getClient:uid];

// when
[client getProperties:^(NSArray *res, NSError *error) {
XCTAssertNil(res);
XCTAssertNotNil(error);
XCTAssertEqual(error.code, 503);
XCTAssertTrue([error.localizedDescription isEqualToString:@"Internal server error"]);
[completionExpectation fulfill];
}];

// then
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testCheckTrialIntroEligibility {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"CheckTrialIntroEligibility call"];
Expand Down Expand Up @@ -397,7 +423,7 @@ - (QNAPIClient *)getClient:(NSString *)uid {
- (QNAPIClient *)getClient:(NSString *)uid projectKey:(NSString *)projectKey {
QNAPIClient *client = [[QNAPIClient alloc] init];

[client setBaseURL:@"<paste outager link here>"];
[client setBaseURL:@"https://outager.qonversion.workers.dev/"];
[client setApiKey:projectKey];
[client setSDKVersion:self.kSDKVersion];
[client setUserID:uid];
Expand Down
4 changes: 2 additions & 2 deletions Sources/Qonversion/Qonversion/Services/QNAPIClient/QNAPIClient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

typedef void (^QNAPIClientEmptyCompletionHandler)(NSError * _Nullable error);
typedef void (^QNAPIClientDictCompletionHandler)(NSDictionary * _Nullable dict, NSError * _Nullable error);
typedef void (^QNAPIClientArrayCompletionHandler)(NSArray * _Nullable dict, NSError * _Nullable error);
typedef void (^QNAPIClientCommonCompletionHandler)(id _Nullable dict, NSError * _Nullable error);
typedef void (^QNAPIClientArrayCompletionHandler)(NSArray * _Nullable array, NSError * _Nullable error);
typedef void (^QNAPIClientCommonCompletionHandler)(id _Nullable data, NSError * _Nullable error);

NS_ASSUME_NONNULL_BEGIN

Expand Down
4 changes: 2 additions & 2 deletions Sources/Qonversion/Qonversion/Services/QNAPIClient/QNAPIClient.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ - (void)processRequestWithoutResponse:(NSURLRequest *)request completion:(QNAPIC

- (void)processDictRequest:(NSURLRequest *)request completion:(QNAPIClientDictCompletionHandler)completion {
[self processRequest:request parseResponse:YES completion:^(id _Nullable data, NSError * _Nullable error) {
if ([data isKindOfClass:[NSDictionary class]]) {
if (error != nil || [data isKindOfClass:[NSDictionary class]]) {
completion(data, error);
} else {
completion(nil, [QONErrors errorWithCode:QONAPIErrorFailedParseResponse]);
Expand All @@ -91,7 +91,7 @@ - (void)processDictRequest:(NSURLRequest *)request completion:(QNAPIClientDictCo

- (void)processArrayRequest:(NSURLRequest *)request completion:(QNAPIClientArrayCompletionHandler)completion {
[self processRequest:request parseResponse:YES completion:^(id _Nullable data, NSError * _Nullable error) {
if ([data isKindOfClass:[NSArray class]]) {
if (error != nil || [data isKindOfClass:[NSArray class]]) {
completion(data, error);
} else {
completion(nil, [QONErrors errorWithCode:QONAPIErrorFailedParseResponse]);
Expand Down
2 changes: 1 addition & 1 deletion Sources/Qonversion/Qonversion/Utils/QNProperties/QNProperties.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#import "QONLaunchResult.h"
#import "QONUserProperty.h"

@interface QNProperties : NSObject

Expand Down

0 comments on commit 92fa75c

Please sign in to comment.