Merge pull request #204 branch 'unittest-app-dependency' of…

tests/unit/TestCase.php

@@ -6,11 +6,37 @@ class TestCase extends \yii\test\TestCase
 {
 	public static $params;
 
-	public function getParam($name)
+	protected function setUp() {
+		parent::setUp();
+	}
+
+	protected function tearDown()
+	{
+		parent::tearDown();
+		$this->destroyApp();
+	}
+	
+	public function getParam($name,$default=null)
 	{
 		if (self::$params === null) {
 			self::$params = require(__DIR__ . '/data/config.php');
 		}
-		return isset(self::$params[$name]) ? self::$params[$name] : null;
+		return isset(self::$params[$name]) ? self::$params[$name] : $default;
+	}
+	
+	protected function mockApplication($requiredConfig=array())
+	{
+		static $defaultConfig = array(
+			'id' => 'testapp',
+			'basePath' => __DIR__,
+		);
+		
+		$appClass = $this->getParam( 'appClass', '\yii\web\Application' );
+		new $appClass(array_merge($defaultConfig,$requiredConfig));
+	}
+	
+	protected function destroyApp()
+	{
+		\Yii::$app = null;
 	}
 }

tests/unit/bootstrap.php

@@ -9,6 +9,4 @@ require_once(__DIR__ . '/../../yii/Yii.php');
 
 Yii::setAlias('@yiiunit', __DIR__);
 
-new \yii\web\Application(array('id' => 'testapp', 'basePath' => __DIR__));
-
 require_once(__DIR__ . '/TestCase.php');

tests/unit/data/config.php

 <?php
 
 return array(
+	//'appClass' => '\yii\web\Application',
+	'appClass' => '\yii\console\Application',
     'databases' => array(
         'mysql' => array(
             'dsn' => 'mysql:host=127.0.0.1;dbname=yiitest',
@@ -12,5 +14,5 @@ return array(
             'dsn' => 'sqlite::memory:',
             'fixture' => __DIR__ . '/sqlite.sql',
         ),
-    )
+    ),
 );

tests/unit/framework/caching/CacheTest.php

@@ -13,6 +13,12 @@ abstract class CacheTest extends TestCase
 	 */
 	abstract protected function getCacheInstance();
 
+	protected function setUp()
+	{
+		parent::setUp();
+		$this->mockApplication();
+	}
+	
 	public function testSet()
 	{
 		$cache = $this->getCacheInstance();

tests/unit/framework/caching/DbCacheTest.php

@@ -17,6 +17,8 @@ class DbCacheTest extends CacheTest
 			$this->markTestSkipped('pdo and pdo_mysql extensions are required.');
 		}
 
+		parent::setUp();
+		
 		$this->getConnection()->createCommand("
 			CREATE TABLE IF NOT EXISTS tbl_cache (
 				id char(128) NOT NULL,

tests/unit/framework/helpers/HtmlTest.php

@@ -4,15 +4,13 @@ namespace yiiunit\framework\helpers;
 
 use Yii;
 use yii\helpers\Html;
-use yii\web\Application;
+use yiiunit\TestCase;
 
-class HtmlTest extends \yii\test\TestCase
+class HtmlTest extends TestCase
 {
 	public function setUp()
 	{
-		new Application(array(
-			'id' => 'test',
-			'basePath' => '@yiiunit/runtime',
+		$this->mockApplication(array(
 			'components' => array(
 				'request' => array(
 					'class' => 'yii\web\Request',
@@ -30,11 +28,6 @@ class HtmlTest extends \yii\test\TestCase
 		$this->assertEquals($expected, $actual);
 	}
 
-	public function tearDown()
-	{
-		Yii::$app = null;
-	}
-
 	public function testEncode()
 	{
 		$this->assertEquals("a&lt;&gt;&amp;&quot;&#039;", Html::encode("a<>&\"'"));