* use only core classes for testing

* with one exception (for now) PHPUnit_Extensions_Database_TestCase
atk4 · Mar 22, 2018 · 4883305 · 4883305
1 parent 98efbdf
commit 4883305
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 61 deletions.
diff --git a/phpunit-mysql.xml b/phpunit-mysql.xml
@@ -1,4 +1,4 @@
-<phpunit bootstrap="vendor/autoload.php">
+<phpunit colors="true" bootstrap="vendor/autoload.php" printerClass="atk4\core\PHPUnit_AgileResultPrinter">
     <php>
         <var name="DB_DSN" value="mysql:dbname=dsql_test;host=localhost" />
         <var name="DB_USER" value="travis" />

diff --git a/phpunit-pgsql.xml b/phpunit-pgsql.xml
@@ -1,4 +1,4 @@
-<phpunit bootstrap="vendor/autoload.php">
+<phpunit colors="true" bootstrap="vendor/autoload.php" printerClass="atk4\core\PHPUnit_AgileResultPrinter">
     <php>
         <var name="DB_DSN" value="pgsql:dbname=atk4-dsql-test;host=localhost" />
         <var name="DB_USER" value="postgres" />

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,4 +1,4 @@
-<phpunit bootstrap="vendor/autoload.php">
+<phpunit colors="true" bootstrap="vendor/autoload.php" printerClass="atk4\core\PHPUnit_AgileResultPrinter">
     <php>
         <var name="DB_DSN" value="sqlite::memory:" />
         <var name="DB_USER" value="travis" />

diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -7,7 +7,7 @@
 /**
  * @coversDefaultClass \atk4\dsql\ConnectionTest
  */
-class ConnectionTest extends \PHPUnit_Framework_TestCase
+class ConnectionTest extends \atk4\core\PHPUnit_AgileTestCase
 {
     /**
      * Test constructor.

diff --git a/tests/ExceptionTest.php b/tests/ExceptionTest.php
@@ -7,7 +7,7 @@
 /**
  * @coversDefaultClass \atk4\dsql\Exception
  */
-class ExceptionTest extends \PHPUnit_Framework_TestCase
+class ExceptionTest extends \atk4\core\PHPUnit_AgileTestCase
 {
     /**
      * Test constructor.

diff --git a/tests/ExpressionTest.php b/tests/ExpressionTest.php
@@ -9,7 +9,7 @@
 /**
  * @coversDefaultClass \atk4\dsql\Expression
  */
-class ExpressionTest extends \PHPUnit_Framework_TestCase
+class ExpressionTest extends \atk4\core\PHPUnit_AgileTestCase
 {
     public function e()
     {
@@ -286,57 +286,57 @@ public function testEscape()
         // escaping expressions
         $this->assertEquals(
             '"first_name"',
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escape', ['first_name'])
+            $this->callProtected($this->e(), '_escape', ['first_name'])
         );
         $this->assertEquals(
             '"123"',
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escape', [123])
+            $this->callProtected($this->e(), '_escape', [123])
         );
         $this->assertEquals(
             '"he""llo"',
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escape', ['he"llo'])
+            $this->callProtected($this->e(), '_escape', ['he"llo'])
         );
 
         // should not escape expressions
         $this->assertEquals(
             '*',
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escapeSoft', ['*'])
+            $this->callProtected($this->e(), '_escapeSoft', ['*'])
         );
         $this->assertEquals(
             '"*"',
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escape', ['*'])
+            $this->callProtected($this->e(), '_escape', ['*'])
         );
         $this->assertEquals(
             '(2+2) age',
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escapeSoft', ['(2+2) age'])
+            $this->callProtected($this->e(), '_escapeSoft', ['(2+2) age'])
         );
         $this->assertEquals(
             '"(2+2) age"',
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escape', ['(2+2) age'])
+            $this->callProtected($this->e(), '_escape', ['(2+2) age'])
         );
         $this->assertEquals(
             '"users"."first_name"',
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escapeSoft', ['users.first_name'])
+            $this->callProtected($this->e(), '_escapeSoft', ['users.first_name'])
         );
         $this->assertEquals(
             '"users".*',
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escapeSoft', ['users.*'])
+            $this->callProtected($this->e(), '_escapeSoft', ['users.*'])
         );
         $this->assertEquals(
             true,
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escapeSoft', [new \stdClass()]) instanceof \stdClass
+            $this->callProtected($this->e(), '_escapeSoft', [new \stdClass()]) instanceof \stdClass
         );
 
         // escaping array - escapes each of its elements using hard escape
         $this->assertEquals(
             ['"first_name"', '*', '"last_name"'],
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escapeSoft', [['first_name', '*', 'last_name']])
+            $this->callProtected($this->e(), '_escapeSoft', [['first_name', '*', 'last_name']])
         );
 
         // escaping array - escapes each of its elements using hard escape
         $this->assertEquals(
             ['"first_name"', '"*"', '"last_name"'],
-            PHPUnitUtil::callProtectedMethod($this->e(), '_escape', [['first_name', '*', 'last_name']])
+            $this->callProtected($this->e(), '_escape', [['first_name', '*', 'last_name']])
         );
 
         $this->assertEquals(
@@ -392,19 +392,19 @@ public function testConsume()
         // few brief tests on _consume
         $this->assertEquals(
             '"123"',
-            PHPUnitUtil::callProtectedMethod($this->e(), '_consume', [123, 'escape'])
+            $this->callProtected($this->e(), '_consume', [123, 'escape'])
         );
         $this->assertEquals(
             ':x',
-            PHPUnitUtil::callProtectedMethod($this->e(['_paramBase' => 'x']), '_consume', [123, 'param'])
+            $this->callProtected($this->e(['_paramBase' => 'x']), '_consume', [123, 'param'])
         );
         $this->assertEquals(
             123,
-            PHPUnitUtil::callProtectedMethod($this->e(), '_consume', [123, 'none'])
+            $this->callProtected($this->e(), '_consume', [123, 'none'])
         );
         $this->assertEquals(
             '(select *)',
-            PHPUnitUtil::callProtectedMethod($this->e(), '_consume', [new Query()])
+            $this->callProtected($this->e(), '_consume', [new Query()])
         );
 
         $this->assertEquals(
@@ -421,7 +421,7 @@ public function testConsume()
      */
     public function testConsumeException1()
     {
-        PHPUnitUtil::callProtectedMethod($this->e(), '_consume', [123, 'blahblah']);
+        $this->callProtected($this->e(), '_consume', [123, 'blahblah']);
     }
 
     /**
@@ -432,7 +432,7 @@ public function testConsumeException1()
      */
     public function testConsumeException2()
     {
-        PHPUnitUtil::callProtectedMethod($this->e(), '_consume', [new \StdClass()]);
+        $this->callProtected($this->e(), '_consume', [new \StdClass()]);
     }
 
     /**

diff --git a/tests/OracleTest.php b/tests/OracleTest.php
@@ -7,7 +7,7 @@
 /**
  * @coversDefaultClass \atk4\dsql\ConnectionTest
  */
-class OracleTest extends \PHPUnit_Framework_TestCase
+class OracleTest extends \atk4\core\PHPUnit_AgileTestCase
 {
     /**
      * Test constructor.

diff --git a/tests/PHPUnitUtil.php b/tests/PHPUnitUtil.php
diff --git a/tests/QueryTest.php b/tests/QueryTest.php
@@ -8,7 +8,7 @@
 /**
  * @coversDefaultClass \atk4\dsql\Query
  */
-class QueryTest extends \PHPUnit_Framework_TestCase
+class QueryTest extends \atk4\core\PHPUnit_AgileTestCase
 {
     public function q()
     {
@@ -33,7 +33,7 @@ public function testConstruct()
         // passing properties in constructor
         $this->assertEquals(
             '"q"',
-            PHPUnitUtil::callProtectedMethod($this->q(), '_escape', ['q'])
+            $this->callProtected($this->q(), '_escape', ['q'])
         );
     }
 
@@ -69,55 +69,55 @@ public function testFieldBasic()
     {
         $this->assertEquals(
             '"first_name"',
-            PHPUnitUtil::callProtectedMethod($this->q()->field('first_name'), '_render_field')
+            $this->callProtected($this->q()->field('first_name'), '_render_field')
         );
         $this->assertEquals(
             '"first_name","last_name"',
-            PHPUnitUtil::callProtectedMethod($this->q()->field('first_name,last_name'), '_render_field')
+            $this->callProtected($this->q()->field('first_name,last_name'), '_render_field')
         );
         $this->assertEquals(
             '"first_name","last_name"',
-            PHPUnitUtil::callProtectedMethod($this->q()->field('first_name')->field('last_name'), '_render_field')
+            $this->callProtected($this->q()->field('first_name')->field('last_name'), '_render_field')
         );
         $this->assertEquals(
             '"last_name"',
-            PHPUnitUtil::callProtectedMethod($this->q()->field('first_name')->reset('field')->field('last_name'), '_render_field')
+            $this->callProtected($this->q()->field('first_name')->reset('field')->field('last_name'), '_render_field')
         );
         $this->assertEquals(
             '*',
-            PHPUnitUtil::callProtectedMethod($this->q()->field('first_name')->reset('field'), '_render_field')
+            $this->callProtected($this->q()->field('first_name')->reset('field'), '_render_field')
         );
         $this->assertEquals(
             '*',
-            PHPUnitUtil::callProtectedMethod($this->q()->field('first_name')->reset(), '_render_field')
+            $this->callProtected($this->q()->field('first_name')->reset(), '_render_field')
         );
         $this->assertEquals(
             '"employee"."first_name"',
-            PHPUnitUtil::callProtectedMethod($this->q()->field('employee.first_name'), '_render_field')
+            $this->callProtected($this->q()->field('employee.first_name'), '_render_field')
         );
         $this->assertEquals(
             '"first_name" "name"',
-            PHPUnitUtil::callProtectedMethod($this->q()->field('first_name', 'name'), '_render_field')
+            $this->callProtected($this->q()->field('first_name', 'name'), '_render_field')
         );
         $this->assertEquals(
             '"first_name" "name"',
-            PHPUnitUtil::callProtectedMethod($this->q()->field(['name' => 'first_name']), '_render_field')
+            $this->callProtected($this->q()->field(['name' => 'first_name']), '_render_field')
         );
         $this->assertEquals(
             '"name"',
-            PHPUnitUtil::callProtectedMethod($this->q()->field(['name' => 'name']), '_render_field')
+            $this->callProtected($this->q()->field(['name' => 'name']), '_render_field')
         );
         $this->assertEquals(
             '"employee"."first_name" "name"',
-            PHPUnitUtil::callProtectedMethod($this->q()->field(['name' => 'employee.first_name']), '_render_field')
+            $this->callProtected($this->q()->field(['name' => 'employee.first_name']), '_render_field')
         );
         $this->assertEquals(
             '*',
-            PHPUnitUtil::callProtectedMethod($this->q()->field('*'), '_render_field')
+            $this->callProtected($this->q()->field('*'), '_render_field')
         );
         $this->assertEquals(
             '"employee"."first_name"',
-            PHPUnitUtil::callProtectedMethod($this->q()->field('employee.first_name'), '_render_field')
+            $this->callProtected($this->q()->field('employee.first_name'), '_render_field')
         );
     }
 
@@ -132,22 +132,22 @@ public function testFieldDefaultField()
         // default defaultField
         $this->assertEquals(
             '*',
-            PHPUnitUtil::callProtectedMethod($this->q(), '_render_field')
+            $this->callProtected($this->q(), '_render_field')
         );
         // defaultField as custom string - not escaped
         $this->assertEquals(
             'id',
-            PHPUnitUtil::callProtectedMethod($this->q(['defaultField' => 'id']), '_render_field')
+            $this->callProtected($this->q(['defaultField' => 'id']), '_render_field')
         );
         // defaultField as custom string with dot - not escaped
         $this->assertEquals(
             'all.values',
-            PHPUnitUtil::callProtectedMethod($this->q(['defaultField' => 'all.values']), '_render_field')
+            $this->callProtected($this->q(['defaultField' => 'all.values']), '_render_field')
         );
         // defaultField as Expression object - not escaped
         $this->assertEquals(
             'values()',
-            PHPUnitUtil::callProtectedMethod($this->q(['defaultField' => new Expression('values()')]), '_render_field')
+            $this->callProtected($this->q(['defaultField' => new Expression('values()')]), '_render_field')
         );
     }
 

diff --git a/tests/RandomTests.php b/tests/RandomTests.php
@@ -7,7 +7,7 @@
 /**
  * @coversDefaultClass \atk4\dsql\Query
  */
-class RandomTests extends \PHPUnit_Framework_TestCase
+class RandomTests extends \atk4\core\PHPUnit_AgileTestCase
 {
     public function q()
     {

diff --git a/tests/db/ConnectionTest.php b/tests/db/ConnectionTest.php
@@ -8,7 +8,7 @@
 /**
  * @ coversDefaultClass \atk4\dsql\Query
  */
-class dbConnectionTest extends \PHPUnit_Framework_TestCase
+class dbConnectionTest extends \atk4\core\PHPUnit_AgileTestCase
 {
     public function testSQLite()
     {