Skip to content
This repository was archived by the owner on Nov 26, 2022. It is now read-only.

Commit 3201241

Browse files
odanodan
committed
Optimized tests
1 parent 1153512 commit 3201241

9 files changed

Lines changed: 157 additions & 157 deletions

‎tests/CompressionTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@ public function testCompress()
5353
$result = $enc->compress('test');
5454
$result = strtoupper(bin2hex($result));
5555
$resultFromDb = $db->queryValue("SELECT HEX(COMPRESS('test')) AS result;", 'result');
56-
$this->assertEquals($resultFromDb, $result);
56+
$this->assertSame($resultFromDb, $result);
5757

5858
// MySQL TO_BASE64 function does not exist
5959
// https://github.com/travis-ci/travis-ci/issues/4088
6060
$result = $enc->compress(null);
6161
$result2 = $db->queryValue("SELECT HEX(COMPRESS(NULL)) AS result;", 'result');
62-
$this->assertEquals(true, $result === $result2);
62+
$this->assertSame(true, $result === $result2);
6363

6464
$result = $enc->uncompress(hex2bin('04000000789C2B492D2E0100045D01C1'));
6565
$resultFromDb = $db->queryValue("SELECT UNCOMPRESS(UNHEX('04000000789C2B492D2E0100045D01C1')) AS result;", 'result');
66-
$this->assertEquals($resultFromDb, $result);
66+
$this->assertSame($resultFromDb, $result);
6767

6868
$result = $enc->uncompress(null);
6969
$resultFromDb = $db->queryValue("SELECT UNCOMPRESS(NULL) AS result;", 'result');
70-
$this->assertEquals(true, $resultFromDb === $result);
70+
$this->assertSame(true, $resultFromDb === $result);
7171

7272
// MySQL TO_BASE64 function does not exist
7373
// https://github.com/travis-ci/travis-ci/issues/4088

‎tests/ConnectionTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ public function testPrepareQuery()
5151
$row = $statement->fetch(PDO::FETCH_ASSOC);
5252

5353
$this->assertTrue(!empty($row['TABLE_NAME']));
54-
$this->assertEquals('TABLES', $row['TABLE_NAME']);
54+
$this->assertSame('TABLES', $row['TABLE_NAME']);
5555
}
5656
}

‎tests/DeleteQueryTest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected function delete()
4848
public function testFrom()
4949
{
5050
$delete = $this->delete()->from('test');
51-
$this->assertEquals("DELETE FROM `test`;", $delete->build());
51+
$this->assertSame("DELETE FROM `test`;", $delete->build());
5252
$this->assertTrue($delete->execute());
5353
}
5454

@@ -65,7 +65,7 @@ public function testLowPriority()
6565
{
6666
$delete = $this->delete()->lowPriority()->from('test');
6767
$this->assertInstanceOf(PDOStatement::class, $delete->prepare());
68-
$this->assertEquals("DELETE LOW_PRIORITY FROM `test`;", $delete->build());
68+
$this->assertSame("DELETE LOW_PRIORITY FROM `test`;", $delete->build());
6969
}
7070

7171
/**
@@ -82,10 +82,10 @@ public function testLowPriority()
8282
public function testIgnore()
8383
{
8484
$delete = $this->delete()->ignore()->from('test')->where('id', '=', '1');
85-
$this->assertEquals("DELETE IGNORE FROM `test` WHERE `id` = '1';", $delete->build());
85+
$this->assertSame("DELETE IGNORE FROM `test` WHERE `id` = '1';", $delete->build());
8686

8787
$delete = $this->delete()->lowPriority()->ignore()->from('test')->where('id', '=', '1');
88-
$this->assertEquals("DELETE LOW_PRIORITY IGNORE FROM `test` WHERE `id` = '1';", $delete->build());
88+
$this->assertSame("DELETE LOW_PRIORITY IGNORE FROM `test` WHERE `id` = '1';", $delete->build());
8989
}
9090

9191
/**
@@ -102,7 +102,7 @@ public function testIgnore()
102102
public function testQuick()
103103
{
104104
$delete = $this->delete()->quick()->from('test')->where('id', '=', '1');
105-
$this->assertEquals("DELETE QUICK FROM `test` WHERE `id` = '1';", $delete->build());
105+
$this->assertSame("DELETE QUICK FROM `test` WHERE `id` = '1';", $delete->build());
106106
}
107107

108108
/**
@@ -118,16 +118,16 @@ public function testQuick()
118118
public function testOrderBy()
119119
{
120120
$delete = $this->delete()->from('test')->where('id', '=', '1')->orderBy('id');
121-
$this->assertEquals("DELETE FROM `test` WHERE `id` = '1' ORDER BY `id`;", $delete->build());
121+
$this->assertSame("DELETE FROM `test` WHERE `id` = '1' ORDER BY `id`;", $delete->build());
122122

123123
$delete = $this->delete()->from('test')->where('id', '=', '1')->orderBy('id DESC');
124-
$this->assertEquals("DELETE FROM `test` WHERE `id` = '1' ORDER BY `id` DESC;", $delete->build());
124+
$this->assertSame("DELETE FROM `test` WHERE `id` = '1' ORDER BY `id` DESC;", $delete->build());
125125

126126
$delete = $this->delete()->from('test')->where('id', '=', '1')->orderBy('test.id ASC');
127-
$this->assertEquals("DELETE FROM `test` WHERE `id` = '1' ORDER BY `test`.`id` ASC;", $delete->build());
127+
$this->assertSame("DELETE FROM `test` WHERE `id` = '1' ORDER BY `test`.`id` ASC;", $delete->build());
128128

129129
$delete = $this->delete()->from('test')->where('id', '=', '1')->orderBy('db.test.id ASC');
130-
$this->assertEquals("DELETE FROM `test` WHERE `id` = '1' ORDER BY `db`.`test`.`id` ASC;", $delete->build());
130+
$this->assertSame("DELETE FROM `test` WHERE `id` = '1' ORDER BY `db`.`test`.`id` ASC;", $delete->build());
131131
}
132132

133133
/**
@@ -143,7 +143,7 @@ public function testOrderBy()
143143
public function testLimit()
144144
{
145145
$delete = $this->delete()->from('test')->where('id', '>', '1')->limit(10);
146-
$this->assertEquals("DELETE FROM `test` WHERE `id` > '1' LIMIT 10;", $delete->build());
146+
$this->assertSame("DELETE FROM `test` WHERE `id` > '1' LIMIT 10;", $delete->build());
147147
}
148148

149149
/**
@@ -164,7 +164,7 @@ public function testWhere()
164164
$delete = $this->delete()->from('test')->where('id', '=', '1')
165165
->where('test.id', '=', 1)
166166
->orWhere('db.test.id', '>', 2);
167-
$this->assertEquals("DELETE FROM `test` WHERE `id` = '1' AND `test`.`id` = '1' OR `db`.`test`.`id` > '2';", $delete->build());
167+
$this->assertSame("DELETE FROM `test` WHERE `id` = '1' AND `test`.`id` = '1' OR `db`.`test`.`id` > '2';", $delete->build());
168168
}
169169

170170
/**
@@ -179,6 +179,6 @@ public function testWhere()
179179
public function testTruncate()
180180
{
181181
$delete = $this->delete()->from('test')->truncate();
182-
$this->assertEquals("TRUNCATE TABLE `test`;", $delete->build());
182+
$this->assertSame("TRUNCATE TABLE `test`;", $delete->build());
183183
}
184184
}

‎tests/InsertQueryTest.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ protected function insert()
4747
public function testInto()
4848
{
4949
$insert = $this->insert()->into('test')->set(['keyname' => 'admin-007']);
50-
$this->assertEquals("INSERT INTO `test` SET `keyname`='admin-007';", $insert->build());
50+
$this->assertSame("INSERT INTO `test` SET `keyname`='admin-007';", $insert->build());
5151
$stmt = $insert->prepare();
5252
$this->assertInstanceOf(PDOStatement::class, $stmt);
5353
$this->assertTrue($stmt->execute());
54-
$this->assertEquals(1, $stmt->rowCount());
55-
$this->assertEquals(1, $this->getConnection()->lastInsertId());
54+
$this->assertSame(1, $stmt->rowCount());
55+
$this->assertSame('1', $this->getConnection()->lastInsertId());
5656
}
5757

5858
/**
@@ -69,7 +69,7 @@ public function testLastInsertId()
6969
{
7070
$insert = $this->insert()->into('test')->set(['keyname' => 'admin-007']);
7171
$insert->execute();
72-
$this->assertEquals(1, $insert->lastInsertId());
72+
$this->assertSame('1', $insert->lastInsertId());
7373
}
7474

7575
/**
@@ -85,7 +85,7 @@ public function testLastInsertId()
8585
public function testInsertGetId()
8686
{
8787
$insertGetId = $this->insert()->into('test')->insertGetId(['keyname' => 'admin-007']);
88-
$this->assertEquals(1, $insertGetId);
88+
$this->assertSame('1', $insertGetId);
8989
}
9090

9191
/**
@@ -101,10 +101,10 @@ public function testInsertGetId()
101101
public function testPriority()
102102
{
103103
$insert = $this->insert()->lowPriority()->into('test')->set(['username' => 'admin']);
104-
$this->assertEquals("INSERT LOW_PRIORITY INTO `test` SET `username`='admin';", $insert->build());
104+
$this->assertSame("INSERT LOW_PRIORITY INTO `test` SET `username`='admin';", $insert->build());
105105

106106
$insert = $this->insert()->highPriority()->into('test')->set(['username' => 'admin']);
107-
$this->assertEquals("INSERT HIGH_PRIORITY INTO `test` SET `username`='admin';", $insert->build());
107+
$this->assertSame("INSERT HIGH_PRIORITY INTO `test` SET `username`='admin';", $insert->build());
108108
}
109109

110110
/**
@@ -120,10 +120,10 @@ public function testPriority()
120120
public function testIgnore()
121121
{
122122
$insert = $this->insert()->ignore()->into('test')->set(['username' => 'admin']);
123-
$this->assertEquals("INSERT IGNORE INTO `test` SET `username`='admin';", $insert->build());
123+
$this->assertSame("INSERT IGNORE INTO `test` SET `username`='admin';", $insert->build());
124124

125125
$insert = $this->insert()->lowPriority()->ignore()->into('test')->set(['username' => 'admin']);
126-
$this->assertEquals("INSERT LOW_PRIORITY IGNORE INTO `test` SET `username`='admin';", $insert->build());
126+
$this->assertSame("INSERT LOW_PRIORITY IGNORE INTO `test` SET `username`='admin';", $insert->build());
127127
}
128128

129129
/**
@@ -139,7 +139,7 @@ public function testIgnore()
139139
public function testDelayed()
140140
{
141141
$insert = $this->insert()->delayed()->into('test')->set(['username' => 'admin']);
142-
$this->assertEquals("INSERT DELAYED INTO `test` SET `username`='admin';", $insert->build());
142+
$this->assertSame("INSERT DELAYED INTO `test` SET `username`='admin';", $insert->build());
143143
}
144144

145145
/**
@@ -155,6 +155,6 @@ public function testOnDuplicateKeyUpdate()
155155
{
156156
$insert = $this->insert()->ignore()->into('test')->set(['username' => 'admin']);
157157
$insert->onDuplicateKeyUpdate(['username' => 'admin-01']);
158-
$this->assertEquals("INSERT IGNORE INTO `test` SET `username`='admin' ON DUPLICATE KEY UPDATE `username`='admin-01';", $insert->build());
158+
$this->assertSame("INSERT IGNORE INTO `test` SET `username`='admin' ON DUPLICATE KEY UPDATE `username`='admin-01';", $insert->build());
159159
}
160160
}

‎tests/QuoterTest.php‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,34 +40,34 @@ protected function pdoMethod(PDO $pdo)
4040
public function testEsc()
4141
{
4242
$quoter = $this->getConnection()->getQuoter();
43-
$this->assertEquals('NULL', $quoter->quoteValue(null));
44-
$this->assertEquals("'\\0'", $quoter->quoteValue("\0"));
45-
$this->assertEquals("'0'", $quoter->quoteValue(0));
46-
$this->assertEquals("'0'", $quoter->quoteValue('0'));
47-
$this->assertEquals("''", $quoter->quoteValue(false));
48-
$this->assertEquals("'1'", $quoter->quoteValue(true));
49-
$this->assertEquals("'-1'", $quoter->quoteValue(-1));
50-
$this->assertEquals("'abc123'", $quoter->quoteValue("abc123"));
51-
$this->assertEquals("'öäüÖÄÜß'", $quoter->quoteValue("öäüÖÄÜß"));
52-
$this->assertEquals("'?'", $quoter->quoteValue('?'));
53-
$this->assertEquals("':'", $quoter->quoteValue(':'));
54-
$this->assertEquals("'\\''", $quoter->quoteValue("'"));
55-
$this->assertEquals("'\\\"'", $quoter->quoteValue("\""));
56-
$this->assertEquals("'\\\\'", $quoter->quoteValue("\\"));
57-
$this->assertEquals("'\\0'", $quoter->quoteValue("\x00"));
58-
$this->assertEquals("'\\Z'", $quoter->quoteValue("\x1a"));
59-
$this->assertEquals("'\\n'", $quoter->quoteValue("\n"));
60-
$this->assertEquals("'\\r'", $quoter->quoteValue("\r"));
61-
$this->assertEquals("','", $quoter->quoteValue(","));
62-
$this->assertEquals("'\\','", $quoter->quoteValue("',"));
63-
$this->assertEquals("'`'", $quoter->quoteValue("`"));
64-
$this->assertEquals("'%s'", $quoter->quoteValue("%s"));
65-
$this->assertEquals("'Naughty \\' string'", $quoter->quoteValue("Naughty ' string"));
66-
$this->assertEquals("'@þÿ€'", $quoter->quoteValue("@þÿ€"));
43+
$this->assertSame('NULL', $quoter->quoteValue(null));
44+
$this->assertSame("'\\0'", $quoter->quoteValue("\0"));
45+
$this->assertSame("'0'", $quoter->quoteValue(0));
46+
$this->assertSame("'0'", $quoter->quoteValue('0'));
47+
$this->assertSame("''", $quoter->quoteValue(false));
48+
$this->assertSame("'1'", $quoter->quoteValue(true));
49+
$this->assertSame("'-1'", $quoter->quoteValue(-1));
50+
$this->assertSame("'abc123'", $quoter->quoteValue("abc123"));
51+
$this->assertSame("'öäüÖÄÜß'", $quoter->quoteValue("öäüÖÄÜß"));
52+
$this->assertSame("'?'", $quoter->quoteValue('?'));
53+
$this->assertSame("':'", $quoter->quoteValue(':'));
54+
$this->assertSame("'\\''", $quoter->quoteValue("'"));
55+
$this->assertSame("'\\\"'", $quoter->quoteValue("\""));
56+
$this->assertSame("'\\\\'", $quoter->quoteValue("\\"));
57+
$this->assertSame("'\\0'", $quoter->quoteValue("\x00"));
58+
$this->assertSame("'\\Z'", $quoter->quoteValue("\x1a"));
59+
$this->assertSame("'\\n'", $quoter->quoteValue("\n"));
60+
$this->assertSame("'\\r'", $quoter->quoteValue("\r"));
61+
$this->assertSame("','", $quoter->quoteValue(","));
62+
$this->assertSame("'\\','", $quoter->quoteValue("',"));
63+
$this->assertSame("'`'", $quoter->quoteValue("`"));
64+
$this->assertSame("'%s'", $quoter->quoteValue("%s"));
65+
$this->assertSame("'Naughty \\' string'", $quoter->quoteValue("Naughty ' string"));
66+
$this->assertSame("'@þÿ€'", $quoter->quoteValue("@þÿ€"));
6767
// Injection patterns
68-
$this->assertEquals("'\\' OR \\'\\'=\\''", $quoter->quoteValue("' OR ''='"));
69-
$this->assertEquals("'1\\' or \\'1\\' = \\'1'", $quoter->quoteValue("1' or '1' = '1"));
70-
$this->assertEquals("'1\\' or \\'1\\' = \\'1\\'))/*'", $quoter->quoteValue("1' or '1' = '1'))/*"));
68+
$this->assertSame("'\\' OR \\'\\'=\\''", $quoter->quoteValue("' OR ''='"));
69+
$this->assertSame("'1\\' or \\'1\\' = \\'1'", $quoter->quoteValue("1' or '1' = '1"));
70+
$this->assertSame("'1\\' or \\'1\\' = \\'1\\'))/*'", $quoter->quoteValue("1' or '1' = '1'))/*"));
7171
}
7272

7373
/**
@@ -121,10 +121,10 @@ public function testIdent()
121121
public function testQuoteArray()
122122
{
123123
$quoter = $this->getConnection()->getQuoter();
124-
$this->assertEquals([], $quoter->quoteArray([]));
124+
$this->assertSame([], $quoter->quoteArray([]));
125125

126126
$row = ['1', '2', '3', null];
127-
$this->assertEquals(["'1'", "'2'", "'3'", 'NULL'], $quoter->quoteArray($row));
127+
$this->assertSame(["'1'", "'2'", "'3'", 'NULL'], $quoter->quoteArray($row));
128128
}
129129

130130

@@ -137,9 +137,9 @@ public function testQuoteArray()
137137
public function testQuoteNames()
138138
{
139139
$quoter = $this->getConnection()->getQuoter();
140-
$this->assertEquals([], $quoter->quoteNames([]));
140+
$this->assertSame([], $quoter->quoteNames([]));
141141

142142
$row = ['a', 'a.b', 'a.b.c', new RawExp('a.z')];
143-
$this->assertEquals(["`a`", "`a`.`b`", "`a`.`b`.`c`", "a.z"], $quoter->quoteNames($row));
143+
$this->assertSame(["`a`", "`a`.`b`", "`a`.`b`.`c`", "a.z"], $quoter->quoteNames($row));
144144
}
145145
}

‎tests/RawExpTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class RawExpTest extends BaseTest
1717
public function testGetValue()
1818
{
1919
$exp = new RawExp('123');
20-
$this->assertEquals('123', $exp->getValue());
20+
$this->assertSame('123', $exp->getValue());
2121
}
2222

2323
/**
@@ -28,7 +28,7 @@ public function testGetValue()
2828
public function testToString()
2929
{
3030
$exp = new RawExp('abc');
31-
$this->assertEquals('abc', $exp->__toString());
31+
$this->assertSame('abc', $exp->__toString());
3232
}
3333

3434
/**
@@ -47,7 +47,7 @@ public function testColumnsRaw()
4747
->where('status', '<>', 1)
4848
->groupBy('status')
4949
->build();
50-
$this->assertEquals("SELECT COUNT(*) AS user_count,`status` FROM `payments` WHERE `status` <> '1' GROUP BY `status`;", $select);
50+
$this->assertSame("SELECT COUNT(*) AS user_count,`status` FROM `payments` WHERE `status` <> '1' GROUP BY `status`;", $select);
5151
}
5252

5353
/**
@@ -63,6 +63,6 @@ public function testColumnsRaw2()
6363
new RawExp('MIN(amount)'))
6464
->from('payments')
6565
->build();
66-
$this->assertEquals('SELECT MAX(amount),MIN(amount) FROM `payments`;', $select);
66+
$this->assertSame('SELECT MAX(amount),MIN(amount) FROM `payments`;', $select);
6767
}
6868
}

0 commit comments

Comments
 (0)