diff options
Diffstat (limited to 'tests/Lexer')
| -rw-r--r-- | tests/Lexer/ContextTest.php | 8 | ||||
| -rw-r--r-- | tests/Lexer/IsMethodsTest.php | 10 | ||||
| -rw-r--r-- | tests/Lexer/TokensListTest.php | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/tests/Lexer/ContextTest.php b/tests/Lexer/ContextTest.php index ac9c073..4866cf4 100644 --- a/tests/Lexer/ContextTest.php +++ b/tests/Lexer/ContextTest.php @@ -11,14 +11,14 @@ class ContextTest extends TestCase { // Default context is 5.7.0. $this->assertEquals('\\PhpMyAdmin\\SqlParser\\Contexts\\ContextMySql50700', Context::$loadedContext); - $this->assertTrue(isset(Context::$KEYWORDS['STORED'])); - $this->assertFalse(isset(Context::$KEYWORDS['AUTHORS'])); + $this->assertArrayHasKey('STORED', Context::$KEYWORDS); + $this->assertArrayNotHasKey('AUTHORS', Context::$KEYWORDS); // Restoring context. Context::load(''); $this->assertEquals('\\PhpMyAdmin\\SqlParser\\Contexts\\ContextMySql50700', Context::$defaultContext); - $this->assertTrue(isset(Context::$KEYWORDS['STORED'])); - $this->assertFalse(isset(Context::$KEYWORDS['AUTHORS'])); + $this->assertArrayHasKey('STORED', Context::$KEYWORDS); + $this->assertArrayNotHasKey('AUTHORS', Context::$KEYWORDS); } /** diff --git a/tests/Lexer/IsMethodsTest.php b/tests/Lexer/IsMethodsTest.php index 192b194..56552c7 100644 --- a/tests/Lexer/IsMethodsTest.php +++ b/tests/Lexer/IsMethodsTest.php @@ -24,10 +24,10 @@ class IsMethodsTest extends TestCase ); $this->assertEquals(1 | Token::FLAG_KEYWORD_RESERVED, Context::isKeyword('FROM', true)); - $this->assertEquals(null, Context::isKeyword('MODIFY', true)); + $this->assertNull(Context::isKeyword('MODIFY', true)); - $this->assertEquals(null, Context::isKeyword('foo')); - $this->assertEquals(null, Context::isKeyword('bar baz')); + $this->assertNull(Context::isKeyword('foo')); + $this->assertNull(Context::isKeyword('bar baz')); } public function testIsOperator() @@ -40,7 +40,7 @@ class IsMethodsTest extends TestCase $this->assertEquals(Token::FLAG_OPERATOR_ASSIGNMENT, Context::isOperator(':=')); $this->assertEquals(Token::FLAG_OPERATOR_SQL, Context::isOperator(',')); - $this->assertEquals(Context::isOperator('a'), null); + $this->assertNull(Context::isOperator('a')); } public function testIsWhitespace() @@ -68,7 +68,7 @@ class IsMethodsTest extends TestCase $this->assertEquals(Token::FLAG_COMMENT_C, Context::isComment('/*comment */')); $this->assertEquals(Token::FLAG_COMMENT_SQL, Context::isComment('-- my comment')); - $this->assertEquals(null, Context::isComment('--not a comment')); + $this->assertNull(Context::isComment('--not a comment')); } public function testIsBool() diff --git a/tests/Lexer/TokensListTest.php b/tests/Lexer/TokensListTest.php index 7e7bfb5..7d23eee 100644 --- a/tests/Lexer/TokensListTest.php +++ b/tests/Lexer/TokensListTest.php @@ -54,7 +54,7 @@ class TokensListTest extends TestCase $this->assertEquals($this->tokens[2], $list->getNext()); $this->assertEquals($this->tokens[4], $list->getNext()); $this->assertEquals($this->tokens[6], $list->getNext()); - $this->assertEquals(null, $list->getNext()); + $this->assertNull($list->getNext()); } public function testGetNextOfType() @@ -62,14 +62,14 @@ class TokensListTest extends TestCase $list = new TokensList($this->tokens); $this->assertEquals($this->tokens[0], $list->getNextOfType(Token::TYPE_KEYWORD)); $this->assertEquals($this->tokens[4], $list->getNextOfType(Token::TYPE_KEYWORD)); - $this->assertEquals(null, $list->getNextOfType(Token::TYPE_KEYWORD)); + $this->assertNull($list->getNextOfType(Token::TYPE_KEYWORD)); } public function testGetNextOfTypeAndValue() { $list = new TokensList($this->tokens); $this->assertEquals($this->tokens[0], $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'SELECT')); - $this->assertEquals(null, $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'SELECT')); + $this->assertNull($list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'SELECT')); } public function testArrayAccess() @@ -90,8 +90,8 @@ class TokensListTest extends TestCase } // offsetExists($offset) - $this->assertTrue(isset($list[2])); - $this->assertFalse(isset($list[8])); + $this->assertArrayHasKey(2, $list); + $this->assertArrayNotHasKey(8, $list); // offsetUnset($offset) unset($list[2]); |