Update unit tests for the class Database

na2axl · na2axl · commit c56abfbbd99d · 2016-09-05T07:48:29.000+02:00
diff --git a/tests/JSONDBTest.php b/tests/JSONDBTest.php
@@ -5,15 +5,20 @@
 class JSONDBTest extends PHPUnit_Framework_TestCase
 {
     /**
-     * @var \JSONDB\JSONDB
+     * @var \JSONDB\Database
      */
     private static $database;
 
+    /**
+     * @var \JSONDB\JSONDB
+     */
+    private static $jsondb;
+
     public static function setUpBeforeClass()
     {
         // create db
-        self::$database = new JSONDB();
-        self::$database->createServer('__phpunit_test_server', '__phpunit', '', TRUE);
+        self::$jsondb = new JSONDB();
+        self::$database = self::$jsondb->createServer('__phpunit_test_server', '__phpunit', '', TRUE);
         self::$database->createDatabase('__phpunit_test_database')->setDatabase('__phpunit_test_database');
         self::$database->createTable('__phpunit_test_table_npk', array('php' => array('type' => 'string'), 'unit' => array('type' => 'int')));
         self::$database->createTable('__phpunit_test_table_pk', array('id' => array('auto_increment' => TRUE)));
@@ -25,31 +30,31 @@ public static function setUpBeforeClass()
      */
     public function testExceptionIsRaisedForExistingServer()
     {
-        self::$database->createServer('__phpunit_test_server', '__phpunit', '', TRUE);
+        self::$jsondb->createServer('__phpunit_test_server', '__phpunit', '', TRUE);
     }
 
     /**
      * @expectedException \JSONDB\Exception
      */
     public function testExceptionIsRaisedForNonExistingServer()
     {
-        self::$database->connect('NotExistingServerTest', '__phpunit', '');
+        self::$jsondb->connect('NotExistingServerTest', '__phpunit', '');
     }
 
     /**
      * @expectedException \JSONDB\Exception
      */
     public function testExceptionIsRaisedForInvalidUser()
     {
-        self::$database->connect('__phpunit_test_server', 'InvalidUser', '');
+        self::$jsondb->connect('__phpunit_test_server', 'InvalidUser', '');
     }
 
     /**
      * @expectedException \JSONDB\Exception
      */
     public function testExceptionIsRaisedForInvalidPassword()
     {
-        self::$database->connect('__phpunit_test_server', '__phpunit', 'InvalidPassword');
+        self::$jsondb->connect('__phpunit_test_server', '__phpunit', 'InvalidPassword');
     }
 
     /**
@@ -67,7 +72,7 @@ public function testExceptionIsRaisedForBadDatabaseConnection()
     public function testExceptionIsRaisedForExistingDatabase()
     {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '');
         self::$database->createDatabase('__phpunit_test_database');
     }
 
@@ -86,70 +91,70 @@ public function testExceptionIsRaisedForBadDatabaseConnection2()
     public function testExceptionIsRaisedForExistingTable()
     {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         self::$database->createTable('__phpunit_test_table_npk', array('php' => array('type' => 'string'), 'unit' => array('type' => 'int')));
     }
 
     public function testForInsertQuery()
     {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         $bool = self::$database->query('__phpunit_test_table_npk.insert(\'hello\', 0)');
         $this->assertTrue($bool);
     }
 
     public function testForUpdateQuery()
     {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         $bool = self::$database->query('__phpunit_test_table_npk.update(php, unit).with(\'world\', 1)');
         $this->assertTrue($bool);
     }
 
     public function testForReplaceQuery()
     {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         $bool = self::$database->query('__phpunit_test_table_npk.replace(\'nice\', 2)');
         $this->assertTrue($bool);
     }
 
     public function testForSelectQuery()
     {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         $r = self::$database->query('__phpunit_test_table_npk.select(php, unit)');
         $this->assertInstanceOf('\JSONDB\\QueryResult', $r);
     }
 
     public function testForSelectQueryFetchObject()
     {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         $r = self::$database->query('__phpunit_test_table_npk.select(php, unit)')->fetch(JSONDB::FETCH_OBJECT);
         $this->assertInstanceOf('\JSONDB\\QueryResultObject', $r);
     }
 
     public function testForDeleteQuery()
     {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         $bool = self::$database->query('__phpunit_test_table_npk.delete()');
         $this->assertTrue($bool);
     }
 
     public function testForTruncateQuery()
     {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         $bool = self::$database->query('__phpunit_test_table_npk.truncate()');
         $this->assertTrue($bool);
     }
 
     public function testForMultipleInsertion()
     {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         $bool = self::$database->query('__phpunit_test_table_pk.insert(null).and(null).and(null)');
         $this->assertTrue($bool);
     }
@@ -159,7 +164,7 @@ public function testForMultipleInsertion()
      */
     public function testExceptionIsRaisedForDuplicatePKUKOnInsert() {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         self::$database->query('__phpunit_test_table_pk.insert(1)');
     }
 
@@ -168,7 +173,7 @@ public function testExceptionIsRaisedForDuplicatePKUKOnInsert() {
      */
     public function testExceptionIsRaisedForDuplicatePKUKOnUpdate() {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         self::$database->query('__phpunit_test_table_pk.update(id).with(1)');
     }
 
@@ -177,7 +182,7 @@ public function testExceptionIsRaisedForDuplicatePKUKOnUpdate() {
      */
     public function testExceptionIsRaisedForDuplicatePKUKOnReplace() {
         self::$database->disconnect();
-        self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
+        self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');
         self::$database->query('__phpunit_test_table_pk.replace(2)');
     }
 
diff --git a/tests/autoload.php b/tests/autoload.php
@@ -8,5 +8,6 @@
     require dirname(__DIR__) . '/src/JSONDB/QueryParser.php';
     require dirname(__DIR__) . '/src/JSONDB/QueryResult.php';
     require dirname(__DIR__) . '/src/JSONDB/Util.php';
+    require dirname(__DIR__) . '/src/JSONDB/Database.php';
     require dirname(__DIR__) . '/src/JSONDB/JSONDB.php';
 

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,20 @@`
`5`	`5`	`class JSONDBTest extends PHPUnit_Framework_TestCase`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`		`- * @var \JSONDB\JSONDB`
	`8`	`+ * @var \JSONDB\Database`
`9`	`9`	`*/`
`10`	`10`	`private static $database;`
`11`	`11`
	`12`	`+ /**`
	`13`	`+ * @var \JSONDB\JSONDB`
	`14`	`+ */`
	`15`	`+ private static $jsondb;`
	`16`	`+`
`12`	`17`	`public static function setUpBeforeClass()`
`13`	`18`	`{`
`14`	`19`	`// create db`
`15`		`- self::$database = new JSONDB();`
`16`		`- self::$database->createServer('__phpunit_test_server', '__phpunit', '', TRUE);`
	`20`	`+ self::$jsondb = new JSONDB();`
	`21`	`+ self::$database = self::$jsondb->createServer('__phpunit_test_server', '__phpunit', '', TRUE);`
`17`	`22`	`self::$database->createDatabase('__phpunit_test_database')->setDatabase('__phpunit_test_database');`
`18`	`23`	`self::$database->createTable('__phpunit_test_table_npk', array('php' => array('type' => 'string'), 'unit' => array('type' => 'int')));`
`19`	`24`	`self::$database->createTable('__phpunit_test_table_pk', array('id' => array('auto_increment' => TRUE)));`
`@@ -25,31 +30,31 @@ public static function setUpBeforeClass()`
`25`	`30`	`*/`
`26`	`31`	`public function testExceptionIsRaisedForExistingServer()`
`27`	`32`	`{`
`28`		`- self::$database->createServer('__phpunit_test_server', '__phpunit', '', TRUE);`
	`33`	`+ self::$jsondb->createServer('__phpunit_test_server', '__phpunit', '', TRUE);`
`29`	`34`	`}`
`30`	`35`
`31`	`36`	`/**`
`32`	`37`	`* @expectedException \JSONDB\Exception`
`33`	`38`	`*/`
`34`	`39`	`public function testExceptionIsRaisedForNonExistingServer()`
`35`	`40`	`{`
`36`		`- self::$database->connect('NotExistingServerTest', '__phpunit', '');`
	`41`	`+ self::$jsondb->connect('NotExistingServerTest', '__phpunit', '');`
`37`	`42`	`}`
`38`	`43`
`39`	`44`	`/**`
`40`	`45`	`* @expectedException \JSONDB\Exception`
`41`	`46`	`*/`
`42`	`47`	`public function testExceptionIsRaisedForInvalidUser()`
`43`	`48`	`{`
`44`		`- self::$database->connect('__phpunit_test_server', 'InvalidUser', '');`
	`49`	`+ self::$jsondb->connect('__phpunit_test_server', 'InvalidUser', '');`
`45`	`50`	`}`
`46`	`51`
`47`	`52`	`/**`
`48`	`53`	`* @expectedException \JSONDB\Exception`
`49`	`54`	`*/`
`50`	`55`	`public function testExceptionIsRaisedForInvalidPassword()`
`51`	`56`	`{`
`52`		`- self::$database->connect('__phpunit_test_server', '__phpunit', 'InvalidPassword');`
	`57`	`+ self::$jsondb->connect('__phpunit_test_server', '__phpunit', 'InvalidPassword');`
`53`	`58`	`}`
`54`	`59`
`55`	`60`	`/**`
`@@ -67,7 +72,7 @@ public function testExceptionIsRaisedForBadDatabaseConnection()`
`67`	`72`	`public function testExceptionIsRaisedForExistingDatabase()`
`68`	`73`	`{`
`69`	`74`	`self::$database->disconnect();`
`70`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '');`
	`75`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '');`
`71`	`76`	`self::$database->createDatabase('__phpunit_test_database');`
`72`	`77`	`}`
`73`	`78`
`@@ -86,70 +91,70 @@ public function testExceptionIsRaisedForBadDatabaseConnection2()`
`86`	`91`	`public function testExceptionIsRaisedForExistingTable()`
`87`	`92`	`{`
`88`	`93`	`self::$database->disconnect();`
`89`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`94`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`90`	`95`	`self::$database->createTable('__phpunit_test_table_npk', array('php' => array('type' => 'string'), 'unit' => array('type' => 'int')));`
`91`	`96`	`}`
`92`	`97`
`93`	`98`	`public function testForInsertQuery()`
`94`	`99`	`{`
`95`	`100`	`self::$database->disconnect();`
`96`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`101`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`97`	`102`	`$bool = self::$database->query('__phpunit_test_table_npk.insert(\'hello\', 0)');`
`98`	`103`	`$this->assertTrue($bool);`
`99`	`104`	`}`
`100`	`105`
`101`	`106`	`public function testForUpdateQuery()`
`102`	`107`	`{`
`103`	`108`	`self::$database->disconnect();`
`104`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`109`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`105`	`110`	`$bool = self::$database->query('__phpunit_test_table_npk.update(php, unit).with(\'world\', 1)');`
`106`	`111`	`$this->assertTrue($bool);`
`107`	`112`	`}`
`108`	`113`
`109`	`114`	`public function testForReplaceQuery()`
`110`	`115`	`{`
`111`	`116`	`self::$database->disconnect();`
`112`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`117`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`113`	`118`	`$bool = self::$database->query('__phpunit_test_table_npk.replace(\'nice\', 2)');`
`114`	`119`	`$this->assertTrue($bool);`
`115`	`120`	`}`
`116`	`121`
`117`	`122`	`public function testForSelectQuery()`
`118`	`123`	`{`
`119`	`124`	`self::$database->disconnect();`
`120`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`125`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`121`	`126`	`$r = self::$database->query('__phpunit_test_table_npk.select(php, unit)');`
`122`	`127`	`$this->assertInstanceOf('\JSONDB\\QueryResult', $r);`
`123`	`128`	`}`
`124`	`129`
`125`	`130`	`public function testForSelectQueryFetchObject()`
`126`	`131`	`{`
`127`	`132`	`self::$database->disconnect();`
`128`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`133`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`129`	`134`	`$r = self::$database->query('__phpunit_test_table_npk.select(php, unit)')->fetch(JSONDB::FETCH_OBJECT);`
`130`	`135`	`$this->assertInstanceOf('\JSONDB\\QueryResultObject', $r);`
`131`	`136`	`}`
`132`	`137`
`133`	`138`	`public function testForDeleteQuery()`
`134`	`139`	`{`
`135`	`140`	`self::$database->disconnect();`
`136`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`141`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`137`	`142`	`$bool = self::$database->query('__phpunit_test_table_npk.delete()');`
`138`	`143`	`$this->assertTrue($bool);`
`139`	`144`	`}`
`140`	`145`
`141`	`146`	`public function testForTruncateQuery()`
`142`	`147`	`{`
`143`	`148`	`self::$database->disconnect();`
`144`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`149`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`145`	`150`	`$bool = self::$database->query('__phpunit_test_table_npk.truncate()');`
`146`	`151`	`$this->assertTrue($bool);`
`147`	`152`	`}`
`148`	`153`
`149`	`154`	`public function testForMultipleInsertion()`
`150`	`155`	`{`
`151`	`156`	`self::$database->disconnect();`
`152`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`157`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`153`	`158`	`$bool = self::$database->query('__phpunit_test_table_pk.insert(null).and(null).and(null)');`
`154`	`159`	`$this->assertTrue($bool);`
`155`	`160`	`}`
`@@ -159,7 +164,7 @@ public function testForMultipleInsertion()`
`159`	`164`	`*/`
`160`	`165`	`public function testExceptionIsRaisedForDuplicatePKUKOnInsert() {`
`161`	`166`	`self::$database->disconnect();`
`162`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`167`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`163`	`168`	`self::$database->query('__phpunit_test_table_pk.insert(1)');`
`164`	`169`	`}`
`165`	`170`
`@@ -168,7 +173,7 @@ public function testExceptionIsRaisedForDuplicatePKUKOnInsert() {`
`168`	`173`	`*/`
`169`	`174`	`public function testExceptionIsRaisedForDuplicatePKUKOnUpdate() {`
`170`	`175`	`self::$database->disconnect();`
`171`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`176`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`172`	`177`	`self::$database->query('__phpunit_test_table_pk.update(id).with(1)');`
`173`	`178`	`}`
`174`	`179`
`@@ -177,7 +182,7 @@ public function testExceptionIsRaisedForDuplicatePKUKOnUpdate() {`
`177`	`182`	`*/`
`178`	`183`	`public function testExceptionIsRaisedForDuplicatePKUKOnReplace() {`
`179`	`184`	`self::$database->disconnect();`
`180`		`- self::$database->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
	`185`	`+ self::$database = self::$jsondb->connect('__phpunit_test_server', '__phpunit', '', '__phpunit_test_database');`
`181`	`186`	`self::$database->query('__phpunit_test_table_pk.replace(2)');`
`182`	`187`	`}`
`183`	`188`