Add unit tests for models and fix for bugs found during unit tests

Vikas Dadheech · Vikas Dadheech · commit 686c8ed1d275 · 2019-01-02T17:34:22.000+05:30
diff --git a/MSGraphCoreSDK/MSGraphCoreSDK.xcodeproj/project.pbxproj b/MSGraphCoreSDK/MSGraphCoreSDK.xcodeproj/project.pbxproj
@@ -32,6 +32,11 @@
 		E52AD9F22133C8F9005FED47 /* MSURLSessionDataTaskTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E52AD9F12133C8F9005FED47 /* MSURLSessionDataTaskTests.m */; };
 		E52AD9F42133E171005FED47 /* MSURLSessionDownloadTaskTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E52AD9F32133E171005FED47 /* MSURLSessionDownloadTaskTests.m */; };
 		E52AD9F62133E740005FED47 /* MSURLSessionUploadTaskTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E52AD9F52133E73F005FED47 /* MSURLSessionUploadTaskTests.m */; };
+		E547CE2321DC8551008D0925 /* MSDateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E547CE2021DC8551008D0925 /* MSDateTests.m */; };
+		E547CE2421DC8551008D0925 /* MSCollectionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E547CE2121DC8551008D0925 /* MSCollectionTests.m */; };
+		E547CE2521DC8551008D0925 /* MSObjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E547CE2221DC8551008D0925 /* MSObjectTests.m */; };
+		E547CE2721DC9CF6008D0925 /* MSTimeOfDayTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E547CE2621DC9CF6008D0925 /* MSTimeOfDayTests.m */; };
+		E55DFCBE21DCD21C00DE305D /* NSDate+MSSerializationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E55DFCBD21DCD21C00DE305D /* NSDate+MSSerializationTests.m */; };
 		E566782E2150BC4F00C6B7AE /* MSRedirectHandlerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E566782D2150BC4F00C6B7AE /* MSRedirectHandlerTests.m */; };
 		E56678302150E1AF00C6B7AE /* MSAuthenticationHandlerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E566782F2150E1AF00C6B7AE /* MSAuthenticationHandlerTests.m */; };
 		E56FDB9321D36A98001DFE68 /* MSURLSessionDownloadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = E56FDB8B21D36A98001DFE68 /* MSURLSessionDownloadTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -116,6 +121,11 @@
 		E52AD9F12133C8F9005FED47 /* MSURLSessionDataTaskTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSURLSessionDataTaskTests.m; sourceTree = "<group>"; };
 		E52AD9F32133E171005FED47 /* MSURLSessionDownloadTaskTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSURLSessionDownloadTaskTests.m; sourceTree = "<group>"; };
 		E52AD9F52133E73F005FED47 /* MSURLSessionUploadTaskTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSURLSessionUploadTaskTests.m; sourceTree = "<group>"; };
+		E547CE2021DC8551008D0925 /* MSDateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSDateTests.m; sourceTree = "<group>"; };
+		E547CE2121DC8551008D0925 /* MSCollectionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSCollectionTests.m; sourceTree = "<group>"; };
+		E547CE2221DC8551008D0925 /* MSObjectTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSObjectTests.m; sourceTree = "<group>"; };
+		E547CE2621DC9CF6008D0925 /* MSTimeOfDayTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSTimeOfDayTests.m; sourceTree = "<group>"; };
+		E55DFCBD21DCD21C00DE305D /* NSDate+MSSerializationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDate+MSSerializationTests.m"; sourceTree = "<group>"; };
 		E566782D2150BC4F00C6B7AE /* MSRedirectHandlerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRedirectHandlerTests.m; sourceTree = "<group>"; };
 		E566782F2150E1AF00C6B7AE /* MSAuthenticationHandlerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSAuthenticationHandlerTests.m; sourceTree = "<group>"; };
 		E56FDB8B21D36A98001DFE68 /* MSURLSessionDownloadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSURLSessionDownloadTask.h; sourceTree = "<group>"; };
@@ -238,6 +248,7 @@
 		E5069AD7211C1AD500432372 /* MSGraphCoreSDKTests */ = {
 			isa = PBXGroup;
 			children = (
+				E547CE1F21D61561008D0925 /* Models */,
 				E5204FFC2173A79100E64160 /* GraphContent */,
 				E5B6DB6921497A3300836E1D /* Frameworks */,
 				E573EE1121367A4000C5E884 /* HTTPClient */,
@@ -319,6 +330,18 @@
 			path = Middleware;
 			sourceTree = "<group>";
 		};
+		E547CE1F21D61561008D0925 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				E547CE2121DC8551008D0925 /* MSCollectionTests.m */,
+				E547CE2021DC8551008D0925 /* MSDateTests.m */,
+				E547CE2221DC8551008D0925 /* MSObjectTests.m */,
+				E547CE2621DC9CF6008D0925 /* MSTimeOfDayTests.m */,
+				E55DFCBD21DCD21C00DE305D /* NSDate+MSSerializationTests.m */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
 		E56FDB8A21D36A98001DFE68 /* Session Tasks */ = {
 			isa = PBXGroup;
 			children = (
@@ -648,11 +671,16 @@
 				E573EE092134167400C5E884 /* MSClientFactoryTests.m in Sources */,
 				E566782E2150BC4F00C6B7AE /* MSRedirectHandlerTests.m in Sources */,
 				E573EE0B213427ED00C5E884 /* MSURLSessionTaskDelegateTests.m in Sources */,
+				E547CE2321DC8551008D0925 /* MSDateTests.m in Sources */,
 				E5ECE09E2142992F00A289C2 /* MSMiddlewareFactoryTests.m in Sources */,
 				E5069AE2211C323D00432372 /* MSURLSessionManagerTests.m in Sources */,
 				E52AD9F62133E740005FED47 /* MSURLSessionUploadTaskTests.m in Sources */,
+				E547CE2721DC9CF6008D0925 /* MSTimeOfDayTests.m in Sources */,
 				E5069AD9211C1AD500432372 /* MSGraphCoreSDKTests.m in Sources */,
+				E547CE2421DC8551008D0925 /* MSCollectionTests.m in Sources */,
 				E52AD9F02133C766005FED47 /* MSURLSessionTaskTests.m in Sources */,
+				E547CE2521DC8551008D0925 /* MSObjectTests.m in Sources */,
+				E55DFCBE21DCD21C00DE305D /* NSDate+MSSerializationTests.m in Sources */,
 				E52AD9F22133C8F9005FED47 /* MSURLSessionDataTaskTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/MSGraphCoreSDK/MSGraphCoreSDK/Models/MSCollection.m b/MSGraphCoreSDK/MSGraphCoreSDK/Models/MSCollection.m
@@ -36,7 +36,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary
     self = [super initWithDictionary:dictionary];
     if(self)
     {
-        self.value = [[self getDictionary] objectForKey:@"values"];
+        self.value = [[self getDictionary] objectForKey:@"value"];
         self.nextLink = [NSURL URLWithString:[[self getDictionary] objectForKey:@"@odata.nextLink"]];
         self.additionalData = [self getDictionary];
     }
diff --git a/MSGraphCoreSDK/MSGraphCoreSDK/Models/MSObject.h b/MSGraphCoreSDK/MSGraphCoreSDK/Models/MSObject.h
@@ -7,7 +7,7 @@
 /*
  Creates an MSObject with the given data.
  @param data The NSData instance from the response.
- @error If there are any errors during the conversion of data then it will be assigned to this.
+ @param error If an error occurs, the error parameter will be set and the return value will be nil.
  @warning This method will return nil if the data is nil.
  */
 -(instancetype)initWithData:(NSData *)data error:(NSError **)error;;
@@ -27,7 +27,7 @@ This method returns the underlying dictionary which is used to construct the mod
 
 /*
  This method converts the internal dictionary to serialized data.
- @param error If there are any errors during the conversion of internal dictionary then it will be assigned to this.
+ @param error If an error occurs, the error parameter will be set and the return value will be nil.
  @return NSData representation of the internal dictionary,
  */
 - (NSData *)getSerializedDataWithError:(NSError **)error;;
diff --git a/MSGraphCoreSDK/MSGraphCoreSDK/Models/MSTimeOfDay.h b/MSGraphCoreSDK/MSGraphCoreSDK/Models/MSTimeOfDay.h
@@ -17,15 +17,15 @@
  @param minute Integer value denoting the minutes of that hour
  @param second Integer value denoting the seconds of that minute
  */
-+ (instancetype) timeWithSeconds:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second;
++ (instancetype) timeWithHour:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second;
 
 /*
  Instance method to create an instance of MSTimeOfDay
  @param hour Integer value denoting the hour of day
  @param minute Integer value denoting the minutes of that hour
  @param second Integer value denoting the seconds of that minute
  */
-- (id) initWithSeconds:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second;
+- (id) initWithHour:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second;
 
 /*
  This method generates a string equivalent of MSTimeOfDay instance.
diff --git a/MSGraphCoreSDK/MSGraphCoreSDK/Models/MSTimeOfDay.m b/MSGraphCoreSDK/MSGraphCoreSDK/Models/MSTimeOfDay.m
@@ -2,7 +2,7 @@
 
 #import "MSTimeOfDay.h"
 
-static NSString *dateFormat = @"HH:mm:SS";
+static NSString *dateFormat = @"HH:mm:ss";
 
 @interface MSTimeOfDay ()
 
@@ -14,9 +14,9 @@ @implementation MSTimeOfDay
 
 #pragma mark - Initializers
 
-+ (instancetype) timeWithSeconds:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second
++ (instancetype) timeWithHour:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second
 {
-    return [[MSTimeOfDay alloc] initWithSeconds:hour minute:minute second:second];
+    return [[MSTimeOfDay alloc] initWithHour:hour minute:minute second:second];
 }
 
 - (id) initWithNSDate:(NSDate*)date
@@ -28,7 +28,7 @@ - (id) initWithNSDate:(NSDate*)date
     return self;
 }
 
-- (id) initWithSeconds:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second
+- (id) initWithHour:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second
 {
     if (self = [super init])
     {
@@ -46,19 +46,19 @@ - (id) initWithSeconds:(NSInteger)hour minute:(NSInteger)minute second:(NSIntege
 
 - (NSInteger) hour
 {
-    NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitYear fromDate:self.date];
+    NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitHour fromDate:self.date];
     return components.hour;
 }
 
 - (NSInteger) minute
 {
-    NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitMonth fromDate:self.date];
+    NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitMinute fromDate:self.date];
     return components.minute;
 }
 
 - (NSInteger) second
 {
-    NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitDay fromDate:self.date];
+    NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitSecond fromDate:self.date];
     return components.second;
 }
 
diff --git a/MSGraphCoreSDK/MSGraphCoreSDK/Models/NSDate+MSSerialization.m b/MSGraphCoreSDK/MSGraphCoreSDK/Models/NSDate+MSSerialization.m
@@ -5,7 +5,7 @@
 @implementation NSDate (Serialization)
 
 static NSString *dateFormatWithMillis = @"yyyy-MM-dd'T'HH:mm:ss.SSSSSSZ";
-static NSString *dateFormatWithoutMillis = @"yyyy-MM-dd'T'HH:mm:ssZ";
+static NSString *dateFormatWithoutMillis = @"yyyy-MM-dd'T'HH:mm:ssZZZZZ";
 
 - (NSString *)ms_toString
 {
diff --git a/MSGraphCoreSDK/MSGraphCoreSDKTests/Models/MSCollectionTests.m b/MSGraphCoreSDK/MSGraphCoreSDKTests/Models/MSCollectionTests.m
@@ -0,0 +1,77 @@
+//
+// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
+//
+
+#import <XCTest/XCTest.h>
+#import "MSCollection.h"
+#import "MSConstants.h"
+
+@interface MSCollectionTests : XCTestCase
+@end
+
+@implementation MSCollectionTests {
+    NSDictionary *collectionDictionary;
+    NSArray *valueArray;
+    NSURL *nextLink;
+}
+
+- (void)setUp {
+    [super setUp];
+   NSDictionary *userItemDict1 = @{
+                     @"@odata.context": @"https://graph.microsoft.com/v1.0/$metadata#users/$entity",
+                     @"displayName": @"Tester 1",
+                     @"mail": @"tester1@graphsdk.onmicrosoft.com"};
+    NSDictionary *userItemDict2 = @{
+                                    @"@odata.context": @"https://graph.microsoft.com/v1.0/$metadata#users/$entity",
+                                    @"displayName": @"Tester 2",
+                                    @"mail": @"tester2@graphsdk.onmicrosoft.com"};
+    nextLink = [NSURL URLWithString:MSGraphBaseURL];
+    valueArray = @[userItemDict1, userItemDict2];
+    collectionDictionary = @{
+                             @"@odata.context": @"https://graph.microsoft.com/v1.0/$metadata#users",
+                             @"@odata.nextLink": [nextLink absoluteString],
+                             @"value": valueArray
+                             };
+}
+
+- (void)tearDown {
+    [super tearDown];
+}
+
+- (void)testInitWithArray {
+    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:@"testDict",@"dictKey1", nil];
+    
+    MSCollection *msCollection = [[MSCollection alloc] initWithArray:valueArray nextLink:[nextLink absoluteString] additionalData:dic];
+    XCTAssertNotNil(msCollection);
+    XCTAssertEqualObjects(msCollection.value, valueArray);
+    XCTAssertTrue([msCollection.nextLink.absoluteString isEqualToString:[nextLink absoluteString]]);
+    XCTAssertEqualObjects(msCollection.additionalData, dic);
+    
+}
+
+- (void)testInitWithData {
+    NSError *error;
+    NSData *collectionData = [NSJSONSerialization dataWithJSONObject:collectionDictionary options:kNilOptions error:&error];
+    XCTAssertNil(error);
+
+    MSCollection *msCollection = [[MSCollection alloc] initWithData:collectionData error:&error];
+    XCTAssertNil(error);
+    XCTAssertNotNil(msCollection);
+    XCTAssertEqualObjects(msCollection.value, valueArray);
+    XCTAssertTrue([msCollection.nextLink.absoluteString isEqualToString:[nextLink absoluteString]]);
+    XCTAssertEqualObjects(msCollection.additionalData, collectionDictionary);
+
+}
+
+- (void)testInitWithDictionary {
+    NSError *error;
+    MSCollection *msCollection = [[MSCollection alloc] initWithDictionary:collectionDictionary];
+    XCTAssertNil(error);
+    XCTAssertNotNil(msCollection);
+    XCTAssertEqualObjects(msCollection.value, valueArray);
+    XCTAssertTrue([msCollection.nextLink.absoluteString isEqualToString:[nextLink absoluteString]]);
+    XCTAssertEqualObjects(msCollection.additionalData, collectionDictionary);
+}
+
+
+@end
diff --git a/MSGraphCoreSDK/MSGraphCoreSDKTests/Models/MSDateTests.m b/MSGraphCoreSDK/MSGraphCoreSDKTests/Models/MSDateTests.m
@@ -0,0 +1,107 @@
+//
+// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
+//
+
+#import <XCTest/XCTest.h>
+#import <Foundation/Foundation.h>
+#import "MSDate.h"
+
+@interface MSDate (Test)
+
+@property (nonatomic, strong) NSDate *date;
+
+@end
+
+@interface MSDateTests : XCTestCase
+@property NSInteger testYear;
+@property NSInteger testMonth;
+@property NSInteger testDay;
+@property NSDateComponents *dateComponents;
+@end
+
+@implementation MSDateTests
+
+- (void)setUp {
+    [super setUp];
+    self.testYear = 2016;
+    self.testMonth = 6;
+    self.testDay = 11;
+    self.dateComponents = [[NSDateComponents alloc] init];
+    self.dateComponents.year = _testYear;
+    self.dateComponents.month = _testMonth;
+    self.dateComponents.day = _testDay;
+    self.dateComponents.calendar = [NSCalendar currentCalendar];
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+    [super tearDown];
+}
+-(void)testInit{
+    MSDate *msdate = [MSDate date];
+    XCTAssertNotNil(msdate);
+    
+    msdate = [MSDate dateWithYear:_testYear month:_testMonth day:_testDay];
+    XCTAssertNotNil(msdate);
+    
+    XCTAssertNoThrow([MSDate dateWithYear:0 month:0 day:0]);
+}
+
+-(void)testInitWithNSDate{
+    NSDate *nowData = [NSDate date];
+    MSDate *msdate = [[MSDate alloc] initWithNSDate: nowData];
+    XCTAssertNotNil(msdate);
+    XCTAssertEqualObjects(msdate.date, nowData);
+}
+-(void)testInitWithNilNSDate{
+    MSDate *msdate = [[MSDate alloc] initWithNSDate: nil];
+    XCTAssertNotNil(msdate);
+    XCTAssertNil(msdate.date);
+}
+-(void)testInitWithYear{
+    MSDate *msdate = [[MSDate alloc] initWithYear:_testYear month:_testMonth day:_testDay];
+    XCTAssertEqualObjects(msdate.date, [_dateComponents date]);
+}
+
+-(void)testMSDatePropertiesFromInitWithYear{
+    MSDate *msdate = [[MSDate alloc] initWithYear:_testYear month:_testMonth day:_testDay];
+    XCTAssertEqual([msdate year], _testYear);
+    XCTAssertEqual(msdate.month, _testMonth);
+    XCTAssertEqual(msdate.day, _testDay);
+}
+-(void)testMSDateProertiesFromInitWithDate{
+    
+    NSDate *nowData = [NSDate date];
+    MSDate *msdate = [[MSDate alloc] initWithNSDate: nowData];
+    NSDateComponents *components = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear fromDate:[NSDate date]];
+    XCTAssertEqual(msdate.year, components.year);
+    XCTAssertEqual(msdate.month, components.month);
+    XCTAssertEqual(msdate.day, components.day);
+    
+}
+
+-(void)testMS_toString{
+    MSDate *msdate = [[MSDate alloc] initWithYear:_testYear month:_testMonth day:_testDay];
+    NSString *dateString = [msdate ms_toString];
+    NSString *expectedString =[NSString stringWithFormat:@"%@-0%@-%@",[@(_testYear) stringValue],[@(_testMonth) stringValue],[@(_testDay) stringValue]];
+    XCTAssertEqualObjects(dateString, expectedString);
+}
+
+-(void)testMS_dateFromString{
+    MSDate *msdate = [MSDate ms_dateFromString:[NSString stringWithFormat:@"%@-0%@-%@",[@(_testYear) stringValue],[@(_testMonth) stringValue],[@(_testDay) stringValue]]];
+    
+    XCTAssertNotNil(msdate);
+    XCTAssertEqualObjects(msdate.date, [_dateComponents date]);
+}
+-(void)testMS_dateFromNilString{
+    MSDate *msdate = [MSDate ms_dateFromString:nil];
+    XCTAssertNotNil(msdate);
+    XCTAssertNil(msdate.date);
+}
+-(void)testMS_dateFromInvalidFormatterString{
+    MSDate *msdate = [MSDate ms_dateFromString:@"test"];
+    XCTAssertNotNil(msdate);
+    XCTAssertNil(msdate.date);
+}
+
+@end
diff --git a/MSGraphCoreSDK/MSGraphCoreSDKTests/Models/MSObjectTests.m b/MSGraphCoreSDK/MSGraphCoreSDKTests/Models/MSObjectTests.m
diff --git a/MSGraphCoreSDK/MSGraphCoreSDKTests/Models/MSTimeOfDayTests.m b/MSGraphCoreSDK/MSGraphCoreSDKTests/Models/MSTimeOfDayTests.m
diff --git a/MSGraphCoreSDK/MSGraphCoreSDKTests/Models/NSDate+MSSerializationTests.m b/MSGraphCoreSDK/MSGraphCoreSDKTests/Models/NSDate+MSSerializationTests.m

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary`
`36`	`36`	`self = [super initWithDictionary:dictionary];`
`37`	`37`	`if(self)`
`38`	`38`	`{`
`39`		`- self.value = [[self getDictionary] objectForKey:@"values"];`
	`39`	`+ self.value = [[self getDictionary] objectForKey:@"value"];`
`40`	`40`	`self.nextLink = [NSURL URLWithString:[[self getDictionary] objectForKey:@"@odata.nextLink"]];`
`41`	`41`	`self.additionalData = [self getDictionary];`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#import "MSTimeOfDay.h"`
`4`	`4`
`5`		`-static NSString *dateFormat = @"HH:mm:SS";`
	`5`	`+static NSString *dateFormat = @"HH:mm:ss";`
`6`	`6`
`7`	`7`	`@interface MSTimeOfDay ()`
`8`	`8`
`@@ -14,9 +14,9 @@ @implementation MSTimeOfDay`
`14`	`14`
`15`	`15`	`#pragma mark - Initializers`
`16`	`16`
`17`		`-+ (instancetype) timeWithSeconds:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second`
	`17`	`++ (instancetype) timeWithHour:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second`
`18`	`18`	`{`
`19`		`- return [[MSTimeOfDay alloc] initWithSeconds:hour minute:minute second:second];`
	`19`	`+ return [[MSTimeOfDay alloc] initWithHour:hour minute:minute second:second];`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`- (id) initWithNSDate:(NSDate*)date`
`@@ -28,7 +28,7 @@ - (id) initWithNSDate:(NSDate*)date`
`28`	`28`	`return self;`
`29`	`29`	`}`
`30`	`30`
`31`		`-- (id) initWithSeconds:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second`
	`31`	`+- (id) initWithHour:(NSInteger)hour minute:(NSInteger)minute second:(NSInteger)second`
`32`	`32`	`{`
`33`	`33`	`if (self = [super init])`
`34`	`34`	`{`
`@@ -46,19 +46,19 @@ - (id) initWithSeconds:(NSInteger)hour minute:(NSInteger)minute second:(NSIntege`
`46`	`46`
`47`	`47`	`- (NSInteger) hour`
`48`	`48`	`{`
`49`		`- NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitYear fromDate:self.date];`
	`49`	`+ NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitHour fromDate:self.date];`
`50`	`50`	`return components.hour;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`- (NSInteger) minute`
`54`	`54`	`{`
`55`		`- NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitMonth fromDate:self.date];`
	`55`	`+ NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitMinute fromDate:self.date];`
`56`	`56`	`return components.minute;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`- (NSInteger) second`
`60`	`60`	`{`
`61`		`- NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitDay fromDate:self.date];`
	`61`	`+ NSDateComponents *components = [[MSTimeOfDay gregorianCalendar] components:NSCalendarUnitSecond fromDate:self.date];`
`62`	`62`	`return components.second;`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`@implementation NSDate (Serialization)`
`6`	`6`
`7`	`7`	`static NSString *dateFormatWithMillis = @"yyyy-MM-dd'T'HH:mm:ss.SSSSSSZ";`
`8`		`-static NSString *dateFormatWithoutMillis = @"yyyy-MM-dd'T'HH:mm:ssZ";`
	`8`	`+static NSString *dateFormatWithoutMillis = @"yyyy-MM-dd'T'HH:mm:ssZZZZZ";`
`9`	`9`
`10`	`10`	`- (NSString *)ms_toString`
`11`	`11`	`{`