Commit 544e412a by Carsten Brandt

unit test cleanup

parent e996f3df
...@@ -9,12 +9,6 @@ use yii\db\DataReader; ...@@ -9,12 +9,6 @@ use yii\db\DataReader;
class CommandTest extends DatabaseTestCase class CommandTest extends DatabaseTestCase
{ {
protected function setUp()
{
parent::setUp();
$this->mockApplication();
}
public function testConstruct() public function testConstruct()
{ {
$db = $this->getConnection(false); $db = $this->getConnection(false);
......
...@@ -6,12 +6,6 @@ use yii\db\Connection; ...@@ -6,12 +6,6 @@ use yii\db\Connection;
class ConnectionTest extends DatabaseTestCase class ConnectionTest extends DatabaseTestCase
{ {
protected function setUp()
{
parent::setUp();
$this->mockApplication();
}
public function testConstruct() public function testConstruct()
{ {
$connection = $this->getConnection(false); $connection = $this->getConnection(false);
......
...@@ -16,7 +16,6 @@ abstract class DatabaseTestCase extends TestCase ...@@ -16,7 +16,6 @@ abstract class DatabaseTestCase extends TestCase
protected function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
$this->mockApplication();
$databases = $this->getParam('databases'); $databases = $this->getParam('databases');
$this->database = $databases[$this->driverName]; $this->database = $databases[$this->driverName];
$pdo_database = 'pdo_'.$this->driverName; $pdo_database = 'pdo_'.$this->driverName;
...@@ -24,6 +23,7 @@ abstract class DatabaseTestCase extends TestCase ...@@ -24,6 +23,7 @@ abstract class DatabaseTestCase extends TestCase
if (!extension_loaded('pdo') || !extension_loaded($pdo_database)) { if (!extension_loaded('pdo') || !extension_loaded($pdo_database)) {
$this->markTestSkipped('pdo and pdo_'.$pdo_database.' extension are required.'); $this->markTestSkipped('pdo and pdo_'.$pdo_database.' extension are required.');
} }
$this->mockApplication();
} }
protected function tearDown() protected function tearDown()
...@@ -31,6 +31,7 @@ abstract class DatabaseTestCase extends TestCase ...@@ -31,6 +31,7 @@ abstract class DatabaseTestCase extends TestCase
if ($this->db) { if ($this->db) {
$this->db->close(); $this->db->close();
} }
$this->destroyApplication();
} }
/** /**
......
...@@ -12,12 +12,6 @@ use yii\db\cubrid\QueryBuilder as CubridQueryBuilder; ...@@ -12,12 +12,6 @@ use yii\db\cubrid\QueryBuilder as CubridQueryBuilder;
class QueryBuilderTest extends DatabaseTestCase class QueryBuilderTest extends DatabaseTestCase
{ {
protected function setUp()
{
parent::setUp();
$this->mockApplication();
}
/** /**
* @throws \Exception * @throws \Exception
* @return QueryBuilder * @return QueryBuilder
......
...@@ -9,12 +9,6 @@ use yii\db\DataReader; ...@@ -9,12 +9,6 @@ use yii\db\DataReader;
class QueryTest extends DatabaseTestCase class QueryTest extends DatabaseTestCase
{ {
protected function setUp()
{
parent::setUp();
$this->mockApplication();
}
public function testSelect() public function testSelect()
{ {
// default // default
......
...@@ -5,9 +5,5 @@ use yiiunit\framework\db\ActiveRecordTest; ...@@ -5,9 +5,5 @@ use yiiunit\framework\db\ActiveRecordTest;
class CubridActiveRecordTest extends ActiveRecordTest class CubridActiveRecordTest extends ActiveRecordTest
{ {
protected function setUp() public $driverName = 'cubrid';
{
$this->driverName = 'cubrid';
parent::setUp();
}
} }
...@@ -5,11 +5,7 @@ use yiiunit\framework\db\CommandTest; ...@@ -5,11 +5,7 @@ use yiiunit\framework\db\CommandTest;
class CubridCommandTest extends CommandTest class CubridCommandTest extends CommandTest
{ {
protected function setUp() public $driverName = 'cubrid';
{
$this->driverName = 'cubrid';
parent::setUp();
}
public function testBindParamValue() public function testBindParamValue()
{ {
......
...@@ -5,11 +5,7 @@ use yiiunit\framework\db\ConnectionTest; ...@@ -5,11 +5,7 @@ use yiiunit\framework\db\ConnectionTest;
class CubridConnectionTest extends ConnectionTest class CubridConnectionTest extends ConnectionTest
{ {
protected function setUp() public $driverName = 'cubrid';
{
$this->driverName = 'cubrid';
parent::setUp();
}
public function testQuoteValue() public function testQuoteValue()
{ {
......
...@@ -5,9 +5,5 @@ use yiiunit\framework\db\QueryTest; ...@@ -5,9 +5,5 @@ use yiiunit\framework\db\QueryTest;
class CubridQueryTest extends QueryTest class CubridQueryTest extends QueryTest
{ {
protected function setUp() public $driverName = 'cubrid';
{
$this->driverName = 'cubrid';
parent::setUp();
}
} }
...@@ -6,9 +6,5 @@ use yiiunit\framework\db\ActiveRecordTest; ...@@ -6,9 +6,5 @@ use yiiunit\framework\db\ActiveRecordTest;
class MssqlActiveRecordTest extends ActiveRecordTest class MssqlActiveRecordTest extends ActiveRecordTest
{ {
protected function setUp() protected $driverName = 'sqlsrv';
{
$this->driverName = 'sqlsrv';
parent::setUp();
}
} }
...@@ -6,11 +6,7 @@ use yiiunit\framework\db\CommandTest; ...@@ -6,11 +6,7 @@ use yiiunit\framework\db\CommandTest;
class MssqlCommandTest extends CommandTest class MssqlCommandTest extends CommandTest
{ {
public function setUp() protected $driverName = 'sqlsrv';
{
$this->driverName = 'sqlsrv';
parent::setUp();
}
public function testAutoQuoting() public function testAutoQuoting()
{ {
......
...@@ -6,11 +6,7 @@ use yiiunit\framework\db\ConnectionTest; ...@@ -6,11 +6,7 @@ use yiiunit\framework\db\ConnectionTest;
class MssqlConnectionTest extends ConnectionTest class MssqlConnectionTest extends ConnectionTest
{ {
public function setUp() protected $driverName = 'sqlsrv';
{
$this->driverName = 'sqlsrv';
parent::setUp();
}
public function testQuoteValue() public function testQuoteValue()
{ {
......
...@@ -6,9 +6,5 @@ use yiiunit\framework\db\QueryTest; ...@@ -6,9 +6,5 @@ use yiiunit\framework\db\QueryTest;
class MssqlQueryTest extends QueryTest class MssqlQueryTest extends QueryTest
{ {
public function setUp() protected $driverName = 'sqlsrv';
{
$this->driverName = 'sqlsrv';
parent::setUp();
}
} }
...@@ -6,9 +6,5 @@ use yiiunit\framework\db\ActiveRecordTest; ...@@ -6,9 +6,5 @@ use yiiunit\framework\db\ActiveRecordTest;
class PostgreSQLActiveRecordTest extends ActiveRecordTest class PostgreSQLActiveRecordTest extends ActiveRecordTest
{ {
protected function setUp() protected $driverName = 'pgsql';
{
$this->driverName = 'pgsql';
parent::setUp();
}
} }
...@@ -5,11 +5,7 @@ use yiiunit\framework\db\ConnectionTest; ...@@ -5,11 +5,7 @@ use yiiunit\framework\db\ConnectionTest;
class PostgreSQLConnectionTest extends ConnectionTest class PostgreSQLConnectionTest extends ConnectionTest
{ {
public function setUp() protected $driverName = 'pgsql';
{
$this->driverName = 'pgsql';
parent::setUp();
}
public function testConnection() public function testConnection()
{ {
......
...@@ -2,13 +2,11 @@ ...@@ -2,13 +2,11 @@
namespace yiiunit\framework\db\pgsql; namespace yiiunit\framework\db\pgsql;
use yii\base\NotSupportedException;
use yii\db\pgsql\Schema; use yii\db\pgsql\Schema;
use yiiunit\framework\db\QueryBuilderTest; use yiiunit\framework\db\QueryBuilderTest;
class PostgreSQLQueryBuilderTest extends QueryBuilderTest class PostgreSQLQueryBuilderTest extends QueryBuilderTest
{ {
public $driverName = 'pgsql'; public $driverName = 'pgsql';
public function columnTypes() public function columnTypes()
......
...@@ -5,9 +5,5 @@ use yiiunit\framework\db\ActiveRecordTest; ...@@ -5,9 +5,5 @@ use yiiunit\framework\db\ActiveRecordTest;
class SqliteActiveRecordTest extends ActiveRecordTest class SqliteActiveRecordTest extends ActiveRecordTest
{ {
protected function setUp() protected $driverName = 'sqlite';
{
$this->driverName = 'sqlite';
parent::setUp();
}
} }
...@@ -5,11 +5,7 @@ use yiiunit\framework\db\CommandTest; ...@@ -5,11 +5,7 @@ use yiiunit\framework\db\CommandTest;
class SqliteCommandTest extends CommandTest class SqliteCommandTest extends CommandTest
{ {
protected function setUp() protected $driverName = 'sqlite';
{
$this->driverName = 'sqlite';
parent::setUp();
}
public function testAutoQuoting() public function testAutoQuoting()
{ {
......
...@@ -5,11 +5,7 @@ use yiiunit\framework\db\ConnectionTest; ...@@ -5,11 +5,7 @@ use yiiunit\framework\db\ConnectionTest;
class SqliteConnectionTest extends ConnectionTest class SqliteConnectionTest extends ConnectionTest
{ {
protected function setUp() protected $driverName = 'sqlite';
{
$this->driverName = 'sqlite';
parent::setUp();
}
public function testConstruct() public function testConstruct()
{ {
......
...@@ -8,7 +8,7 @@ use yiiunit\framework\db\QueryBuilderTest; ...@@ -8,7 +8,7 @@ use yiiunit\framework\db\QueryBuilderTest;
class SqliteQueryBuilderTest extends QueryBuilderTest class SqliteQueryBuilderTest extends QueryBuilderTest
{ {
public $driverName = 'sqlite'; protected $driverName = 'sqlite';
public function columnTypes() public function columnTypes()
{ {
......
...@@ -5,9 +5,5 @@ use yiiunit\framework\db\QueryTest; ...@@ -5,9 +5,5 @@ use yiiunit\framework\db\QueryTest;
class SqliteQueryTest extends QueryTest class SqliteQueryTest extends QueryTest
{ {
protected function setUp() protected $driverName = 'sqlite';
{
$this->driverName = 'sqlite';
parent::setUp();
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment