Merge pull request #183 from carusogabriel/refactoring-tests

nijel · web-flow · commit 0f8d79b722b6 · 2017-12-15T08:04:48.000+01:00
Refactoring tests
diff --git a/tests/Components/Array2dTest.php b/tests/Components/Array2dTest.php
@@ -44,9 +44,9 @@ public function testParseErr3()
     {
         $parser = new Parser();
         Array2d::parse($parser, $this->getTokensList(')'));
-        $this->assertEquals(
+        $this->assertCount(
             1,
-            count($parser->errors)
+            $parser->errors
         );
         $this->assertEquals(
             'An opening bracket followed by a set of values was expected.',
@@ -58,9 +58,9 @@ public function testParseErr4()
     {
         $parser = new Parser();
         Array2d::parse($parser, $this->getTokensList('TABLE'));
-        $this->assertEquals(
+        $this->assertCount(
             1,
-            count($parser->errors)
+            $parser->errors
         );
         $this->assertEquals(
             'An opening bracket followed by a set of values was expected.',
@@ -72,9 +72,9 @@ public function testParseErr5()
     {
         $parser = new Parser();
         Array2d::parse($parser, $this->getTokensList('(1, 2),'));
-        $this->assertEquals(
+        $this->assertCount(
             1,
-            count($parser->errors)
+            $parser->errors
         );
         $this->assertEquals(
             'An opening bracket followed by a set of values was expected.',
@@ -86,9 +86,9 @@ public function testParseErr6()
     {
         $parser = new Parser();
         Array2d::parse($parser, $this->getTokensList('(1, 2),(3)'));
-        $this->assertEquals(
+        $this->assertCount(
             1,
-            count($parser->errors)
+            $parser->errors
         );
         $this->assertEquals(
             '2 values were expected, but found 1.',
diff --git a/tests/Components/CreateDefinitionTest.php b/tests/Components/CreateDefinitionTest.php
@@ -27,7 +27,7 @@ public function testParseErr1()
             $parser,
             $this->getTokensList('(str TEXT, FULLTEXT INDEX indx (str)')
         );
-        $this->assertEquals(2, count($component));
+        $this->assertCount(2, $component);
 
         $this->assertEquals(
             'A closing bracket was expected.',
diff --git a/tests/Components/ExpressionArrayTest.php b/tests/Components/ExpressionArrayTest.php
@@ -29,7 +29,7 @@ public function testParse2()
                 'parenthesesDelimited' => true,
             )
         );
-        $this->assertEquals(1, count($component));
+        $this->assertCount(1, $component);
         $this->assertEquals('(expr)', $component[0]->expr);
     }
 }
diff --git a/tests/Components/JoinKeywordTest.php b/tests/Components/JoinKeywordTest.php
@@ -11,18 +11,18 @@ class JoinKeywordTest extends TestCase
     public function testParseIncomplete()
     {
         $component = JoinKeyword::parse(new Parser(), $this->getTokensList('JOIN a'));
-        $this->assertEquals(1, count($component));
+        $this->assertCount(1, $component);
         $this->assertEquals('a', $component[0]->expr->expr);
-        $this->assertEquals(null, $component[0]->on);
-        $this->assertEquals(null, $component[0]->using);
+        $this->assertNull($component[0]->on);
+        $this->assertNull($component[0]->using);
     }
 
     public function testParseIncompleteUsing()
     {
         $component = JoinKeyword::parse(new Parser(), $this->getTokensList('JOIN table2 USING (id)'));
-        $this->assertEquals(1, count($component));
+        $this->assertCount(1, $component);
         $this->assertEquals('table2', $component[0]->expr->expr);
-        $this->assertEquals(null, $component[0]->on);
+        $this->assertNull($component[0]->on);
         $this->assertEquals(array('id'), $component[0]->using->values);
     }
 
diff --git a/tests/Components/KeyTest.php b/tests/Components/KeyTest.php
@@ -14,6 +14,6 @@ public function testParse()
             new Parser(),
             $this->getTokensList('')
         );
-        $this->assertEquals(null, $component->name);
+        $this->assertNull($component->name);
     }
 }
diff --git a/tests/Lexer/ContextTest.php b/tests/Lexer/ContextTest.php
@@ -11,14 +11,14 @@ public function testLoad()
     {
         // 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
@@ -24,10 +24,10 @@ public function testIsKeyword()
         );
 
         $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 @@ public function testIsOperator()
         $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 @@ public function testIsComment()
         $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
@@ -54,22 +54,22 @@ public function testGetNext()
         $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()
     {
         $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 @@ public function testArrayAccess()
         }
 
         // 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]);
diff --git a/tests/Misc/UtfStringTest.php b/tests/Misc/UtfStringTest.php
@@ -26,14 +26,14 @@ public function testArrayAccess()
         $str = new UtfString(static::TEST_PHRASE);
 
         // offsetExists
-        $this->assertTrue(isset($str[static::TEST_PHRASE_LEN - 1]));
-        $this->assertFalse(isset($str[-1]));
-        $this->assertFalse(isset($str[static::TEST_PHRASE_LEN]));
+        $this->assertArrayHasKey(static::TEST_PHRASE_LEN - 1, $str);
+        $this->assertArrayNotHasKey(-1, $str);
+        $this->assertArrayNotHasKey(static::TEST_PHRASE_LEN, $str);
 
         // offsetGet
         $this->assertEquals('.', $str[static::TEST_PHRASE_LEN - 1]);
-        $this->assertEquals(null, $str[-1]);
-        $this->assertEquals(null, $str[static::TEST_PHRASE_LEN]);
+        $this->assertNull($str[-1]);
+        $this->assertNull($str[static::TEST_PHRASE_LEN]);
     }
 
     /**
diff --git a/tests/Utils/QueryTest.php b/tests/Utils/QueryTest.php
@@ -540,7 +540,7 @@ public function testGetFirstStatement()
         $delimiter = null;
         list($statement, $query, $delimiter) =
             Query::getFirstStatement($query, $delimiter);
-        $this->assertEquals(null, $statement);
+        $this->assertNull($statement);
         $this->assertEquals('USE saki', $query);
 
         $query = 'USE sakila; ' .

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function testParse2()`
`29`	`29`	`'parenthesesDelimited' => true,`
`30`	`30`	`)`
`31`	`31`	`);`
`32`		`- $this->assertEquals(1, count($component));`
	`32`	`+ $this->assertCount(1, $component);`
`33`	`33`	`$this->assertEquals('(expr)', $component[0]->expr);`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,18 +11,18 @@ class JoinKeywordTest extends TestCase`
`11`	`11`	`public function testParseIncomplete()`
`12`	`12`	`{`
`13`	`13`	`$component = JoinKeyword::parse(new Parser(), $this->getTokensList('JOIN a'));`
`14`		`- $this->assertEquals(1, count($component));`
	`14`	`+ $this->assertCount(1, $component);`
`15`	`15`	`$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);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public function testParseIncompleteUsing()`
`21`	`21`	`{`
`22`	`22`	`$component = JoinKeyword::parse(new Parser(), $this->getTokensList('JOIN table2 USING (id)'));`
`23`		`- $this->assertEquals(1, count($component));`
	`23`	`+ $this->assertCount(1, $component);`
`24`	`24`	`$this->assertEquals('table2', $component[0]->expr->expr);`
`25`		`- $this->assertEquals(null, $component[0]->on);`
	`25`	`+ $this->assertNull($component[0]->on);`
`26`	`26`	`$this->assertEquals(array('id'), $component[0]->using->values);`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ public function testParse()`
`14`	`14`	`new Parser(),`
`15`	`15`	`$this->getTokensList('')`
`16`	`16`	`);`
`17`		`- $this->assertEquals(null, $component->name);`
	`17`	`+ $this->assertNull($component->name);`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,22 +54,22 @@ public function testGetNext()`
`54`	`54`	`$this->assertEquals($this->tokens[2], $list->getNext());`
`55`	`55`	`$this->assertEquals($this->tokens[4], $list->getNext());`
`56`	`56`	`$this->assertEquals($this->tokens[6], $list->getNext());`
`57`		`- $this->assertEquals(null, $list->getNext());`
	`57`	`+ $this->assertNull($list->getNext());`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public function testGetNextOfType()`
`61`	`61`	`{`
`62`	`62`	`$list = new TokensList($this->tokens);`
`63`	`63`	`$this->assertEquals($this->tokens[0], $list->getNextOfType(Token::TYPE_KEYWORD));`
`64`	`64`	`$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));`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public function testGetNextOfTypeAndValue()`
`69`	`69`	`{`
`70`	`70`	`$list = new TokensList($this->tokens);`
`71`	`71`	`$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'));`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public function testArrayAccess()`
`@@ -90,8 +90,8 @@ public function testArrayAccess()`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`// offsetExists($offset)`
`93`		`- $this->assertTrue(isset($list[2]));`
`94`		`- $this->assertFalse(isset($list[8]));`
	`93`	`+ $this->assertArrayHasKey(2, $list);`
	`94`	`+ $this->assertArrayNotHasKey(8, $list);`
`95`	`95`
`96`	`96`	`// offsetUnset($offset)`
`97`	`97`	`unset($list[2]);`