GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Refactoring tests · phpmyadmin/sql-parser@768a0d7

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

tests
- Components
- Lexer
- Misc
  - UtfStringTest.php
- Utils
  - QueryTest.php

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎tests/Components/Array2dTest.php‎`

Copy file name to clipboardExpand all lines: tests/Components/Array2dTest.php

+8-8Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ public function testParseErr3()`
`44`	`44`	`{`
`45`	`45`	`$parser = new Parser();`
`46`	`46`	`Array2d::parse($parser, $this->getTokensList(')'));`
`47`		`- $this->assertEquals(`
	`47`	`+ $this->assertCount(`
`48`	`48`	`1,`
`49`		`- count($parser->errors)`
	`49`	`+ $parser->errors`
`50`	`50`	`);`
`51`	`51`	`$this->assertEquals(`
`52`	`52`	`'An opening bracket followed by a set of values was expected.',`
`@@ -58,9 +58,9 @@ public function testParseErr4()`
`58`	`58`	`{`
`59`	`59`	`$parser = new Parser();`
`60`	`60`	`Array2d::parse($parser, $this->getTokensList('TABLE'));`
`61`		`- $this->assertEquals(`
	`61`	`+ $this->assertCount(`
`62`	`62`	`1,`
`63`		`- count($parser->errors)`
	`63`	`+ $parser->errors`
`64`	`64`	`);`
`65`	`65`	`$this->assertEquals(`
`66`	`66`	`'An opening bracket followed by a set of values was expected.',`
`@@ -72,9 +72,9 @@ public function testParseErr5()`
`72`	`72`	`{`
`73`	`73`	`$parser = new Parser();`
`74`	`74`	`Array2d::parse($parser, $this->getTokensList('(1, 2),'));`
`75`		`- $this->assertEquals(`
	`75`	`+ $this->assertCount(`
`76`	`76`	`1,`
`77`		`- count($parser->errors)`
	`77`	`+ $parser->errors`
`78`	`78`	`);`
`79`	`79`	`$this->assertEquals(`
`80`	`80`	`'An opening bracket followed by a set of values was expected.',`
`@@ -86,9 +86,9 @@ public function testParseErr6()`
`86`	`86`	`{`
`87`	`87`	`$parser = new Parser();`
`88`	`88`	`Array2d::parse($parser, $this->getTokensList('(1, 2),(3)'));`
`89`		`- $this->assertEquals(`
	`89`	`+ $this->assertCount(`
`90`	`90`	`1,`
`91`		`- count($parser->errors)`
	`91`	`+ $parser->errors`
`92`	`92`	`);`
`93`	`93`	`$this->assertEquals(`
`94`	`94`	`'2 values were expected, but found 1.',`

Collapse file

`‎tests/Components/CreateDefinitionTest.php‎`

Copy file name to clipboardExpand all lines: tests/Components/CreateDefinitionTest.php

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function testParseErr1()`
`27`	`27`	`$parser,`
`28`	`28`	`$this->getTokensList('(str TEXT, FULLTEXT INDEX indx (str)')`
`29`	`29`	`);`
`30`		`- $this->assertEquals(2, count($component));`
	`30`	`+ $this->assertCount(2, $component);`
`31`	`31`
`32`	`32`	`$this->assertEquals(`
`33`	`33`	`'A closing bracket was expected.',`

Collapse file

`‎tests/Components/ExpressionArrayTest.php‎`

Copy file name to clipboardExpand all lines: tests/Components/ExpressionArrayTest.php

+1-1Lines changed: 1 addition & 1 deletion

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`	`}`

Collapse file

`‎tests/Components/JoinKeywordTest.php‎`

Copy file name to clipboardExpand all lines: tests/Components/JoinKeywordTest.php

+5-5Lines changed: 5 additions & 5 deletions

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`

Collapse file

`‎tests/Components/KeyTest.php‎`

Copy file name to clipboardExpand all lines: tests/Components/KeyTest.php

+1-1Lines changed: 1 addition & 1 deletion

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`	`}`

Collapse file

`‎tests/Lexer/ContextTest.php‎`

Copy file name to clipboardExpand all lines: tests/Lexer/ContextTest.php

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@ public function testLoad()`
`11`	`11`	`{`
`12`	`12`	`// Default context is 5.7.0.`
`13`	`13`	`$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);`
`16`	`16`
`17`	`17`	`// Restoring context.`
`18`	`18`	`Context::load('');`
`19`	`19`	`$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);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/**`

Collapse file

`‎tests/Lexer/IsMethodsTest.php‎`

Copy file name to clipboardExpand all lines: tests/Lexer/IsMethodsTest.php

+5-5Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@ public function testIsKeyword()`
`24`	`24`	`);`
`25`	`25`
`26`	`26`	`$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));`
`28`	`28`
`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'));`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function testIsOperator()`
`@@ -40,7 +40,7 @@ public function testIsOperator()`
`40`	`40`	`$this->assertEquals(Token::FLAG_OPERATOR_ASSIGNMENT, Context::isOperator(':='));`
`41`	`41`	`$this->assertEquals(Token::FLAG_OPERATOR_SQL, Context::isOperator(','));`
`42`	`42`
`43`		`- $this->assertEquals(Context::isOperator('a'), null);`
	`43`	`+ $this->assertNull(Context::isOperator('a'));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public function testIsWhitespace()`
`@@ -68,7 +68,7 @@ public function testIsComment()`
`68`	`68`	`$this->assertEquals(Token::FLAG_COMMENT_C, Context::isComment('/comment /'));`
`69`	`69`	`$this->assertEquals(Token::FLAG_COMMENT_SQL, Context::isComment('-- my comment'));`
`70`	`70`
`71`		`- $this->assertEquals(null, Context::isComment('--not a comment'));`
	`71`	`+ $this->assertNull(Context::isComment('--not a comment'));`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public function testIsBool()`

Collapse file

`‎tests/Lexer/TokensListTest.php‎`

Copy file name to clipboardExpand all lines: tests/Lexer/TokensListTest.php

+5-5Lines changed: 5 additions & 5 deletions

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]);`

Collapse file

`‎tests/Misc/UtfStringTest.php‎`

Copy file name to clipboardExpand all lines: tests/Misc/UtfStringTest.php

+5-5Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,14 @@ public function testArrayAccess()`
`26`	`26`	`$str = new UtfString(static::TEST_PHRASE);`
`27`	`27`
`28`	`28`	`// 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);`
`32`	`32`
`33`	`33`	`// offsetGet`
`34`	`34`	`$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]);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`

Collapse file

`‎tests/Utils/QueryTest.php‎`

Copy file name to clipboardExpand all lines: tests/Utils/QueryTest.php

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ public function testGetFirstStatement()`
`540`	`540`	`$delimiter = null;`
`541`	`541`	`list($statement, $query, $delimiter) =`
`542`	`542`	`Query::getFirstStatement($query, $delimiter);`
`543`		`- $this->assertEquals(null, $statement);`
	`543`	`+ $this->assertNull($statement);`
`544`	`544`	`$this->assertEquals('USE saki', $query);`
`545`	`545`
`546`	`546`	`$query = 'USE sakila; ' .`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.