Skip to content

Commit 91275ed

Browse files
samsonasiksamsonasik
authored
Merge pull request #9260 from samsonasik/refactor-flip-assert-actual
refactor: flip assert and actual value position on tests
2 parents c7d012d + 17d5669 commit 91275ed

File tree

13 files changed

+76
-76
lines changed

13 files changed

+76
-76
lines changed

‎tests/system/Database/Live/ForgeTest.php‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,15 @@ public function testCreateTableApplyBigInt(): void
278278

279279
$fieldsData = $this->db->getFieldData('forge_test_table');
280280
if ($this->db->DBDriver === 'MySQLi') {
281-
$this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
281+
$this->assertSame('bigint', strtolower($fieldsData[0]->type));
282282
} elseif ($this->db->DBDriver === 'Postgre') {
283-
$this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
283+
$this->assertSame('bigint', strtolower($fieldsData[0]->type));
284284
} elseif ($this->db->DBDriver === 'SQLite3') {
285-
$this->assertSame(strtolower($fieldsData[0]->type), 'integer');
285+
$this->assertSame('integer', strtolower($fieldsData[0]->type));
286286
} elseif ($this->db->DBDriver === 'OCI8') {
287-
$this->assertSame(strtolower($fieldsData[0]->type), 'number');
287+
$this->assertSame('number', strtolower($fieldsData[0]->type));
288288
} elseif ($this->db->DBDriver === 'SQLSRV') {
289-
$this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
289+
$this->assertSame('bigint', strtolower($fieldsData[0]->type));
290290
}
291291

292292
$this->forge->dropTable('forge_test_table', true);
@@ -1166,65 +1166,65 @@ public function testCompositeKey(): void
11661166
$keys = $this->db->getIndexData('forge_test_1');
11671167

11681168
if ($this->db->DBDriver === 'MySQLi') {
1169-
$this->assertSame($keys['PRIMARY']->name, 'PRIMARY');
1169+
$this->assertSame('PRIMARY', $keys['PRIMARY']->name);
11701170
$this->assertSame($keys['PRIMARY']->fields, ['id']);
1171-
$this->assertSame($keys['PRIMARY']->type, 'PRIMARY');
1171+
$this->assertSame('PRIMARY', $keys['PRIMARY']->type);
11721172

1173-
$this->assertSame($keys['code_company']->name, 'code_company');
1173+
$this->assertSame('code_company', $keys['code_company']->name);
11741174
$this->assertSame($keys['code_company']->fields, ['code', 'company']);
1175-
$this->assertSame($keys['code_company']->type, 'INDEX');
1175+
$this->assertSame('INDEX', $keys['code_company']->type);
11761176

1177-
$this->assertSame($keys['code_active']->name, 'code_active');
1177+
$this->assertSame('code_active', $keys['code_active']->name);
11781178
$this->assertSame($keys['code_active']->fields, ['code', 'active']);
1179-
$this->assertSame($keys['code_active']->type, 'UNIQUE');
1179+
$this->assertSame('UNIQUE', $keys['code_active']->type);
11801180
} elseif ($this->db->DBDriver === 'Postgre') {
1181-
$this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
1181+
$this->assertSame('pk_db_forge_test_1', $keys['pk_db_forge_test_1']->name);
11821182
$this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']);
1183-
$this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY');
1183+
$this->assertSame('PRIMARY', $keys['pk_db_forge_test_1']->type);
11841184

1185-
$this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
1185+
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
11861186
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1187-
$this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
1187+
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
11881188

1189-
$this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
1189+
$this->assertSame('db_forge_test_1_code_active', $keys['db_forge_test_1_code_active']->name);
11901190
$this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
1191-
$this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
1191+
$this->assertSame('UNIQUE', $keys['db_forge_test_1_code_active']->type);
11921192
} elseif ($this->db->DBDriver === 'SQLite3') {
1193-
$this->assertSame($keys['PRIMARY']->name, 'PRIMARY');
1193+
$this->assertSame('PRIMARY', $keys['PRIMARY']->name);
11941194
$this->assertSame($keys['PRIMARY']->fields, ['id']);
1195-
$this->assertSame($keys['PRIMARY']->type, 'PRIMARY');
1195+
$this->assertSame('PRIMARY', $keys['PRIMARY']->type);
11961196

1197-
$this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
1197+
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
11981198
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1199-
$this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
1199+
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
12001200

1201-
$this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
1201+
$this->assertSame('db_forge_test_1_code_active', $keys['db_forge_test_1_code_active']->name);
12021202
$this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
1203-
$this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
1203+
$this->assertSame('UNIQUE', $keys['db_forge_test_1_code_active']->type);
12041204
} elseif ($this->db->DBDriver === 'SQLSRV') {
1205-
$this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
1205+
$this->assertSame('pk_db_forge_test_1', $keys['pk_db_forge_test_1']->name);
12061206
$this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']);
1207-
$this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY');
1207+
$this->assertSame('PRIMARY', $keys['pk_db_forge_test_1']->type);
12081208

1209-
$this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
1209+
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
12101210
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1211-
$this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
1211+
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
12121212

1213-
$this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
1213+
$this->assertSame('db_forge_test_1_code_active', $keys['db_forge_test_1_code_active']->name);
12141214
$this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
1215-
$this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
1215+
$this->assertSame('UNIQUE', $keys['db_forge_test_1_code_active']->type);
12161216
} elseif ($this->db->DBDriver === 'OCI8') {
1217-
$this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
1217+
$this->assertSame('pk_db_forge_test_1', $keys['pk_db_forge_test_1']->name);
12181218
$this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']);
1219-
$this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY');
1219+
$this->assertSame('PRIMARY', $keys['pk_db_forge_test_1']->type);
12201220

1221-
$this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
1221+
$this->assertSame('db_forge_test_1_code_company', $keys['db_forge_test_1_code_company']->name);
12221222
$this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
1223-
$this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
1223+
$this->assertSame('INDEX', $keys['db_forge_test_1_code_company']->type);
12241224

1225-
$this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
1225+
$this->assertSame('db_forge_test_1_code_active', $keys['db_forge_test_1_code_active']->name);
12261226
$this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
1227-
$this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
1227+
$this->assertSame('UNIQUE', $keys['db_forge_test_1_code_active']->type);
12281228
}
12291229

12301230
$this->forge->dropTable('forge_test_1', true);

‎tests/system/Database/Live/OCI8/CallStoredProcedureTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function testCallPackageProcedure(): void
5555
],
5656
]);
5757

58-
$this->assertSame($result, '7');
58+
$this->assertSame('7', $result);
5959
}
6060

6161
public function testCallStoredProcedure(): void
@@ -77,7 +77,7 @@ public function testCallStoredProcedure(): void
7777
],
7878
]);
7979

80-
$this->assertSame($result, '7');
80+
$this->assertSame('7', $result);
8181
}
8282

8383
public function testCallStoredProcedureForCursor(): void

‎tests/system/Database/Live/OCI8/LastInsertIDTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ public function testGetInsertIDWithInsert(): void
4949
$this->db->table('job')->insert($jobData);
5050
$actual = $this->db->insertID();
5151

52-
$this->assertSame($actual, 5);
52+
$this->assertSame(5, $actual);
5353
}
5454

5555
public function testGetInsertIDWithQuery(): void
5656
{
5757
$this->db->query('INSERT INTO "db_job" ("name", "description") VALUES (?, ?)', ['Grocery Sales', 'Discount!']);
5858
$actual = $this->db->insertID();
5959

60-
$this->assertSame($actual, 5);
60+
$this->assertSame(5, $actual);
6161
}
6262

6363
public function testGetInsertIDWithHasCommentQuery(): void
@@ -73,7 +73,7 @@ public function testGetInsertIDWithHasCommentQuery(): void
7373
$this->db->query($sql, ['Discount!']);
7474
$actual = $this->db->insertID();
7575

76-
$this->assertSame($actual, 5);
76+
$this->assertSame(5, $actual);
7777
}
7878

7979
public function testGetInsertIDWithPreparedQuery(): void
@@ -87,6 +87,6 @@ public function testGetInsertIDWithPreparedQuery(): void
8787
$query->execute('foo', 'bar');
8888
$actual = $this->db->insertID();
8989

90-
$this->assertSame($actual, 5);
90+
$this->assertSame(5, $actual);
9191
}
9292
}

‎tests/system/Files/FileCollectionTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,6 @@ public function testIterable(): void
577577
$count++;
578578
}
579579

580-
$this->assertSame($count, 5);
580+
$this->assertSame(5, $count);
581581
}
582582
}

‎tests/system/HTTP/ResponseCookieTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public function testCookieDelete(): void
203203
$response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
204204
$response->deleteCookie('bee');
205205
$cookie = $response->getCookie('bee');
206-
$this->assertSame($cookie->getExpiresTimestamp(), 0);
206+
$this->assertSame(0, $cookie->getExpiresTimestamp());
207207

208208
// delete cookie with wrong prefix?
209209
$config->prefix = 'mine';
@@ -214,7 +214,7 @@ public function testCookieDelete(): void
214214
$this->assertFalse($cookie->isExpired(), $cookie->getExpiresTimestamp() . ' should be less than ' . time());
215215
$response->deleteCookie('bee', '', '', 'mine');
216216
$cookie = $response->getCookie('bee');
217-
$this->assertSame($cookie->getExpiresTimestamp(), 0);
217+
$this->assertSame(0, $cookie->getExpiresTimestamp());
218218

219219
// delete cookie with wrong domain?
220220
$config->domain = '.mine.com';
@@ -225,7 +225,7 @@ public function testCookieDelete(): void
225225
$this->assertFalse($cookie->isExpired(), $cookie->getExpiresTimestamp() . ' should be less than ' . time());
226226
$response->deleteCookie('bees', '.mine.com', '', '');
227227
$cookie = $response->getCookie('bees');
228-
$this->assertSame($cookie->getExpiresTimestamp(), 0);
228+
$this->assertSame(0, $cookie->getExpiresTimestamp());
229229
}
230230

231231
public function testCookieDefaultSetSameSite(): void

‎tests/system/Helpers/DateHelperTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function testNowDefault(): void
3434
{
3535
Time::setTestNow('June 20, 2022', 'America/Chicago');
3636

37-
$this->assertSame(now(), 1_655_701_200);
37+
$this->assertSame(1_655_701_200, now());
3838

3939
Time::setTestNow();
4040
}

‎tests/system/Helpers/TextHelperTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -345,25 +345,25 @@ public function testWordWrap(): void
345345
{
346346
$string = 'Here is a simple string of text that will help us demonstrate this function.';
347347
$expected = "Here is a simple string\nof text that will help us\ndemonstrate this\nfunction.";
348-
$this->assertSame(substr_count(word_wrap($string, 25), "\n"), 3);
348+
$this->assertSame(3, substr_count(word_wrap($string, 25), "\n"));
349349
$this->assertSame($expected, word_wrap($string, 25));
350350

351351
$string2 = "Here is a\nbroken up sentence\rspanning lines\r\nwoohoo!";
352352
$expected2 = "Here is a\nbroken up sentence\nspanning lines\nwoohoo!";
353-
$this->assertSame(substr_count(word_wrap($string2, 25), "\n"), 3);
353+
$this->assertSame(3, substr_count(word_wrap($string2, 25), "\n"));
354354
$this->assertSame($expected2, word_wrap($string2, 25));
355355

356356
$string3 = "Here is another slightly longer\nbroken up sentence\rspanning lines\r\nwoohoo!";
357357
$expected3 = "Here is another slightly\nlonger\nbroken up sentence\nspanning lines\nwoohoo!";
358-
$this->assertSame(substr_count(word_wrap($string3, 25), "\n"), 4);
358+
$this->assertSame(4, substr_count(word_wrap($string3, 25), "\n"));
359359
$this->assertSame($expected3, word_wrap($string3, 25));
360360
}
361361

362362
public function testWordWrapUnwrap(): void
363363
{
364364
$string = 'Here is a {unwrap}simple string of text{/unwrap} that will help us demonstrate this function.';
365365
$expected = "Here is a simple string of text\nthat will help us\ndemonstrate this\nfunction.";
366-
$this->assertSame(substr_count(word_wrap($string, 25), "\n"), 3);
366+
$this->assertSame(3, substr_count(word_wrap($string, 25), "\n"));
367367
$this->assertSame($expected, word_wrap($string, 25));
368368
}
369369

@@ -386,7 +386,7 @@ public function testWordWrapURL(): void
386386
public function testDefaultWordWrapCharlim(): void
387387
{
388388
$string = 'Here is a longer string of text that will help us demonstrate the default charlim of this function.';
389-
$this->assertSame(strpos(word_wrap($string), "\n"), 73);
389+
$this->assertSame(73, strpos(word_wrap($string), "\n"));
390390
}
391391

392392
public function testExcerpt(): void

‎tests/system/Models/EventsModelTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function testBeforeFindReturnsData(): void
8484

8585
$result = $this->model->find(1);
8686
$this->assertTrue($this->model->hasToken('beforeFind'));
87-
$this->assertSame($result, 'foobar');
87+
$this->assertSame('foobar', $result);
8888
}
8989

9090
public function testBeforeFindReturnDataPreventsAfterFind(): void

‎tests/system/Models/ValidationModelRuleGroupTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@ public function testUpdateEntityWithPropertyCleanValidationRulesTrueAndCallingCl
398398
$errors = $model->errors();
399399
$this->assertCount(1, $errors);
400400
$this->assertSame(
401-
$errors['field1'],
402-
'The field1 field is required when field2,field3,field4 is present.'
401+
'The field1 field is required when field2,field3,field4 is present.',
402+
$errors['field1']
403403
);
404404
}
405405

@@ -438,8 +438,8 @@ public function testUpdateEntityWithPropertyCleanValidationRulesFalse(): void
438438
$errors = $model->errors();
439439
$this->assertCount(1, $errors);
440440
$this->assertSame(
441-
$errors['field1'],
442-
'The field1 field is required when field2,field3,field4 is present.'
441+
'The field1 field is required when field2,field3,field4 is present.',
442+
$errors['field1']
443443
);
444444
}
445445

@@ -471,8 +471,8 @@ public function testInsertEntityValidateEntireRules(): void
471471
$errors = $model->errors();
472472
$this->assertCount(1, $errors);
473473
$this->assertSame(
474-
$errors['field2'],
475-
'The field2 field is required.'
474+
'The field2 field is required.',
475+
$errors['field2']
476476
);
477477
}
478478
}

‎tests/system/Models/ValidationModelTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,8 @@ public function testUpdateEntityWithPropertyCleanValidationRulesTrueAndCallingCl
410410
$errors = $model->errors();
411411
$this->assertCount(1, $errors);
412412
$this->assertSame(
413-
$errors['field1'],
414-
'The field1 field is required when field2,field3,field4 is present.'
413+
'The field1 field is required when field2,field3,field4 is present.',
414+
$errors['field1']
415415
);
416416
}
417417

@@ -450,8 +450,8 @@ public function testUpdateEntityWithPropertyCleanValidationRulesFalse(): void
450450
$errors = $model->errors();
451451
$this->assertCount(1, $errors);
452452
$this->assertSame(
453-
$errors['field1'],
454-
'The field1 field is required when field2,field3,field4 is present.'
453+
'The field1 field is required when field2,field3,field4 is present.',
454+
$errors['field1']
455455
);
456456
}
457457

@@ -483,8 +483,8 @@ public function testInsertEntityValidateEntireRules(): void
483483
$errors = $model->errors();
484484
$this->assertCount(1, $errors);
485485
$this->assertSame(
486-
$errors['field2'],
487-
'The field2 field is required.'
486+
'The field2 field is required.',
487+
$errors['field2']
488488
);
489489
}
490490
}

0 commit comments

Comments
 (0)