https://github.com/icanzilb/JSONModel/issues/222

icanzilb · icanzilb · commit d64ecb0c812a · 2014-08-10T19:27:44.000+03:00
diff --git a/JSONModelDemoTests/UnitTests/ArrayTests.m b/JSONModelDemoTests/UnitTests/ArrayTests.m
@@ -50,9 +50,6 @@ - (void)testReadArray
 	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");
diff --git a/JSONModelDemoTests/UnitTests/BuiltInConversionsTests.m b/JSONModelDemoTests/UnitTests/BuiltInConversionsTests.m
@@ -68,6 +68,8 @@ -(void)testConversions
     
     XCTAssertNotNil(b.timeZone, @"Time zone parsing did return nil");
     XCTAssertEqualObjects([b.timeZone name], @"PST", @"Time zone is not PST");
+    
+    XCTAssertTrue([b.stringArray.firstObject isKindOfClass:[NSString class]], @"The array element is not a string");
 }
 
 @end
diff --git a/JSONModelDemoTests/UnitTests/DataFiles/converts.json b/JSONModelDemoTests/UnitTests/DataFiles/converts.json
@@ -14,5 +14,7 @@
     
     "websiteURL": "http://www.visir.is/jordan-slaer-milljard-af-villunni-sinni/article/2013130709873?key1=test",
     
-    "timeZone": "PST"
+    "timeZone": "PST",
+    
+    "stringArray": ["one", "two", "three"]
 }
diff --git a/JSONModelDemoTests/UnitTests/TestModels/BuiltInConversionsModel.h b/JSONModelDemoTests/UnitTests/TestModels/BuiltInConversionsModel.h
@@ -36,4 +36,7 @@
 /* Time zone */
 @property (strong, nonatomic) NSTimeZone *timeZone;
 
+/* String array */
+@property (strong, nonatomic) NSArray* stringArray;
+
 @end
diff --git a/JSONModelDemos.xcworkspace/xcshareddata/JSONModelDemos.xccheckout b/JSONModelDemos.xcworkspace/xcshareddata/JSONModelDemos.xccheckout
@@ -2,35 +2,37 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
 	<key>IDESourceControlProjectIdentifier</key>
 	<string>9AD3690B-CC20-4B34-9CC2-2D4156FE27A2</string>
 	<key>IDESourceControlProjectName</key>
 	<string>JSONModelDemos</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>4A014B83-DCCD-4DD9-B00E-AA4F53FA1DA1</key>
+		<key>2454A7C0A4BC2A09472718EB55354F320600B245</key>
 		<string>https://github.com/icanzilb/JSONModel.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>JSONModelDemos.xcworkspace</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>4A014B83-DCCD-4DD9-B00E-AA4F53FA1DA1</key>
+		<key>2454A7C0A4BC2A09472718EB55354F320600B245</key>
 		<string>..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
 	<string>https://github.com/icanzilb/JSONModel.git</string>
 	<key>IDESourceControlProjectVersion</key>
-	<integer>110</integer>
+	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>4A014B83-DCCD-4DD9-B00E-AA4F53FA1DA1</string>
+	<string>2454A7C0A4BC2A09472718EB55354F320600B245</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>4A014B83-DCCD-4DD9-B00E-AA4F53FA1DA1</string>
+			<string>2454A7C0A4BC2A09472718EB55354F320600B245</string>
 			<key>IDESourceControlWCCName</key>
 			<string>JSONModel_master</string>
 		</dict>

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ -(void)testConversions`
`68`	`68`
`69`	`69`	`XCTAssertNotNil(b.timeZone, @"Time zone parsing did return nil");`
`70`	`70`	`XCTAssertEqualObjects([b.timeZone name], @"PST", @"Time zone is not PST");`
	`71`	`+`
	`72`	`+ XCTAssertTrue([b.stringArray.firstObject isKindOfClass:[NSString class]], @"The array element is not a string");`
`71`	`73`	`}`
`72`	`74`
`73`	`75`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,7 @@`
`14`	`14`
`15`	`15`	`"websiteURL": "http://www.visir.is/jordan-slaer-milljard-af-villunni-sinni/article/2013130709873?key1=test",`
`16`	`16`
`17`		`- "timeZone": "PST"`
	`17`	`+ "timeZone": "PST",`
	`18`	`+`
	`19`	`+ "stringArray": ["one", "two", "three"]`
`18`	`20`	`}`