1515
1616#import " CommentResource.h"
1717#import " PeopleResource.h"
18- #import " PostResource .h"
18+ #import " ArticleResource .h"
1919
2020@interface JSONAPITests : XCTestCase
2121
@@ -28,7 +28,7 @@ - (void)setUp {
2828
2929 [JSONAPIResourceDescriptor addResource: [CommentResource class ]];
3030 [JSONAPIResourceDescriptor addResource: [PeopleResource class ]];
31- [JSONAPIResourceDescriptor addResource: [PostResource class ]];
31+ [JSONAPIResourceDescriptor addResource: [ArticleResource class ]];
3232}
3333
3434- (void )tearDown {
@@ -43,18 +43,18 @@ - (void)testMeta {
4343 XCTAssertEqualObjects (jsonAPI.meta [@" hehe" @" hoho" @" Meta's 'hehe' should equal 'hoho'"
4444}
4545
46- - (void )testDataPosts {
46+ - (void )testDataArticles {
4747 NSDictionary *json = [self mainExampleJSON ];
4848 JSONAPI *jsonAPI = [JSONAPI jsonAPIWithDictionary: json];
4949
5050 XCTAssertNotNil (jsonAPI.resource , @" Resource should not be nil"
5151 XCTAssertNotNil (jsonAPI.resources , @" Resources should not be nil"
5252 XCTAssertEqual (jsonAPI.resources .count , 1 , @" Resources should contain 1 resource"
5353
54- PostResource *post = jsonAPI.resource ;
55- XCTAssert ([post isKindOfClass: [PostResource class ]], @" Post should be a PostResource "
56- XCTAssertEqualObjects (post .ID , @" 1" @" Post id should be 1"
57- XCTAssertEqualObjects (post .title , @" JSON API paints my bikeshed!" @" Post title should be 'JSON API paints my bikeshed!'"
54+ ArticleResource *article = jsonAPI.resource ;
55+ XCTAssert ([article isKindOfClass: [ArticleResource class ]], @" Article should be a ArticleResource "
56+ XCTAssertEqualObjects (article .ID , @" 1" @" Article id should be 1"
57+ XCTAssertEqualObjects (article .title , @" JSON API paints my bikeshed!" @" Article title should be 'JSON API paints my bikeshed!'"
5858}
5959
6060- (void )testIncludedPeopleAndComments {
@@ -66,14 +66,14 @@ - (void)testIncludedPeopleAndComments {
6666
6767}
6868
69- - (void )testDataPostAuthorAndComments {
69+ - (void )testDataArticleAuthorAndComments {
7070 NSDictionary *json = [self mainExampleJSON ];
7171 JSONAPI *jsonAPI = [JSONAPI jsonAPIWithDictionary: json];
7272
73- PostResource *post = jsonAPI.resource ;
74- XCTAssertNotNil (post .author , @" Post's author should not be nil"
75- XCTAssertNotNil (post .comments , @" Post's comments should not be nil"
76- XCTAssertEqual (post .comments .count , 2 , @" Post should contain 2 comments"
73+ ArticleResource *article = jsonAPI.resource ;
74+ XCTAssertNotNil (article .author , @" Article author should not be nil"
75+ XCTAssertNotNil (article .comments , @" Article comments should not be nil"
76+ XCTAssertEqual (article .comments .count , 2 , @" Article should contain 2 comments"
7777}
7878
7979- (void )testIncludedCommentIsLinked {
@@ -82,7 +82,7 @@ - (void)testIncludedCommentIsLinked {
8282
8383 CommentResource *comment = [jsonAPI includedResource: @" 5" withType: @" comments"
8484 XCTAssertNotNil (comment.author , @" Comment's author should not be nil"
85- XCTAssertEqualObjects (comment.author .ID , @" 9 " @" Comment's author's ID should be 9 "
85+ XCTAssertEqualObjects (comment.author .ID , @" 2 " @" Comment's author's ID should be 2 "
8686}
8787
8888- (void )testNoError {
@@ -115,12 +115,12 @@ - (void)testSerializeSimple {
115115}
116116
117117- (void )testSerializeWithFormat {
118- PostResource *newPost = [[PostResource alloc ] init ];
119- newPost .title = @" Title"
120- newPost .date = [NSDate date ];
118+ ArticleResource *newArticle = [[ArticleResource alloc ] init ];
119+ newArticle .title = @" Title"
120+ newArticle .date = [NSDate date ];
121121
122- NSDictionary *json = [JSONAPIResourceParser dictionaryFor: newPost ];
123- XCTAssertEqualObjects (json[@" type" @" posts " @" Did not create post !"
122+ NSDictionary *json = [JSONAPIResourceParser dictionaryFor: newArticle ];
123+ XCTAssertEqualObjects (json[@" type" @" articles " @" Did not create article !"
124124 XCTAssertNotNil (json[@" attributes" @" date" @" Wrong date!"
125125 XCTAssertTrue ([json[@" attributes" @" date" isKindOfClass: [NSString class ]], @" Date should be string!."
126126}
@@ -137,23 +137,23 @@ - (void)testSerializeComplex {
137137 newComment.author = newAuthor;
138138 newComment.text = @" First!"
139139
140- PostResource *newPost = [[PostResource alloc ] init ];
141- newPost .title = @" Title"
142- newPost .author = newAuthor;
143- newPost .date = [NSDate date ];
144- newPost .comments = [[NSArray alloc ] initWithObjects: newComment, nil ];
145-
146- NSDictionary *json = [JSONAPIResourceParser dictionaryFor: newPost ];
147- XCTAssertEqualObjects (json[@" type" @" posts " @" Did not create Post !"
148- XCTAssertNotNil (json[@" links " @" Did not create links!"
149- XCTAssertNotNil (json[@" links " @" author" @" Did not create links!"
150- XCTAssertNotNil (json[@" links " @" author" @" linkage " @" Did not create links!"
151- XCTAssertEqualObjects (json[@" links " @" author" @" linkage " @" id" ID , @" Wrong link ID!."
152- XCTAssertNil (json[@" links " @" author" @" first-name" @" Bad link!"
153-
154- XCTAssertNotNil (json[@" links " @" comments" @" Did not create links!"
155- XCTAssertTrue ([json[@" links " @" comments" isKindOfClass: [NSArray class ]], @" Comments should be array!."
156- XCTAssertEqual ([json[@" links " @" comments" count ], 1 , @" Comments should have 1 element!."
140+ ArticleResource *newArticle = [[ArticleResource alloc ] init ];
141+ newArticle .title = @" Title"
142+ newArticle .author = newAuthor;
143+ newArticle .date = [NSDate date ];
144+ newArticle .comments = [[NSArray alloc ] initWithObjects: newComment, nil ];
145+
146+ NSDictionary *json = [JSONAPIResourceParser dictionaryFor: newArticle ];
147+ XCTAssertEqualObjects (json[@" type" @" articles " @" Did not create Article !"
148+ XCTAssertNotNil (json[@" relationships " @" Did not create links!"
149+ XCTAssertNotNil (json[@" relationships " @" author" @" Did not create links!"
150+ XCTAssertNotNil (json[@" relationships " @" author" @" data " @" Did not create links!"
151+ XCTAssertEqualObjects (json[@" relationships " @" author" @" data " @" id" ID , @" Wrong link ID!."
152+ XCTAssertNil (json[@" relationships " @" author" @" first-name" @" Bad link!"
153+
154+ XCTAssertNotNil (json[@" relationships " @" comments" @" Did not create links!"
155+ XCTAssertTrue ([json[@" relationships " @" comments" isKindOfClass: [NSArray class ]], @" Comments should be array!."
156+ XCTAssertEqual ([json[@" relationships " @" comments" count ], 1 , @" Comments should have 1 element!."
157157}
158158
159159- (void )testCreate {
0 commit comments