Skip to content

Commit 475928e

Browse files
creocodercreocoder
committed
Refactored unit tests
1 parent b796df1 commit 475928e

13 files changed

+144
-60
lines changed

‎tests/TaggableBehaviorTest.php‎

Lines changed: 49 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testFindPosts()
3131
public function testFindPost()
3232
{
3333
$post = Post::findOne(2);
34-
$this->assertEquals('tag2, tag3, tag4', $post->tagNames);
34+
$this->assertEquals('tag2, tag3, tag4', $post->tagValues);
3535
}
3636

3737
public function testCreatePost()
@@ -48,63 +48,63 @@ public function testCreatePost()
4848
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
4949
}
5050

51-
public function testCreatePostSetTagNames()
51+
public function testCreatePostSetTagValues()
5252
{
5353
$post = new Post([
5454
'title' => 'New post title',
5555
'body' => 'New post body',
56-
'tagNames' => 'tag4, tag4, tag5, , tag6',
56+
'tagValues' => 'tag4, tag4, tag5, , tag6',
5757
]);
5858

5959
$this->assertTrue($post->save());
6060

6161
$dataSet = $this->getConnection()->createDataSet(['post', 'tag', 'post_tag_assn']);
62-
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-create-post-set-tag-names.xml');
62+
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-create-post-set-tag-values.xml');
6363
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
6464
}
6565

66-
public function testCreatePostSetTagNamesAsArray()
66+
public function testCreatePostSetTagValuesAsArray()
6767
{
6868
$post = new Post([
6969
'title' => 'New post title',
7070
'body' => 'New post body',
71-
'tagNames' => ['tag4', 'tag4', 'tag5', '', 'tag6'],
71+
'tagValues' => ['tag4', 'tag4', 'tag5', '', 'tag6'],
7272
]);
7373

7474
$this->assertTrue($post->save());
7575

7676
$dataSet = $this->getConnection()->createDataSet(['post', 'tag', 'post_tag_assn']);
77-
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-create-post-set-tag-names.xml');
77+
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-create-post-set-tag-values.xml');
7878
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
7979
}
8080

81-
public function testCreatePostAddTagNames()
81+
public function testCreatePostAddTagValues()
8282
{
8383
$post = new Post([
8484
'title' => 'New post title',
8585
'body' => 'New post body',
8686
]);
8787

88-
$post->addTagNames('tag4, tag4, tag5, , tag6');
88+
$post->addTagValues('tag4, tag4, tag5, , tag6');
8989
$this->assertTrue($post->save());
9090

9191
$dataSet = $this->getConnection()->createDataSet(['post', 'tag', 'post_tag_assn']);
92-
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-create-post-add-tag-names.xml');
92+
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-create-post-add-tag-values.xml');
9393
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
9494
}
9595

96-
public function testCreatePostAddTagNamesAsArray()
96+
public function testCreatePostAddTagValuesAsArray()
9797
{
9898
$post = new Post([
9999
'title' => 'New post title',
100100
'body' => 'New post body',
101101
]);
102102

103-
$post->addTagNames(['tag4', 'tag4', 'tag5', '', 'tag6']);
103+
$post->addTagValues(['tag4', 'tag4', 'tag5', '', 'tag6']);
104104
$this->assertTrue($post->save());
105105

106106
$dataSet = $this->getConnection()->createDataSet(['post', 'tag', 'post_tag_assn']);
107-
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-create-post-add-tag-names.xml');
107+
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-create-post-add-tag-values.xml');
108108
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
109109
}
110110

@@ -120,91 +120,104 @@ public function testUpdatePost()
120120
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
121121
}
122122

123-
public function testUpdatePostSetTagNames()
123+
public function testUpdatePostSetTagValues()
124124
{
125125
$post = Post::findOne(2);
126126
$post->title = 'Updated post title 2';
127127
$post->body = 'Updated post body 2';
128-
$post->tagNames = 'tag3, tag3, tag4, , tag6';
128+
$post->tagValues = 'tag3, tag3, tag4, , tag6';
129129
$this->assertTrue($post->save());
130130

131131
$dataSet = $this->getConnection()->createDataSet(['post', 'tag', 'post_tag_assn']);
132-
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-set-tag-names.xml');
132+
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-set-tag-values.xml');
133133
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
134134
}
135135

136-
public function testUpdatePostSetTagNamesAsArray()
136+
public function testUpdatePostSetTagValuesAsArray()
137137
{
138138
$post = Post::findOne(2);
139139
$post->title = 'Updated post title 2';
140140
$post->body = 'Updated post body 2';
141-
$post->tagNames = ['tag3', 'tag3', 'tag4', '', 'tag6'];
141+
$post->tagValues = ['tag3', 'tag3', 'tag4', '', 'tag6'];
142142
$this->assertTrue($post->save());
143143

144144
$dataSet = $this->getConnection()->createDataSet(['post', 'tag', 'post_tag_assn']);
145-
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-set-tag-names.xml');
145+
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-set-tag-values.xml');
146146
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
147147
}
148148

149-
public function testUpdatePostAddTagNames()
149+
public function testUpdatePostAddTagValues()
150150
{
151151
$post = Post::findOne(2);
152152
$post->title = 'Updated post title 2';
153153
$post->body = 'Updated post body 2';
154-
$post->addTagNames('tag3, tag3, , tag6');
154+
$post->addTagValues('tag3, tag3, , tag6');
155155
$this->assertTrue($post->save());
156156

157157
$dataSet = $this->getConnection()->createDataSet(['post', 'tag', 'post_tag_assn']);
158-
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-add-tag-names.xml');
158+
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-add-tag-values.xml');
159159
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
160160
}
161161

162-
public function testUpdatePostAddTagNamesAsArray()
162+
public function testUpdatePostAddTagValuesAsArray()
163163
{
164164
$post = Post::findOne(2);
165165
$post->title = 'Updated post title 2';
166166
$post->body = 'Updated post body 2';
167-
$post->addTagNames(['tag3', 'tag3', '', 'tag6']);
167+
$post->addTagValues(['tag3', 'tag3', '', 'tag6']);
168168
$this->assertTrue($post->save());
169169

170170
$dataSet = $this->getConnection()->createDataSet(['post', 'tag', 'post_tag_assn']);
171-
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-add-tag-names.xml');
171+
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-add-tag-values.xml');
172172
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
173173
}
174174

175-
public function testUpdatePostRemoveTagNames()
175+
public function testUpdatePostRemoveTagValues()
176176
{
177177
$post = Post::findOne(2);
178178
$post->title = 'Updated post title 2';
179179
$post->body = 'Updated post body 2';
180-
$post->removeTagNames('tag2, tag2, , tag4');
180+
$post->removeTagValues('tag2, tag2, , tag4');
181181
$this->assertTrue($post->save());
182182

183183
$dataSet = $this->getConnection()->createDataSet(['post', 'tag', 'post_tag_assn']);
184-
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-remove-tag-names.xml');
184+
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-remove-tag-values.xml');
185185
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
186186
}
187187

188-
public function testUpdatePostRemoveTagNamesAsArray()
188+
public function testUpdatePostRemoveTagValuesAsArray()
189189
{
190190
$post = Post::findOne(2);
191191
$post->title = 'Updated post title 2';
192192
$post->body = 'Updated post body 2';
193-
$post->removeTagNames(['tag2', 'tag2', '', 'tag4']);
193+
$post->removeTagValues(['tag2', 'tag2', '', 'tag4']);
194194
$this->assertTrue($post->save());
195195

196196
$dataSet = $this->getConnection()->createDataSet(['post', 'tag', 'post_tag_assn']);
197-
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-remove-tag-names.xml');
197+
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-remove-tag-values.xml');
198198
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
199199
}
200200

201-
public function testPostHasTagNames()
201+
public function testUpdatePostRemoveAllTagValues()
202202
{
203203
$post = Post::findOne(2);
204-
$this->assertTrue($post->hasTagNames('tag2, tag2, , tag4'));
205-
$this->assertTrue($post->hasTagNames(['tag2', 'tag2', '', 'tag4']));
206-
$this->assertFalse($post->hasTagNames('tag3, tag3, , tag5'));
207-
$this->assertFalse($post->hasTagNames(['tag3', 'tag3', '', 'tag5']));
204+
$post->title = 'Updated post title 2';
205+
$post->body = 'Updated post body 2';
206+
$post->removeAllTagValues();
207+
$this->assertTrue($post->save());
208+
209+
$dataSet = $this->getConnection()->createDataSet(['post', 'tag', 'post_tag_assn']);
210+
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/data/test-update-post-remove-all-tag-values.xml');
211+
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
212+
}
213+
214+
public function testPostHasTagValues()
215+
{
216+
$post = Post::findOne(2);
217+
$this->assertTrue($post->hasTagValues('tag2, tag2, , tag4'));
218+
$this->assertTrue($post->hasTagValues(['tag2', 'tag2', '', 'tag4']));
219+
$this->assertFalse($post->hasTagValues('tag3, tag3, , tag5'));
220+
$this->assertFalse($post->hasTagValues(['tag3', 'tag3', '', 'tag5']));
208221
}
209222

210223
public function testDeletePost()

‎tests/TaggableQueryBehaviorTest.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,76 +16,76 @@
1616
*/
1717
class TaggableQueryBehaviorTest extends DatabaseTestCase
1818
{
19-
public function testFindPostsAnyTagNames()
19+
public function testFindPostsAnyTagValues()
2020
{
2121
$data = [];
22-
$models = Post::find()->with('tags')->anyTagNames('tag1, tag1, , tag2')->all();
22+
$models = Post::find()->with('tags')->anyTagValues('tag1, tag1, , tag2')->all();
2323

2424
foreach ($models as $model) {
2525
$data[] = $model->toArray([], ['tags']);
2626
}
2727

28-
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-any-tag-names.php'), $data);
28+
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-any-tag-values.php'), $data);
2929
}
3030

31-
public function testFindPostsAnyTagNamesAsArray()
31+
public function testFindPostsAnyTagValuesAsArray()
3232
{
3333
$data = [];
34-
$models = Post::find()->with('tags')->anyTagNames(['tag1', 'tag1', '', 'tag2'])->all();
34+
$models = Post::find()->with('tags')->anyTagValues(['tag1', 'tag1', '', 'tag2'])->all();
3535

3636
foreach ($models as $model) {
3737
$data[] = $model->toArray([], ['tags']);
3838
}
3939

40-
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-any-tag-names.php'), $data);
40+
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-any-tag-values.php'), $data);
4141
}
4242

43-
public function testFindPostsAllTagNames()
43+
public function testFindPostsAllTagValues()
4444
{
4545
$data = [];
46-
$models = Post::find()->with('tags')->allTagNames('tag3, tag3, , tag4')->all();
46+
$models = Post::find()->with('tags')->allTagValues('tag3, tag3, , tag4')->all();
4747

4848
foreach ($models as $model) {
4949
$data[] = $model->toArray([], ['tags']);
5050
}
5151

52-
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-all-tag-names.php'), $data);
52+
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-all-tag-values.php'), $data);
5353
}
5454

55-
public function testFindPostsAllTagNamesAsArray()
55+
public function testFindPostsAllTagValuesAsArray()
5656
{
5757
$data = [];
58-
$models = Post::find()->with('tags')->allTagNames(['tag3', 'tag3', '', 'tag4'])->all();
58+
$models = Post::find()->with('tags')->allTagValues(['tag3', 'tag3', '', 'tag4'])->all();
5959

6060
foreach ($models as $model) {
6161
$data[] = $model->toArray([], ['tags']);
6262
}
6363

64-
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-all-tag-names.php'), $data);
64+
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-all-tag-values.php'), $data);
6565
}
6666

67-
public function testFindPostsRelatedByTagNames()
67+
public function testFindPostsRelatedByTagValues()
6868
{
6969
$data = [];
70-
$models = Post::find()->with('tags')->relatedByTagNames('tag3, tag3, tag4, , tag5')->all();
70+
$models = Post::find()->with('tags')->relatedByTagValues('tag3, tag3, tag4, , tag5')->all();
7171

7272
foreach ($models as $model) {
7373
$data[] = $model->toArray([], ['tags']);
7474
}
7575

76-
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-related-by-tag-names.php'), $data);
76+
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-related-by-tag-values.php'), $data);
7777
}
7878

79-
public function testFindPostsRelatedByTagNamesAsArray()
79+
public function testFindPostsRelatedByTagValuesAsArray()
8080
{
8181
$data = [];
82-
$models = Post::find()->with('tags')->relatedByTagNames(['tag3', 'tag3', 'tag4', '', 'tag5'])->all();
82+
$models = Post::find()->with('tags')->relatedByTagValues(['tag3', 'tag3', 'tag4', '', 'tag5'])->all();
8383

8484
foreach ($models as $model) {
8585
$data[] = $model->toArray([], ['tags']);
8686
}
8787

88-
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-related-by-tag-names.php'), $data);
88+
$this->assertEquals(require(__DIR__ . '/data/test-find-posts-related-by-tag-values.php'), $data);
8989
}
9090

9191
/**

‎tests/data/test-create-post-add-tag-names.xml‎ renamed to ‎tests/data/test-create-post-add-tag-values.xml‎

File renamed without changes.

‎tests/data/test-create-post-set-tag-names.xml‎ renamed to ‎tests/data/test-create-post-set-tag-values.xml‎

File renamed without changes.

‎tests/data/test-find-posts-all-tag-names.php‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎tests/data/test-find-posts-all-tag-values.php‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?php return
2+
3+
array (
4+
0 =>
5+
array (
6+
'id' => 2,
7+
'title' => 'Post title 2',
8+
'body' => 'Post body 2',
9+
'tags' =>
10+
array (
11+
0 =>
12+
array (
13+
'id' => 2,
14+
'name' => 'tag2',
15+
'frequency' => 2,
16+
),
17+
1 =>
18+
array (
19+
'id' => 3,
20+
'name' => 'tag3',
21+
'frequency' => 3,
22+
),
23+
2 =>
24+
array (
25+
'id' => 4,
26+
'name' => 'tag4',
27+
'frequency' => 2,
28+
),
29+
),
30+
),
31+
1 =>
32+
array (
33+
'id' => 3,
34+
'title' => 'Post title 3',
35+
'body' => 'Post body 3',
36+
'tags' =>
37+
array (
38+
0 =>
39+
array (
40+
'id' => 3,
41+
'name' => 'tag3',
42+
'frequency' => 3,
43+
),
44+
1 =>
45+
array (
46+
'id' => 4,
47+
'name' => 'tag4',
48+
'frequency' => 2,
49+
),
50+
2 =>
51+
array (
52+
'id' => 5,
53+
'name' => 'tag5',
54+
'frequency' => 1,
55+
),
56+
),
57+
),
58+
);

‎tests/data/test-find-posts-any-tag-names.php‎ renamed to ‎tests/data/test-find-posts-any-tag-values.php‎

File renamed without changes.

‎tests/data/test-find-posts-related-by-tag-names.php‎ renamed to ‎tests/data/test-find-posts-related-by-tag-values.php‎

File renamed without changes.

‎tests/data/test-update-post-add-tag-names.xml‎ renamed to ‎tests/data/test-update-post-add-tag-values.xml‎

File renamed without changes.

‎tests/data/test-update-post-remove-all-tag-values.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<dataset>
3+
<post id="1" title="Post title 1" body="Post body 1"/>
4+
<post id="2" title="Updated post title 2" body="Updated post body 2"/>
5+
<post id="3" title="Post title 3" body="Post body 3"/>
6+
<tag id="1" name="tag1" frequency="1"/>
7+
<tag id="2" name="tag2" frequency="1"/>
8+
<tag id="3" name="tag3" frequency="2"/>
9+
<tag id="4" name="tag4" frequency="1"/>
10+
<tag id="5" name="tag5" frequency="1"/>
11+
<post_tag_assn post_id="1" tag_id="1"/>
12+
<post_tag_assn post_id="1" tag_id="2"/>
13+
<post_tag_assn post_id="1" tag_id="3"/>
14+
<post_tag_assn post_id="3" tag_id="3"/>
15+
<post_tag_assn post_id="3" tag_id="4"/>
16+
<post_tag_assn post_id="3" tag_id="5"/>
17+
</dataset>

0 commit comments

Comments
 (0)