Tests: Remove deprecated methods and replace their usages

`setupTest()` had an empty function body, so no replacement is necessary.

Author: sukhwinder33445

tests/DeleteTest.php

@@ -19,7 +19,7 @@ public function testFrom()
 
         $this->query->from('table');
         $this->assertSame(['table'], $this->query->getFrom());
-        $this->assertCorrectStatementAndValues('DELETE FROM table', []);
+        $this->assertSql('DELETE FROM table', $this->query, []);
     }
 
     public function testFromWithAlias()
@@ -28,7 +28,7 @@ public function testFromWithAlias()
 
         $this->query->from('table t1');
         $this->assertSame(['table t1'], $this->query->getFrom());
-        $this->assertCorrectStatementAndValues('DELETE FROM table t1', []);
+        $this->assertSql('DELETE FROM table t1', $this->query, []);
     }
 
     public function testFromWithArray()
@@ -37,6 +37,6 @@ public function testFromWithArray()
 
         $this->query->from(['t1' => 'table']);
         $this->assertSame(['t1' => 'table'], $this->query->getFrom());
-        $this->assertCorrectStatementAndValues('DELETE FROM table t1', []);
+        $this->assertSql('DELETE FROM table t1', $this->query, []);
     }
 }

tests/HavingTest.php

@@ -9,19 +9,15 @@ class HavingTest extends TestCase
 {
     public function testHavingStringFormat()
     {
-        $this->setupTest();
-
         $this->query->having('c1 = x');
         $this->query->having('c2 IS NULL');
         $this->query->having('c3 IS NOT NULL');
 
-        $this->assertCorrectStatementAndValues('HAVING (c1 = x) AND (c2 IS NULL) AND (c3 IS NOT NULL)', []);
+        $this->assertSql('HAVING (c1 = x) AND (c2 IS NULL) AND (c3 IS NOT NULL)', $this->query, []);
     }
 
     public function testHavingArrayFormat()
     {
-        $this->setupTest();
-
         $this->query->having(['c1 = x']);
         $this->query->having(['c2 = ?' => 1]);
         $this->query->having(['c3 > ?' => 1]);
@@ -30,37 +26,32 @@ public function testHavingArrayFormat()
         $this->query->having(['c6 IN (?)' => [1, 2, 3]]);
         $this->query->having(['c7 = ?' => 1, 'c8 = ?' => 1]);
 
-        $this->assertCorrectStatementAndValues(
+        $this->assertSql(
             'HAVING (c1 = x) AND (c2 = ?) AND (c3 > ?) AND (c4 IS NULL)'
                 . ' AND (c5 IS NOT NULL) AND (c6 IN (?, ?, ?)) AND ((c7 = ?) AND (c8 = ?))',
+            $this->query,
             [1, 1, 1, 2, 3, 1, 1]
         );
     }
 
     public function testWhereWithExpression()
     {
-        $this->setupTest();
-
         $expression = new Expression('c2 = ?', null, 1);
         $this->query->having($expression);
 
-        $this->assertCorrectStatementAndValues('HAVING c2 = ?', [1]);
+        $this->assertSql('HAVING c2 = ?', $this->query, [1]);
     }
 
     public function testWhereWithSelect()
     {
-        $this->setupTest();
-
         $select = (new Select())->columns('COUNT(*)')->from('t1')->where(['c2 = ?' => 1]);
         $this->query->having($select);
 
-        $this->assertCorrectStatementAndValues('HAVING (SELECT COUNT(*) FROM t1 WHERE c2 = ?)', [1]);
+        $this->assertSql('HAVING (SELECT COUNT(*) FROM t1 WHERE c2 = ?)', $this->query, [1]);
     }
 
     public function testResetHaving()
     {
-        $this->setupTest();
-
         $this->query->having('c1 = x');
         $this->assertSame(
             ['AND', [['AND', ['c1 = x']]]],

tests/InsertTest.php

@@ -15,97 +15,79 @@ class InsertTest extends TestCase
 
     public function testEmptyInsertInto()
     {
-        $this->setupTest();
-
         $this->assertSame(null, $this->query->getInto());
         $this->assertSame([], $this->query->getColumns());
         $this->assertSame([], $this->query->getValues());
         $this->assertSame(null, $this->query->getSelect());
-        $this->assertCorrectStatementAndValues('() VALUES()', []); // TODO(el): Should we render anything here?
+        $this->assertSql('() VALUES()', $this->query, []); // TODO(el): Should we render anything here?
     }
 
     public function testIntoTableSpecification()
     {
-        $this->setupTest();
-
         $this->query->into('table');
 
         $this->assertSame('table', $this->query->getInto());
-        $this->assertCorrectStatementAndValues('INSERT INTO table () VALUES()', []);
+        $this->assertSql('INSERT INTO table () VALUES()', $this->query, []);
     }
 
     public function testIntoTableSpecificationWithSchema()
     {
-        $this->setupTest();
-
         $this->query->into('schema.table');
 
         $this->assertSame('schema.table', $this->query->getInto());
-        $this->assertCorrectStatementAndValues('INSERT INTO schema.table () VALUES()', []);
+        $this->assertSql('INSERT INTO schema.table () VALUES()', $this->query, []);
     }
 
     public function testColumns()
     {
-        $this->setupTest();
-
         $columns = ['c1', 'c2'];
         $this->query->columns($columns);
 
         $this->assertSame($columns, $this->query->getColumns());
-        $this->assertCorrectStatementAndValues('(c1,c2) VALUES()', []);
+        $this->assertSql('(c1,c2) VALUES()', $this->query, []);
     }
 
     public function testValues()
     {
-        $this->setupTest();
-
         $this->query->values(['c1' => 'v1']);
 
         $this->assertSame(['c1'], $this->query->getColumns());
         $this->assertSame(['v1'], $this->query->getValues());
-        $this->assertCorrectStatementAndValues('(c1) VALUES(?)', ['v1']);
+        $this->assertSql('(c1) VALUES(?)', $this->query, ['v1']);
     }
 
     public function testExpressionValue()
     {
-        $this->setupTest();
-
         $value = new Expression('x = ?', null, 1);
         $this->query->values(['c1' => $value]);
 
         $this->assertSame(['c1'], $this->query->getColumns());
         $this->assertSame([$value], $this->query->getValues());
-        $this->assertCorrectStatementAndValues('(c1) VALUES(x = ?)', [1]);
+        $this->assertSql('(c1) VALUES(x = ?)', $this->query, [1]);
     }
 
     public function testSelectValue()
     {
-        $this->setupTest();
-
         $value = (new Select())->columns('COUNT(*)')->from('table2')->where(['active = ?' => 1]);
         $this->query->values(['c1' => $value]);
 
         $this->assertSame(['c1'], $this->query->getColumns());
         $this->assertSame([$value], $this->query->getValues());
-        $this->assertCorrectStatementAndValues('(c1) VALUES((SELECT COUNT(*) FROM table2 WHERE active = ?))', [1]);
+        $this->assertSql('(c1) VALUES((SELECT COUNT(*) FROM table2 WHERE active = ?))', $this->query, [1]);
     }
 
     public function testColumnsAndValues()
     {
-        $this->setupTest();
-
         $this->query->columns(['c1', 'c2']);
         $this->query->values(['v1', 'v2']);
 
         $this->assertSame(['c1', 'c2'], $this->query->getColumns());
         $this->assertSame(['v1', 'v2'], $this->query->getValues());
-        $this->assertCorrectStatementAndValues('(c1,c2) VALUES(?,?)', ['v1', 'v2']);
+        $this->assertSql('(c1,c2) VALUES(?,?)', $this->query, ['v1', 'v2']);
     }
 
     public function testInsertIntoSelectStatement()
     {
-        $this->setupTest();
-
         $select = (new Select())
             ->from('table')
             ->columns(['c1', 'c2']);
@@ -116,29 +98,25 @@ public function testInsertIntoSelectStatement()
             ->select($select);
 
         $this->assertSame($select, $this->query->getSelect());
-        $this->assertCorrectStatementAndValues('INSERT INTO table (c1,c2) SELECT c1, c2 FROM table', []);
+        $this->assertSql('INSERT INTO table (c1,c2) SELECT c1, c2 FROM table', $this->query, []);
     }
 
     public function testInsertIntoStatementWithValues()
     {
-        $this->setupTest();
-
         $this->query
             ->into('table')
             ->values(['c1' => 'v1', 'c2' => 'v2']);
 
-        $this->assertCorrectStatementAndValues('INSERT INTO table (c1,c2) VALUES(?,?)', ['v1', 'v2']);
+        $this->assertSql('INSERT INTO table (c1,c2) VALUES(?,?)', $this->query, ['v1', 'v2']);
     }
 
     public function testInsertIntoStatementWithColumnsAndValues()
     {
-        $this->setupTest();
-
         $this->query
             ->into('table')
             ->columns(['c1', 'c2'])
             ->values(['v1', 'v2']);
 
-        $this->assertCorrectStatementAndValues('INSERT INTO table (c1,c2) VALUES(?,?)', ['v1', 'v2']);
+        $this->assertSql('INSERT INTO table (c1,c2) VALUES(?,?)', $this->query, ['v1', 'v2']);
     }
 }

tests/Mssql/SelectTest.php

@@ -11,37 +11,29 @@ class SelectTest extends TestCase
 
     public function testLimitOffset()
     {
-        $this->setupTest();
-
         $this->query->columns('a')->from('b')->orderBy('a')->limit(10)->offset(20);
 
-        $this->assertCorrectStatementAndValues('SELECT a FROM b ORDER BY a OFFSET 20 ROWS FETCH NEXT 10 ROWS ONLY');
+        $this->assertSql('SELECT a FROM b ORDER BY a OFFSET 20 ROWS FETCH NEXT 10 ROWS ONLY', $this->query);
     }
 
     public function testLimitWithoutOffset()
     {
-        $this->setupTest();
-
         $this->query->columns('a')->from('b')->orderBy('a')->limit(10);
 
-        $this->assertCorrectStatementAndValues('SELECT a FROM b ORDER BY a OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY');
+        $this->assertSql('SELECT a FROM b ORDER BY a OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY', $this->query);
     }
 
     public function testOffsetWithoutLimit()
     {
-        $this->setupTest();
-
         $this->query->columns('a')->from('b')->orderBy('a')->offset(20);
 
-        $this->assertCorrectStatementAndValues('SELECT a FROM b ORDER BY a OFFSET 20 ROWS');
+        $this->assertSql('SELECT a FROM b ORDER BY a OFFSET 20 ROWS', $this->query);
     }
 
     public function testAutomaticallyFixesLimitWithoutOrder()
     {
-        $this->setupTest();
-
         $this->query->columns('a')->from('b')->limit(10)->offset(30);
 
-        $this->assertCorrectStatementAndValues('SELECT a FROM b ORDER BY 1 OFFSET 30 ROWS FETCH NEXT 10 ROWS ONLY');
+        $this->assertSql('SELECT a FROM b ORDER BY 1 OFFSET 30 ROWS FETCH NEXT 10 ROWS ONLY', $this->query);
     }
 }