Merge pull request #201 from dpDesignz/master

TheTechsTech · web-flow · commit 66e82e6ebe99 · 2021-02-08T13:11:47.000-05:00
PHPUnit Tests
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -45,7 +45,7 @@ public function testErrorMysqli()
         }
 
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');
+        $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');
         $settings = Config::initialize('mysqli', [self::TEST_DB_USER, self::TEST_DB_PASSWORD]);
     }
 
@@ -88,7 +88,7 @@ public function testErrorPdo()
 
         $dsn = 'mysql:host=' . self::TEST_DB_HOST . ';dbname=' . self::TEST_DB_NAME . ';port=3306';
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');
+        $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');
         $settings = Config::initialize('pdo', [$dsn]);
     }
 
@@ -102,7 +102,7 @@ public function test__callPdo()
 
         $dsn = 'mysql:host=' . self::TEST_DB_HOST . ';dbname=' . self::TEST_DB_NAME . ';port=3306';
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessageRegExp('/[does not exist]/');
+        $this->expectExceptionMessageMatches('/[does not exist]/');
         $settings = new Config('pdo', [$dsn, self::TEST_DB_USER, self::TEST_DB_PASSWORD]);
         $settings->getNotAnProperty();
     }
@@ -145,7 +145,7 @@ public function testErrorPgsql()
         }
 
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');
+        $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');
         $settings = Config::initialize('pgsql', [self::TEST_DB_USER, self::TEST_DB_PASSWORD]);
     }
 
@@ -185,7 +185,7 @@ public function testErrorSqlsrv()
         }
 
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');
+        $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');
         $settings = new Config('sqlsrv', [self::TEST_DB_USER, self::TEST_DB_PASSWORD]);
     }
 
@@ -224,21 +224,21 @@ public function testErrorSqlite3()
         }
 
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');
+        $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');
         $settings = new Config('sqlite3', [self::TEST_SQLITE_DB_DIR]);
     }
 
     public function test_construct()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');
+        $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');
         $settings = new Config('', [self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME]);
     }
 
     public function test_constructArgs()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');
+        $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');
         $settings = new Config('mysqli');
     }
 }
diff --git a/tests/DInjectorTest.php b/tests/DInjectorTest.php
@@ -52,7 +52,7 @@ public function testAutoWire_Error()
     {
         $container = new DInjector();
         $this->expectException(ContainerException::class);
-        $this->expectExceptionMessageRegExp('/[is not instantiable]/');
+        $this->expectExceptionMessageMatches('/[is not instantiable]/');
         $baz = $container->autoWire('ezsql\Tests\Baz');
     }
 
@@ -70,7 +70,7 @@ public function testGet_Error()
     {
         $container = new DInjector();
         $this->expectException(NotFoundException::class);
-        $this->expectExceptionMessageRegExp('/[does not exists]/');
+        $this->expectExceptionMessageMatches('/[does not exists]/');
         $baz = $container->get('Baz');
     }
 }
diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
@@ -105,7 +105,7 @@ public function testInitialize_Pdo()
     public function testInitialize_Error()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessageRegExp('/[Missing configuration details]/');
+        $this->expectExceptionMessageMatches('/[Missing configuration details]/');
         $mysqli = Database::initialize('', [self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME]);
     }
 }
diff --git a/tests/ezSchemaTest.php b/tests/ezSchemaTest.php
@@ -104,7 +104,7 @@ public function test__call_Error()
         $this->assertFalse(column('id', INTR, 32, AUTO, PRIMARY));
         $db = mysqlInstance([self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME]);
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessageRegExp('/[does not exist]/');
+        $this->expectExceptionMessageMatches('/[does not exist]/');
         $this->assertNull(column('id', 'DOS', 32));
     }
 
diff --git a/tests/ezsqlModelTest.php b/tests/ezsqlModelTest.php
@@ -43,7 +43,7 @@ public function testSetCache_Timeout()
     public function testGetNotProperty()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessageRegExp('/does not exist/');
+        $this->expectExceptionMessageMatches('/does not exist/');
         $res = $this->object->getNotProperty();
     }
 
diff --git a/tests/mysqli/mysqliTest.php b/tests/mysqli/mysqliTest.php
@@ -616,7 +616,7 @@ public function testQuery_prepared()
 
     public function test__construct_Error()
     {
-        $this->expectExceptionMessageRegExp('/[Missing configuration details]/');
+        $this->expectExceptionMessageMatches('/[Missing configuration details]/');
         $this->assertNull(new ez_mysqli());
     }
 
diff --git a/tests/pdo/pdo_mysqlTest.php b/tests/pdo/pdo_mysqlTest.php
@@ -293,9 +293,9 @@ public function testJoins()
         $this->object->insert('unit_test', array('id' => '2', 'test_key' => 'testing 2'));
         $this->object->insert('unit_test', array('id' => '3', 'test_key' => 'testing 3'));
         $this->object->query('CREATE TABLE unit_test_child(child_id integer, child_test_key varchar(50), parent_id integer, PRIMARY KEY (child_id))');
-        $this->object->insert('unit_test', array('child_id' => '1', 'child_test_key' => 'testing child 1', 'parent_id' => '3'));
-        $this->object->insert('unit_test', array('child_id' => '2', 'child_test_key' => 'testing child 2', 'parent_id' => '2'));
-        $this->object->insert('unit_test', array('child_id' => '3', 'child_test_key' => 'testing child 3', 'parent_id' => '1'));
+        $this->object->insert('unit_test_child', array('child_id' => '1', 'child_test_key' => 'testing child 1', 'parent_id' => '3'));
+        $this->object->insert('unit_test_child', array('child_id' => '2', 'child_test_key' => 'testing child 2', 'parent_id' => '2'));
+        $this->object->insert('unit_test_child', array('child_id' => '3', 'child_test_key' => 'testing child 3', 'parent_id' => '1'));
 
         $result = $this->object->selecting('unit_test_child', '*', leftJoin('unit_test_child', 'unit_test', 'parent_id', 'id'));
         $i = 1;
@@ -316,8 +316,8 @@ public function testJoins()
             --$o;
         }
 
-        $this->assertEquals(0, $this->object->query('DROP TABLE unit_test'));
-        $this->assertEquals(0, $this->object->query('DROP TABLE unit_test_child'));
+        $this->assertEquals(0, $this->object->drop('unit_test'));
+        $this->assertEquals(0, $this->object->drop('unit_test_child'));
     }
 
     public function testBeginTransactionCommit()
@@ -443,7 +443,7 @@ public function testQuery_prepared()
 
     public function test__Construct_Error()
     {
-        $this->expectExceptionMessageRegExp('/[Missing configuration details]/');
+        $this->expectExceptionMessageMatches('/[Missing configuration details]/');
         $this->assertNull(new ez_pdo());
     }
 
diff --git a/tests/pdo/pdo_pgsqlTest.php b/tests/pdo/pdo_pgsqlTest.php
@@ -215,9 +215,9 @@ public function testJoins()
         $this->object->insert('unit_test', array('id' => '2', 'test_key' => 'testing 2'));
         $this->object->insert('unit_test', array('id' => '3', 'test_key' => 'testing 3'));
         $this->object->query('CREATE TABLE unit_test_child(child_id integer, child_test_key varchar(50), parent_id integer, PRIMARY KEY (child_id))');
-        $this->object->insert('unit_test', array('child_id' => '1', 'child_test_key' => 'testing child 1', 'parent_id' => '3'));
-        $this->object->insert('unit_test', array('child_id' => '2', 'child_test_key' => 'testing child 2', 'parent_id' => '2'));
-        $this->object->insert('unit_test', array('child_id' => '3', 'child_test_key' => 'testing child 3', 'parent_id' => '1'));
+        $this->object->insert('unit_test_child', array('child_id' => '1', 'child_test_key' => 'testing child 1', 'parent_id' => '3'));
+        $this->object->insert('unit_test_child', array('child_id' => '2', 'child_test_key' => 'testing child 2', 'parent_id' => '2'));
+        $this->object->insert('unit_test_child', array('child_id' => '3', 'child_test_key' => 'testing child 3', 'parent_id' => '1'));
 
         $result = $this->object->selecting('unit_test_child', '*', leftJoin('unit_test_child', 'unit_test', 'parent_id', 'id'));
         $i = 1;
diff --git a/tests/pdo/pdo_sqliteTest.php b/tests/pdo/pdo_sqliteTest.php
@@ -244,9 +244,9 @@ public function testJoins()
         $this->object->insert('unit_test', array('id' => '2', 'test_key' => 'testing 2'));
         $this->object->insert('unit_test', array('id' => '3', 'test_key' => 'testing 3'));
         $this->object->query('CREATE TABLE unit_test_child(child_id integer, child_test_key varchar(50), parent_id integer, PRIMARY KEY (child_id))');
-        $this->object->insert('unit_test', array('child_id' => '1', 'child_test_key' => 'testing child 1', 'parent_id' => '3'));
-        $this->object->insert('unit_test', array('child_id' => '2', 'child_test_key' => 'testing child 2', 'parent_id' => '2'));
-        $this->object->insert('unit_test', array('child_id' => '3', 'child_test_key' => 'testing child 3', 'parent_id' => '1'));
+        $this->object->insert('unit_test_child', array('child_id' => '1', 'child_test_key' => 'testing child 1', 'parent_id' => '3'));
+        $this->object->insert('unit_test_child', array('child_id' => '2', 'child_test_key' => 'testing child 2', 'parent_id' => '2'));
+        $this->object->insert('unit_test_child', array('child_id' => '3', 'child_test_key' => 'testing child 3', 'parent_id' => '1'));
 
         $result = $this->object->selecting('unit_test_child', '*', leftJoin('unit_test_child', 'unit_test', 'parent_id', 'id'));
         $i = 1;
diff --git a/tests/pdo/pdo_sqlsrvTest.php b/tests/pdo/pdo_sqlsrvTest.php
@@ -219,9 +219,9 @@ public function testJoins()
         $this->object->insert('unit_test', array('id' => '2', 'test_key' => 'testing 2'));
         $this->object->insert('unit_test', array('id' => '3', 'test_key' => 'testing 3'));
         $this->object->query('CREATE TABLE unit_test_child(child_id integer, child_test_key varchar(50), parent_id integer, PRIMARY KEY (child_id))');
-        $this->object->insert('unit_test', array('child_id' => '1', 'child_test_key' => 'testing child 1', 'parent_id' => '3'));
-        $this->object->insert('unit_test', array('child_id' => '2', 'child_test_key' => 'testing child 2', 'parent_id' => '2'));
-        $this->object->insert('unit_test', array('child_id' => '3', 'child_test_key' => 'testing child 3', 'parent_id' => '1'));
+        $this->object->insert('unit_test_child', array('child_id' => '1', 'child_test_key' => 'testing child 1', 'parent_id' => '3'));
+        $this->object->insert('unit_test_child', array('child_id' => '2', 'child_test_key' => 'testing child 2', 'parent_id' => '2'));
+        $this->object->insert('unit_test_child', array('child_id' => '3', 'child_test_key' => 'testing child 3', 'parent_id' => '1'));
 
         $result = $this->object->selecting('unit_test_child', '*', leftJoin('unit_test_child', 'unit_test', 'parent_id', 'id'));
         $i = 1;

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function testErrorMysqli()`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`$this->expectException(\Exception::class);`
`48`		`- $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');`
	`48`	`+ $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');`
`49`	`49`	`$settings = Config::initialize('mysqli', [self::TEST_DB_USER, self::TEST_DB_PASSWORD]);`
`50`	`50`	`}`
`51`	`51`
`@@ -88,7 +88,7 @@ public function testErrorPdo()`
`88`	`88`
`89`	`89`	`$dsn = 'mysql:host=' . self::TEST_DB_HOST . ';dbname=' . self::TEST_DB_NAME . ';port=3306';`
`90`	`90`	`$this->expectException(\Exception::class);`
`91`		`- $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');`
	`91`	`+ $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');`
`92`	`92`	`$settings = Config::initialize('pdo', [$dsn]);`
`93`	`93`	`}`
`94`	`94`
`@@ -102,7 +102,7 @@ public function test__callPdo()`
`102`	`102`
`103`	`103`	`$dsn = 'mysql:host=' . self::TEST_DB_HOST . ';dbname=' . self::TEST_DB_NAME . ';port=3306';`
`104`	`104`	`$this->expectException(\Exception::class);`
`105`		`- $this->expectExceptionMessageRegExp('/[does not exist]/');`
	`105`	`+ $this->expectExceptionMessageMatches('/[does not exist]/');`
`106`	`106`	`$settings = new Config('pdo', [$dsn, self::TEST_DB_USER, self::TEST_DB_PASSWORD]);`
`107`	`107`	`$settings->getNotAnProperty();`
`108`	`108`	`}`
`@@ -145,7 +145,7 @@ public function testErrorPgsql()`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`$this->expectException(\Exception::class);`
`148`		`- $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');`
	`148`	`+ $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');`
`149`	`149`	`$settings = Config::initialize('pgsql', [self::TEST_DB_USER, self::TEST_DB_PASSWORD]);`
`150`	`150`	`}`
`151`	`151`
`@@ -185,7 +185,7 @@ public function testErrorSqlsrv()`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`$this->expectException(\Exception::class);`
`188`		`- $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');`
	`188`	`+ $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');`
`189`	`189`	`$settings = new Config('sqlsrv', [self::TEST_DB_USER, self::TEST_DB_PASSWORD]);`
`190`	`190`	`}`
`191`	`191`
`@@ -224,21 +224,21 @@ public function testErrorSqlite3()`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`$this->expectException(\Exception::class);`
`227`		`- $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');`
	`227`	`+ $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');`
`228`	`228`	`$settings = new Config('sqlite3', [self::TEST_SQLITE_DB_DIR]);`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`public function test_construct()`
`232`	`232`	`{`
`233`	`233`	`$this->expectException(\Exception::class);`
`234`		`- $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');`
	`234`	`+ $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');`
`235`	`235`	`$settings = new Config('', [self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME]);`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`public function test_constructArgs()`
`239`	`239`	`{`
`240`	`240`	`$this->expectException(\Exception::class);`
`241`		`- $this->expectExceptionMessageRegExp('/[Missing configuration details to connect to database]/');`
	`241`	`+ $this->expectExceptionMessageMatches('/[Missing configuration details to connect to database]/');`
`242`	`242`	`$settings = new Config('mysqli');`
`243`	`243`	`}`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function testAutoWire_Error()`
`52`	`52`	`{`
`53`	`53`	`$container = new DInjector();`
`54`	`54`	`$this->expectException(ContainerException::class);`
`55`		`- $this->expectExceptionMessageRegExp('/[is not instantiable]/');`
	`55`	`+ $this->expectExceptionMessageMatches('/[is not instantiable]/');`
`56`	`56`	`$baz = $container->autoWire('ezsql\Tests\Baz');`
`57`	`57`	`}`
`58`	`58`
`@@ -70,7 +70,7 @@ public function testGet_Error()`
`70`	`70`	`{`
`71`	`71`	`$container = new DInjector();`
`72`	`72`	`$this->expectException(NotFoundException::class);`
`73`		`- $this->expectExceptionMessageRegExp('/[does not exists]/');`
	`73`	`+ $this->expectExceptionMessageMatches('/[does not exists]/');`
`74`	`74`	`$baz = $container->get('Baz');`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function testInitialize_Pdo()`
`105`	`105`	`public function testInitialize_Error()`
`106`	`106`	`{`
`107`	`107`	`$this->expectException(\Exception::class);`
`108`		`- $this->expectExceptionMessageRegExp('/[Missing configuration details]/');`
	`108`	`+ $this->expectExceptionMessageMatches('/[Missing configuration details]/');`
`109`	`109`	`$mysqli = Database::initialize('', [self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME]);`
`110`	`110`	`}`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function test__call_Error()`
`104`	`104`	`$this->assertFalse(column('id', INTR, 32, AUTO, PRIMARY));`
`105`	`105`	`$db = mysqlInstance([self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME]);`
`106`	`106`	`$this->expectException(\Exception::class);`
`107`		`- $this->expectExceptionMessageRegExp('/[does not exist]/');`
	`107`	`+ $this->expectExceptionMessageMatches('/[does not exist]/');`
`108`	`108`	`$this->assertNull(column('id', 'DOS', 32));`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testSetCache_Timeout()`
`43`	`43`	`public function testGetNotProperty()`
`44`	`44`	`{`
`45`	`45`	`$this->expectException(\Exception::class);`
`46`		`- $this->expectExceptionMessageRegExp('/does not exist/');`
	`46`	`+ $this->expectExceptionMessageMatches('/does not exist/');`
`47`	`47`	`$res = $this->object->getNotProperty();`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -616,7 +616,7 @@ public function testQuery_prepared()`
`616`	`616`
`617`	`617`	`public function test__construct_Error()`
`618`	`618`	`{`
`619`		`- $this->expectExceptionMessageRegExp('/[Missing configuration details]/');`
	`619`	`+ $this->expectExceptionMessageMatches('/[Missing configuration details]/');`
`620`	`620`	`$this->assertNull(new ez_mysqli());`
`621`	`621`	`}`
`622`	`622`