unit test cleanup

tests/unit/framework/db/CommandTest.php

@@ -9,12 +9,6 @@ use yii\db\DataReader;
 
 class CommandTest extends DatabaseTestCase
 {
-	protected function setUp()
-	{
-		parent::setUp();
-		$this->mockApplication();
-	}
-
 	public function testConstruct()
 	{
 		$db = $this->getConnection(false);

tests/unit/framework/db/ConnectionTest.php

@@ -6,12 +6,6 @@ use yii\db\Connection;
 
 class ConnectionTest extends DatabaseTestCase
 {
-	protected function setUp()
-	{
-		parent::setUp();
-		$this->mockApplication();
-	}
-
 	public function testConstruct()
 	{
 		$connection = $this->getConnection(false);

tests/unit/framework/db/DatabaseTestCase.php

@@ -16,7 +16,6 @@ abstract class DatabaseTestCase extends TestCase
 	protected function setUp()
 	{
 		parent::setUp();
-		$this->mockApplication();
 		$databases = $this->getParam('databases');
 		$this->database = $databases[$this->driverName];
 		$pdo_database = 'pdo_'.$this->driverName;
@@ -24,6 +23,7 @@ abstract class DatabaseTestCase extends TestCase
 		if (!extension_loaded('pdo') || !extension_loaded($pdo_database)) {
 			$this->markTestSkipped('pdo and pdo_'.$pdo_database.' extension are required.');
 		}
+		$this->mockApplication();
 	}
 
 	protected function tearDown()
@@ -31,6 +31,7 @@ abstract class DatabaseTestCase extends TestCase
 		if ($this->db) {
 			$this->db->close();
 		}
+		$this->destroyApplication();
 	}
 
 	/**

tests/unit/framework/db/QueryBuilderTest.php

@@ -12,12 +12,6 @@ use yii\db\cubrid\QueryBuilder as CubridQueryBuilder;
 
 class QueryBuilderTest extends DatabaseTestCase
 {
-	protected function setUp()
-	{
-		parent::setUp();
-		$this->mockApplication();
-	}
-
 	/**
 	 * @throws \Exception
 	 * @return QueryBuilder

tests/unit/framework/db/QueryTest.php

@@ -9,12 +9,6 @@ use yii\db\DataReader;
 
 class QueryTest extends DatabaseTestCase
 {
-	protected function setUp()
-	{
-		parent::setUp();
-		$this->mockApplication();
-	}
-
 	public function testSelect()
 	{
 		// default

tests/unit/framework/db/cubrid/CubridActiveRecordTest.php

@@ -5,9 +5,5 @@ use yiiunit\framework\db\ActiveRecordTest;
 
 class CubridActiveRecordTest extends ActiveRecordTest
 {
-	protected function setUp()
+	public $driverName = 'cubrid';
-	{
-		$this->driverName = 'cubrid';
-		parent::setUp();
-	}
 }

tests/unit/framework/db/cubrid/CubridCommandTest.php

@@ -5,11 +5,7 @@ use yiiunit\framework\db\CommandTest;
 
 class CubridCommandTest extends CommandTest
 {
-	protected function setUp()
+	public $driverName = 'cubrid';
-	{
-		$this->driverName = 'cubrid';
-		parent::setUp();
-	}
 
 	public function testBindParamValue()
 	{

tests/unit/framework/db/cubrid/CubridConnectionTest.php

@@ -5,11 +5,7 @@ use yiiunit\framework\db\ConnectionTest;
 
 class CubridConnectionTest extends ConnectionTest
 {
-	protected function setUp()
+	public $driverName = 'cubrid';
-	{
-		$this->driverName = 'cubrid';
-		parent::setUp();
-	}
 
 	public function testQuoteValue()
 	{

tests/unit/framework/db/cubrid/CubridQueryTest.php

@@ -5,9 +5,5 @@ use yiiunit\framework\db\QueryTest;
 
 class CubridQueryTest extends QueryTest
 {
-	protected function setUp()
+	public $driverName = 'cubrid';
-	{
-		$this->driverName = 'cubrid';
-		parent::setUp();
-	}
 }

tests/unit/framework/db/mssql/MssqlActiveRecordTest.php

@@ -6,9 +6,5 @@ use yiiunit\framework\db\ActiveRecordTest;
 
 class MssqlActiveRecordTest extends ActiveRecordTest
 {
-	protected function setUp()
+	protected $driverName = 'sqlsrv';
-	{
-		$this->driverName = 'sqlsrv';
-		parent::setUp();
-	}
 }

tests/unit/framework/db/mssql/MssqlCommandTest.php

@@ -6,11 +6,7 @@ use yiiunit\framework\db\CommandTest;
 
 class MssqlCommandTest extends CommandTest
 {
-	public function setUp()
+	protected $driverName = 'sqlsrv';
-	{
-		$this->driverName = 'sqlsrv';
-		parent::setUp();
-	}
 
 	public function testAutoQuoting()
 	{

tests/unit/framework/db/mssql/MssqlConnectionTest.php

@@ -6,11 +6,7 @@ use yiiunit\framework\db\ConnectionTest;
 
 class MssqlConnectionTest extends ConnectionTest
 {
-	public function setUp()
+	protected $driverName = 'sqlsrv';
-	{
-		$this->driverName = 'sqlsrv';
-		parent::setUp();
-	}
 
 	public function testQuoteValue()
 	{

tests/unit/framework/db/mssql/MssqlQueryTest.php

@@ -6,9 +6,5 @@ use yiiunit\framework\db\QueryTest;
 
 class MssqlQueryTest extends QueryTest
 {
-	public function setUp()
+	protected $driverName = 'sqlsrv';
-	{
-		$this->driverName = 'sqlsrv';
-		parent::setUp();
-	}
 }

tests/unit/framework/db/pgsql/PostgreSQLActiveRecordTest.php

@@ -6,9 +6,5 @@ use yiiunit\framework\db\ActiveRecordTest;
 
 class PostgreSQLActiveRecordTest extends ActiveRecordTest
 {
-	protected function setUp()
+	protected $driverName = 'pgsql';
-	{
-		$this->driverName = 'pgsql';
-		parent::setUp();
-	}
 }

tests/unit/framework/db/pgsql/PostgreSQLConnectionTest.php

@@ -5,11 +5,7 @@ use yiiunit\framework\db\ConnectionTest;
 
 class PostgreSQLConnectionTest extends ConnectionTest
 {
-	public function setUp()
+	protected $driverName = 'pgsql';
-	{
-		$this->driverName = 'pgsql';
-		parent::setUp();
-	}
 
 	public function testConnection()
 	{

tests/unit/framework/db/pgsql/PostgreSQLQueryBuilderTest.php

@@ -2,13 +2,11 @@
 
 namespace yiiunit\framework\db\pgsql;
 
-use yii\base\NotSupportedException;
 use yii\db\pgsql\Schema;
 use yiiunit\framework\db\QueryBuilderTest;
 
 class PostgreSQLQueryBuilderTest extends QueryBuilderTest
 {
-
 	public $driverName = 'pgsql';
 	
 	public function columnTypes()

tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php

@@ -5,9 +5,5 @@ use yiiunit\framework\db\ActiveRecordTest;
 
 class SqliteActiveRecordTest extends ActiveRecordTest
 {
-	protected function setUp()
+	protected $driverName = 'sqlite';
-	{
-		$this->driverName = 'sqlite';
-		parent::setUp();
-	}
 }

tests/unit/framework/db/sqlite/SqliteCommandTest.php

@@ -5,11 +5,7 @@ use yiiunit\framework\db\CommandTest;
 
 class SqliteCommandTest extends CommandTest
 {
-	protected function setUp()
+	protected $driverName = 'sqlite';
-	{
-		$this->driverName = 'sqlite';
-		parent::setUp();
-	}
 
 	public function testAutoQuoting()
 	{

tests/unit/framework/db/sqlite/SqliteConnectionTest.php

@@ -5,11 +5,7 @@ use yiiunit\framework\db\ConnectionTest;
 
 class SqliteConnectionTest extends ConnectionTest
 {
-	protected function setUp()
+	protected $driverName = 'sqlite';
-	{
-		$this->driverName = 'sqlite';
-		parent::setUp();
-	}
 
 	public function testConstruct()
 	{

tests/unit/framework/db/sqlite/SqliteQueryBuilderTest.php

@@ -8,7 +8,7 @@ use yiiunit\framework\db\QueryBuilderTest;
 
 class SqliteQueryBuilderTest extends QueryBuilderTest
 {
-	public $driverName = 'sqlite';
+	protected $driverName = 'sqlite';
 
 	public function columnTypes()
 	{

tests/unit/framework/db/sqlite/SqliteQueryTest.php

@@ -5,9 +5,5 @@ use yiiunit\framework\db\QueryTest;
 
 class SqliteQueryTest extends QueryTest
 {
-	protected function setUp()
+	protected $driverName = 'sqlite';
-	{
-		$this->driverName = 'sqlite';
-		parent::setUp();
-	}
 }