In Test cases, Fix potential memory leaks by use of NSURLSession #250
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,14 +45,15 @@ - (void)setUp | |
| { | ||
| [super setUp]; | ||
| [OHHTTPStubs removeAllStubs]; | ||
|
|
||
|
There was a problem hiding this comment. Would it be possible to get rid of those changes? 🙏 (by using the trick in the Xcode prefs I mentioned you in the last review or even manually of you don't want to change your prefs, that works too) Basically all empty lines should really be empty and not contain indentation and spaces. I know it's nitpicking and a matter of taste, I don't care for one style or another but I care about consistency throughout the code base 😉 |
||
| NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration]; | ||
| self.session = [NSURLSession sessionWithConfiguration:configuration delegate:nil delegateQueue:nil]; | ||
| } | ||
|
|
||
| - (void)tearDown | ||
| { | ||
| [super tearDown]; | ||
| [self.session invalidateAndCancel]; | ||
| self.session = nil; | ||
| } | ||
|
|
||
|
|
@@ -110,18 +111,18 @@ - (NSHTTPURLResponse *)runLogin | |
| NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url | ||
| cachePolicy:NSURLRequestUseProtocolCachePolicy | ||
| timeoutInterval:60.0]; | ||
|
|
||
|
There was a problem hiding this comment. And if course that applies to everywhere it changed here There was a problem hiding this comment. @AliSoftware, Sorry I missed that. It's fixed now. My Xcode is already up as you mentioned, but I just didn't CTRL-i to repair the indentation on that one file. It's in the new commit of this PR now. |
||
| [request addValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; | ||
| [request addValue:@"application/json" forHTTPHeaderField:@"Accept"]; | ||
|
|
||
| request.HTTPMethod = @"POST"; | ||
| NSDictionary *mapData = @{@"iloveit": @"happyuser1", | ||
| @"password": @"username"}; | ||
| NSData *postData = [NSJSONSerialization dataWithJSONObject:mapData options:0 error:NULL]; | ||
| request.HTTPBody = postData; | ||
|
|
||
| XCTestExpectation* expectation = [self expectationWithDescription:@"NSURLSessionDataTask completed"]; | ||
|
|
||
| __block NSHTTPURLResponse *capturedResponse; | ||
| NSURLSessionDataTask *postDataTask = [self.session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { | ||
| if ([response isKindOfClass:[NSHTTPURLResponse class]]) capturedResponse = (id)response; | ||
|
|
@@ -131,18 +132,18 @@ - (NSHTTPURLResponse *)runLogin | |
| { | ||
| json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error]; | ||
| } | ||
|
|
||
| XCTAssertNotNil(json, @"The response is not a json object"); | ||
| XCTAssertEqualObjects(json[@"status"], @"SUCCESS", @"The response does to return a successful status"); | ||
| XCTAssertNotNil(json[@"user_token"], @"The response does not contain a user token"); | ||
|
|
||
| [expectation fulfill]; | ||
| }]; | ||
|
|
||
| [postDataTask resume]; | ||
|
|
||
| [self waitForExpectationsWithTimeout:10 handler:nil]; | ||
|
|
||
| return capturedResponse; | ||
| } | ||
|
|
||
|
|
@@ -152,36 +153,36 @@ - (NSHTTPURLResponse *)runGetCards | |
| NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url | ||
| cachePolicy:NSURLRequestUseProtocolCachePolicy | ||
| timeoutInterval:60.0]; | ||
|
|
||
| [request addValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; | ||
| [request addValue:@"application/json" forHTTPHeaderField:@"Accept"]; | ||
|
|
||
| request.HTTPMethod = @"GET"; | ||
|
|
||
| XCTestExpectation* expectation = [self expectationWithDescription:@"NSURLSessionDataTask completed"]; | ||
|
|
||
| __block NSHTTPURLResponse *capturedResponse; | ||
| NSURLSessionDataTask *getDataTask = [self.session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { | ||
| if ([response isKindOfClass:[NSHTTPURLResponse class]]) capturedResponse = (id)response; | ||
| XCTAssertNil(error, @"Error while getting cards."); | ||
|
|
||
| NSArray *json = nil; | ||
| if(!error && [@"application/json" isEqual:response.MIMEType]) | ||
| { | ||
| json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error]; | ||
| } | ||
|
|
||
| XCTAssertNotNil(json, @"The response is not a json object"); | ||
| XCTAssertEqual(json.count, 2, @"The response does not contain 2 cards"); | ||
| XCTAssertEqualObjects([json firstObject][@"amount"], @"$25.28", @"The first card amount does not match"); | ||
|
|
||
| [expectation fulfill]; | ||
| }]; | ||
|
|
||
| [getDataTask resume]; | ||
|
|
||
| [self waitForExpectationsWithTimeout:10 handler:nil]; | ||
|
|
||
| return capturedResponse; | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add two spaces after the
.(like you can see for other entries).(This is a Markdown-specific stuff that makes the text on the next line actually be rendered in a new line in same paragraph instead of being joined on the same line)