fixed JSONArray objectAtIndexedSubscript

Stefan-Hintz · Stefan-Hintz · commit ef032159ae02 · 2014-04-15T19:40:56.000+02:00
diff --git a/JSONModel/JSONModel/JSONModelArray.h b/JSONModel/JSONModel/JSONModelArray.h
@@ -38,8 +38,11 @@
 - (id)initWithArray:(NSArray *)array modelClass:(Class)cls;
 
 - (id)objectAtIndex:(NSUInteger)index;
+- (id)objectAtIndexedSubscript:(NSUInteger)index;
 - (void)forwardInvocation:(NSInvocation *)anInvocation;
 - (NSUInteger)count;
+- (id)firstObject;
+- (id)lastObject;
 
 /**
  * Looks up the array's contents and tries to find a JSONModel object
diff --git a/JSONModel/JSONModel/JSONModelArray.m b/JSONModel/JSONModel/JSONModelArray.m
@@ -34,27 +34,32 @@ - (id)initWithArray:(NSArray *)array modelClass:(Class)cls
     return self;
 }
 
--(id)firstObject
+- (id)firstObject
 {
     return [self objectAtIndex:0];
 }
 
--(id)lastObject
+- (id)lastObject
 {
-    return [self objectAtIndex: _storage.count-1];
+    return [self objectAtIndex:_storage.count - 1];
 }
 
--(id)objectAtIndex:(NSUInteger)index
+- (id)objectAtIndex:(NSUInteger)index
 {
-    id obj = _storage[index];
-    if (![obj isMemberOfClass:_targetClass]) {
+	return [self objectAtIndexedSubscript:index];
+}
+
+- (id)objectAtIndexedSubscript:(NSUInteger)index
+{
+    id object = _storage[index];
+    if (![object isMemberOfClass:_targetClass]) {
         NSError* err = nil;
-        obj = [[_targetClass alloc] initWithDictionary:obj error:&err];
-        if (obj) {
-            _storage[index] = obj;
+        object = [[_targetClass alloc] initWithDictionary:object error:&err];
+        if (object) {
+            _storage[index] = object;
         }
     }
-    return obj;
+    return object;
 }
 
 - (void)forwardInvocation:(NSInvocation *)anInvocation
diff --git a/JSONModelDemoTests/UnitTests/ArrayTests.m b/JSONModelDemoTests/UnitTests/ArrayTests.m
@@ -38,14 +38,24 @@ -(void)testLoading
     XCTAssertEqualObjects([[repos.repositories[0] class] description], @"GitHubRepoModel", @".properties[0] is not a GitHubRepoModel");
 }
 
--(void)testCount
+- (void)testCount
 {
     XCTAssertEqualObjects(@(repos.repositories.count), @100, @"wrong count");
+}
 
-	NSError *err;
-	repos = [[ReposModel alloc] initWithString:@"{}" error:&err];
+- (void)testReadArray
+{
+	JSONModelArray *array = [JSONModelArray new];
 
-	XCTAssertEqualObjects(@(repos.repositories.count), @0, @"wrong count");
+	XCTAssertEqualObjects(@(array.count), @0, @"wrong count");
+	XCTAssertNil([array firstObject], @"first object of an empty array should be nil");
+	XCTAssertNil([array lastObject], @"last object of an empty array should be nil");
+//	XCTAssertThrows(array[0], @"read of empty array should throw an exception");
+//	XCTAssertThrows(array[2], @"read of empty array should throw an exception");
+//	XCTAssertNilThrows(array[-2], @"read of empty array should throw an exception");
+	XCTAssertNil(array[0], @"read of empty array should be nil");
+	XCTAssertNil(array[2], @"read of empty array should be nil");
+	XCTAssertNil(array[-2], @"read of empty array should be nil");
 }
 
 -(void)testFirstObject

Original file line number	Diff line number	Diff line change
`@@ -34,27 +34,32 @@ - (id)initWithArray:(NSArray *)array modelClass:(Class)cls`
`34`	`34`	`return self;`
`35`	`35`	`}`
`36`	`36`
`37`		`--(id)firstObject`
	`37`	`+- (id)firstObject`
`38`	`38`	`{`
`39`	`39`	`return [self objectAtIndex:0];`
`40`	`40`	`}`
`41`	`41`
`42`		`--(id)lastObject`
	`42`	`+- (id)lastObject`
`43`	`43`	`{`
`44`		`- return [self objectAtIndex: _storage.count-1];`
	`44`	`+ return [self objectAtIndex:_storage.count - 1];`
`45`	`45`	`}`
`46`	`46`
`47`		`--(id)objectAtIndex:(NSUInteger)index`
	`47`	`+- (id)objectAtIndex:(NSUInteger)index`
`48`	`48`	`{`
`49`		`- id obj = _storage[index];`
`50`		`- if (![obj isMemberOfClass:_targetClass]) {`
	`49`	`+ return [self objectAtIndexedSubscript:index];`
	`50`	`+}`
	`51`	`+`
	`52`	`+- (id)objectAtIndexedSubscript:(NSUInteger)index`
	`53`	`+{`
	`54`	`+ id object = _storage[index];`
	`55`	`+ if (![object isMemberOfClass:_targetClass]) {`
`51`	`56`	`NSError* err = nil;`
`52`		`- obj = [[_targetClass alloc] initWithDictionary:obj error:&err];`
`53`		`- if (obj) {`
`54`		`- _storage[index] = obj;`
	`57`	`+ object = [[_targetClass alloc] initWithDictionary:object error:&err];`
	`58`	`+ if (object) {`
	`59`	`+ _storage[index] = object;`
`55`	`60`	`}`
`56`	`61`	`}`
`57`		`- return obj;`
	`62`	`+ return object;`
`58`	`63`	`}`
`59`	`64`
`60`	`65`	`- (void)forwardInvocation:(NSInvocation *)anInvocation`