Merge branch 'master' into separate-demo

spotify · Feb 2, 2016 · fce738f · fce738f
2 parents 9f537f0 + 4e2bd2b
commit fce738f
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 0 deletions.
diff --git a/SPTDataLoader/SPTDataLoaderRequest.m b/SPTDataLoader/SPTDataLoaderRequest.m
@@ -171,6 +171,11 @@ + (NSString *)languageHeaderValue
     return languageHeaderValue;
 }
 
+- (NSString *)debugDescription
+{
+    return [NSString stringWithFormat:@"%@ { URL: %@ }", [super debugDescription], self.URL];
+}
+
 #pragma mark NSCopying
 
 - (id)copyWithZone:(NSZone *)zone

diff --git a/SPTDataLoader/SPTDataLoaderResponse.m b/SPTDataLoader/SPTDataLoaderResponse.m
@@ -181,4 +181,10 @@ - (NSDate *)retryAfterForHeaders:(NSDictionary *)headers
     return [httpDateFormatter dateFromString:retryAfterValue];
 }
 
+- (NSString *)debugDescription
+{
+    return [NSString stringWithFormat:@"%@ { URL: %@ } { status code: %ld, headers: %@ }", [super debugDescription], self.response.URL, (long)self.statusCode, self.responseHeaders];
+}
+
+
 @end
diff --git a/SPTDataLoaderTests/SPTDataLoaderRequestTest.m b/SPTDataLoaderTests/SPTDataLoaderRequestTest.m
@@ -161,4 +161,14 @@ - (void)testAcceptLanguageWithNoEnglishLanguages
     XCTAssertEqualObjects(@"fr-CA, pt-PT;q=0.50, en;q=0.01", languageValues);
 }
 
+- (void)testDebugDescription
+{
+    XCTAssertNotNil(self.request.debugDescription,
+                    @"The debugDescription shouldn't be nil.");
+
+    NSString *URLString = [NSString stringWithFormat:@"URL: %@", self.URL.absoluteString];
+    XCTAssertTrue([self.request.debugDescription containsString:URLString],
+                  @"The debugDescription should contain the URL of the request.");
+}
+
 @end
diff --git a/SPTDataLoaderTests/SPTDataLoaderResponseTest.m b/SPTDataLoaderTests/SPTDataLoaderResponseTest.m
@@ -184,4 +184,23 @@ - (void)testShouldNotRetryForCancelled
     XCTAssertFalse(shouldRetry, @"The response should not retry when the connection was cancelled");
 }
 
+- (void)testDebugDescription
+{
+    XCTAssertNotNil(self.response.debugDescription,
+                    @"The debugDescription shouldn't be nil.");
+
+    NSString *URLString = [NSString stringWithFormat:@"URL: %@", self.urlResponse.URL];
+    XCTAssertTrue([self.response.debugDescription containsString:URLString],
+                  @"The debugDescription should contain the URL of the response");
+
+    NSString *statusCodeString = [NSString stringWithFormat:@"status code: %ld", (long)self.response.statusCode];
+    XCTAssertTrue([self.response.debugDescription containsString:statusCodeString],
+                  @"The debugDescription should contain the status code of the response");
+
+    NSString *headersString = [NSString stringWithFormat:@"headers: %@", self.response.responseHeaders];
+    XCTAssertTrue([self.response.debugDescription containsString:headersString],
+                  @"The debugDescription should contain the headers code of the response");
+}
+
+
 @end