From 1c24b3e0d877d8a43908459a40cc9f846db3ca17 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sat, 16 Nov 2013 21:30:20 -0500 Subject: [PATCH] removed TestCase and WebTestCase. --- build/controllers/ClassmapController.php | 3 --- framework/yii/classes.php | 13 ++++++++++++ framework/yii/test/TestCase.php | 25 ----------------------- framework/yii/test/WebTestCase.php | 25 ----------------------- tests/unit/TestCase.php | 7 ++++++- tests/unit/framework/base/ExceptionTest.php | 2 +- tests/unit/framework/helpers/ArrayHelperTest.php | 2 +- tests/unit/framework/helpers/FileHelperTest.php | 2 +- tests/unit/framework/helpers/JsonTest.php | 2 +- tests/unit/framework/helpers/StringHelperTest.php | 4 ++-- tests/unit/framework/helpers/VarDumperTest.php | 4 ++-- 11 files changed, 27 insertions(+), 62 deletions(-) delete mode 100644 framework/yii/test/TestCase.php delete mode 100644 framework/yii/test/WebTestCase.php diff --git a/build/controllers/ClassmapController.php b/build/controllers/ClassmapController.php index 9fd84e8..a0ba886 100644 --- a/build/controllers/ClassmapController.php +++ b/build/controllers/ClassmapController.php @@ -46,10 +46,7 @@ class ClassmapController extends Controller 'except' => [ 'Yii.php', 'BaseYii.php', - '/debug/', '/console/', - '/test/', - '/gii/', ], ]; $files = FileHelper::findFiles($root, $options); diff --git a/framework/yii/classes.php b/framework/yii/classes.php index c89e4ff..9f39ee9 100644 --- a/framework/yii/classes.php +++ b/framework/yii/classes.php @@ -76,8 +76,12 @@ return [ 'yii\data\Pagination' => YII_PATH . '/data/Pagination.php', 'yii\data\Sort' => YII_PATH . '/data/Sort.php', 'yii\db\ActiveQuery' => YII_PATH . '/db/ActiveQuery.php', + 'yii\db\ActiveQueryInterface' => YII_PATH . '/db/ActiveQueryInterface.php', + 'yii\db\ActiveQueryTrait' => YII_PATH . '/db/ActiveQueryTrait.php', 'yii\db\ActiveRecord' => YII_PATH . '/db/ActiveRecord.php', 'yii\db\ActiveRelation' => YII_PATH . '/db/ActiveRelation.php', + 'yii\db\ActiveRelationInterface' => YII_PATH . '/db/ActiveRelationInterface.php', + 'yii\db\ActiveRelationTrait' => YII_PATH . '/db/ActiveRelationTrait.php', 'yii\db\ColumnSchema' => YII_PATH . '/db/ColumnSchema.php', 'yii\db\Command' => YII_PATH . '/db/Command.php', 'yii\db\Connection' => YII_PATH . '/db/Connection.php', @@ -87,6 +91,8 @@ return [ 'yii\db\Migration' => YII_PATH . '/db/Migration.php', 'yii\db\Query' => YII_PATH . '/db/Query.php', 'yii\db\QueryBuilder' => YII_PATH . '/db/QueryBuilder.php', + 'yii\db\QueryInterface' => YII_PATH . '/db/QueryInterface.php', + 'yii\db\QueryTrait' => YII_PATH . '/db/QueryTrait.php', 'yii\db\Schema' => YII_PATH . '/db/Schema.php', 'yii\db\StaleObjectException' => YII_PATH . '/db/StaleObjectException.php', 'yii\db\TableSchema' => YII_PATH . '/db/TableSchema.php', @@ -149,6 +155,10 @@ return [ 'yii\log\FileTarget' => YII_PATH . '/log/FileTarget.php', 'yii\log\Logger' => YII_PATH . '/log/Logger.php', 'yii\log\Target' => YII_PATH . '/log/Target.php', + 'yii\mail\BaseMailer' => YII_PATH . '/mail/BaseMailer.php', + 'yii\mail\BaseMessage' => YII_PATH . '/mail/BaseMessage.php', + 'yii\mail\MailerInterface' => YII_PATH . '/mail/MailerInterface.php', + 'yii\mail\MessageInterface' => YII_PATH . '/mail/MessageInterface.php', 'yii\mutex\DbMutex' => YII_PATH . '/mutex/DbMutex.php', 'yii\mutex\FileMutex' => YII_PATH . '/mutex/FileMutex.php', 'yii\mutex\Mutex' => YII_PATH . '/mutex/Mutex.php', @@ -161,6 +171,8 @@ return [ 'yii\redis\Connection' => YII_PATH . '/redis/Connection.php', 'yii\redis\Transaction' => YII_PATH . '/redis/Transaction.php', 'yii\requirements\YiiRequirementChecker' => YII_PATH . '/requirements/YiiRequirementChecker.php', + 'yii\test\DbFixtureManager' => YII_PATH . '/test/DbFixtureManager.php', + 'yii\test\DbTestTrait' => YII_PATH . '/test/DbTestTrait.php', 'yii\validators\BooleanValidator' => YII_PATH . '/validators/BooleanValidator.php', 'yii\validators\CompareValidator' => YII_PATH . '/validators/CompareValidator.php', 'yii\validators\DateValidator' => YII_PATH . '/validators/DateValidator.php', @@ -169,6 +181,7 @@ return [ 'yii\validators\ExistValidator' => YII_PATH . '/validators/ExistValidator.php', 'yii\validators\FileValidator' => YII_PATH . '/validators/FileValidator.php', 'yii\validators\FilterValidator' => YII_PATH . '/validators/FilterValidator.php', + 'yii\validators\ImageValidator' => YII_PATH . '/validators/ImageValidator.php', 'yii\validators\InlineValidator' => YII_PATH . '/validators/InlineValidator.php', 'yii\validators\NumberValidator' => YII_PATH . '/validators/NumberValidator.php', 'yii\validators\PunycodeAsset' => YII_PATH . '/validators/PunycodeAsset.php', diff --git a/framework/yii/test/TestCase.php b/framework/yii/test/TestCase.php deleted file mode 100644 index a6806b3..0000000 --- a/framework/yii/test/TestCase.php +++ /dev/null @@ -1,25 +0,0 @@ - - * @since 2.0 - */ -abstract class TestCase extends \PHPUnit_Framework_TestCase -{ -} diff --git a/framework/yii/test/WebTestCase.php b/framework/yii/test/WebTestCase.php deleted file mode 100644 index 4308454..0000000 --- a/framework/yii/test/WebTestCase.php +++ /dev/null @@ -1,25 +0,0 @@ - - * @since 2.0 - */ -abstract class WebTestCase extends \PHPUnit_Extensions_SeleniumTestCase -{ -} diff --git a/tests/unit/TestCase.php b/tests/unit/TestCase.php index d3ac557..e83605e 100644 --- a/tests/unit/TestCase.php +++ b/tests/unit/TestCase.php @@ -2,10 +2,15 @@ namespace yiiunit; +require_once('PHPUnit/Runner/Version.php'); +spl_autoload_unregister(['Yii', 'autoload']); +require_once('PHPUnit/Autoload.php'); +spl_autoload_register(['Yii', 'autoload']); // put yii's autoloader at the end + /** * This is the base class for all yii framework unit tests. */ -abstract class TestCase extends \yii\test\TestCase +abstract class TestCase extends \PHPUnit_Framework_TestCase { public static $params; diff --git a/tests/unit/framework/base/ExceptionTest.php b/tests/unit/framework/base/ExceptionTest.php index af4293a..5a623b1 100644 --- a/tests/unit/framework/base/ExceptionTest.php +++ b/tests/unit/framework/base/ExceptionTest.php @@ -1,7 +1,7 @@