Skip to content

Commit 768a0d7

Browse files
carusogabrielcarusogabriel
committed
Refactoring tests
1 parent acd10db commit 768a0d7

File tree

10 files changed

+36
-36
lines changed

10 files changed

+36
-36
lines changed

‎tests/Components/Array2dTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public function testParseErr3()
4444
{
4545
$parser = new Parser();
4646
Array2d::parse($parser, $this->getTokensList(')'));
47-
$this->assertEquals(
47+
$this->assertCount(
4848
1,
49-
count($parser->errors)
49+
$parser->errors
5050
);
5151
$this->assertEquals(
5252
'An opening bracket followed by a set of values was expected.',
@@ -58,9 +58,9 @@ public function testParseErr4()
5858
{
5959
$parser = new Parser();
6060
Array2d::parse($parser, $this->getTokensList('TABLE'));
61-
$this->assertEquals(
61+
$this->assertCount(
6262
1,
63-
count($parser->errors)
63+
$parser->errors
6464
);
6565
$this->assertEquals(
6666
'An opening bracket followed by a set of values was expected.',
@@ -72,9 +72,9 @@ public function testParseErr5()
7272
{
7373
$parser = new Parser();
7474
Array2d::parse($parser, $this->getTokensList('(1, 2),'));
75-
$this->assertEquals(
75+
$this->assertCount(
7676
1,
77-
count($parser->errors)
77+
$parser->errors
7878
);
7979
$this->assertEquals(
8080
'An opening bracket followed by a set of values was expected.',
@@ -86,9 +86,9 @@ public function testParseErr6()
8686
{
8787
$parser = new Parser();
8888
Array2d::parse($parser, $this->getTokensList('(1, 2),(3)'));
89-
$this->assertEquals(
89+
$this->assertCount(
9090
1,
91-
count($parser->errors)
91+
$parser->errors
9292
);
9393
$this->assertEquals(
9494
'2 values were expected, but found 1.',

‎tests/Components/CreateDefinitionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function testParseErr1()
2727
$parser,
2828
$this->getTokensList('(str TEXT, FULLTEXT INDEX indx (str)')
2929
);
30-
$this->assertEquals(2, count($component));
30+
$this->assertCount(2, $component);
3131

3232
$this->assertEquals(
3333
'A closing bracket was expected.',

‎tests/Components/ExpressionArrayTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function testParse2()
2929
'parenthesesDelimited' => true,
3030
)
3131
);
32-
$this->assertEquals(1, count($component));
32+
$this->assertCount(1, $component);
3333
$this->assertEquals('(expr)', $component[0]->expr);
3434
}
3535
}

‎tests/Components/JoinKeywordTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ class JoinKeywordTest extends TestCase
1111
public function testParseIncomplete()
1212
{
1313
$component = JoinKeyword::parse(new Parser(), $this->getTokensList('JOIN a'));
14-
$this->assertEquals(1, count($component));
14+
$this->assertCount(1, $component);
1515
$this->assertEquals('a', $component[0]->expr->expr);
16-
$this->assertEquals(null, $component[0]->on);
17-
$this->assertEquals(null, $component[0]->using);
16+
$this->assertNull($component[0]->on);
17+
$this->assertNull($component[0]->using);
1818
}
1919

2020
public function testParseIncompleteUsing()
2121
{
2222
$component = JoinKeyword::parse(new Parser(), $this->getTokensList('JOIN table2 USING (id)'));
23-
$this->assertEquals(1, count($component));
23+
$this->assertCount(1, $component);
2424
$this->assertEquals('table2', $component[0]->expr->expr);
25-
$this->assertEquals(null, $component[0]->on);
25+
$this->assertNull($component[0]->on);
2626
$this->assertEquals(array('id'), $component[0]->using->values);
2727
}
2828

‎tests/Components/KeyTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ public function testParse()
1414
new Parser(),
1515
$this->getTokensList('')
1616
);
17-
$this->assertEquals(null, $component->name);
17+
$this->assertNull($component->name);
1818
}
1919
}

‎tests/Lexer/ContextTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ public function testLoad()
1111
{
1212
// Default context is 5.7.0.
1313
$this->assertEquals('\\PhpMyAdmin\\SqlParser\\Contexts\\ContextMySql50700', Context::$loadedContext);
14-
$this->assertTrue(isset(Context::$KEYWORDS['STORED']));
15-
$this->assertFalse(isset(Context::$KEYWORDS['AUTHORS']));
14+
$this->assertArrayHasKey('STORED', Context::$KEYWORDS);
15+
$this->assertArrayNotHasKey('AUTHORS', Context::$KEYWORDS);
1616

1717
// Restoring context.
1818
Context::load('');
1919
$this->assertEquals('\\PhpMyAdmin\\SqlParser\\Contexts\\ContextMySql50700', Context::$defaultContext);
20-
$this->assertTrue(isset(Context::$KEYWORDS['STORED']));
21-
$this->assertFalse(isset(Context::$KEYWORDS['AUTHORS']));
20+
$this->assertArrayHasKey('STORED', Context::$KEYWORDS);
21+
$this->assertArrayNotHasKey('AUTHORS', Context::$KEYWORDS);
2222
}
2323

2424
/**

‎tests/Lexer/IsMethodsTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ public function testIsKeyword()
2424
);
2525

2626
$this->assertEquals(1 | Token::FLAG_KEYWORD_RESERVED, Context::isKeyword('FROM', true));
27-
$this->assertEquals(null, Context::isKeyword('MODIFY', true));
27+
$this->assertNull(Context::isKeyword('MODIFY', true));
2828

29-
$this->assertEquals(null, Context::isKeyword('foo'));
30-
$this->assertEquals(null, Context::isKeyword('bar baz'));
29+
$this->assertNull(Context::isKeyword('foo'));
30+
$this->assertNull(Context::isKeyword('bar baz'));
3131
}
3232

3333
public function testIsOperator()
@@ -40,7 +40,7 @@ public function testIsOperator()
4040
$this->assertEquals(Token::FLAG_OPERATOR_ASSIGNMENT, Context::isOperator(':='));
4141
$this->assertEquals(Token::FLAG_OPERATOR_SQL, Context::isOperator(','));
4242

43-
$this->assertEquals(Context::isOperator('a'), null);
43+
$this->assertNull(Context::isOperator('a'));
4444
}
4545

4646
public function testIsWhitespace()
@@ -68,7 +68,7 @@ public function testIsComment()
6868
$this->assertEquals(Token::FLAG_COMMENT_C, Context::isComment('/*comment */'));
6969
$this->assertEquals(Token::FLAG_COMMENT_SQL, Context::isComment('-- my comment'));
7070

71-
$this->assertEquals(null, Context::isComment('--not a comment'));
71+
$this->assertNull(Context::isComment('--not a comment'));
7272
}
7373

7474
public function testIsBool()

‎tests/Lexer/TokensListTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,22 @@ public function testGetNext()
5454
$this->assertEquals($this->tokens[2], $list->getNext());
5555
$this->assertEquals($this->tokens[4], $list->getNext());
5656
$this->assertEquals($this->tokens[6], $list->getNext());
57-
$this->assertEquals(null, $list->getNext());
57+
$this->assertNull($list->getNext());
5858
}
5959

6060
public function testGetNextOfType()
6161
{
6262
$list = new TokensList($this->tokens);
6363
$this->assertEquals($this->tokens[0], $list->getNextOfType(Token::TYPE_KEYWORD));
6464
$this->assertEquals($this->tokens[4], $list->getNextOfType(Token::TYPE_KEYWORD));
65-
$this->assertEquals(null, $list->getNextOfType(Token::TYPE_KEYWORD));
65+
$this->assertNull($list->getNextOfType(Token::TYPE_KEYWORD));
6666
}
6767

6868
public function testGetNextOfTypeAndValue()
6969
{
7070
$list = new TokensList($this->tokens);
7171
$this->assertEquals($this->tokens[0], $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'SELECT'));
72-
$this->assertEquals(null, $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'SELECT'));
72+
$this->assertNull($list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'SELECT'));
7373
}
7474

7575
public function testArrayAccess()
@@ -90,8 +90,8 @@ public function testArrayAccess()
9090
}
9191

9292
// offsetExists($offset)
93-
$this->assertTrue(isset($list[2]));
94-
$this->assertFalse(isset($list[8]));
93+
$this->assertArrayHasKey(2, $list);
94+
$this->assertArrayNotHasKey(8, $list);
9595

9696
// offsetUnset($offset)
9797
unset($list[2]);

‎tests/Misc/UtfStringTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ public function testArrayAccess()
2626
$str = new UtfString(static::TEST_PHRASE);
2727

2828
// offsetExists
29-
$this->assertTrue(isset($str[static::TEST_PHRASE_LEN - 1]));
30-
$this->assertFalse(isset($str[-1]));
31-
$this->assertFalse(isset($str[static::TEST_PHRASE_LEN]));
29+
$this->assertArrayHasKey(static::TEST_PHRASE_LEN - 1, $str);
30+
$this->assertArrayNotHasKey(-1, $str);
31+
$this->assertArrayNotHasKey(static::TEST_PHRASE_LEN, $str);
3232

3333
// offsetGet
3434
$this->assertEquals('.', $str[static::TEST_PHRASE_LEN - 1]);
35-
$this->assertEquals(null, $str[-1]);
36-
$this->assertEquals(null, $str[static::TEST_PHRASE_LEN]);
35+
$this->assertNull($str[-1]);
36+
$this->assertNull($str[static::TEST_PHRASE_LEN]);
3737
}
3838

3939
/**

‎tests/Utils/QueryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ public function testGetFirstStatement()
540540
$delimiter = null;
541541
list($statement, $query, $delimiter) =
542542
Query::getFirstStatement($query, $delimiter);
543-
$this->assertEquals(null, $statement);
543+
$this->assertNull($statement);
544544
$this->assertEquals('USE saki', $query);
545545

546546
$query = 'USE sakila; ' .

0 commit comments

Comments
 (0)