Merge pull request #8102 from klimov-paul/simpler-test-dir-structure-2

Simplified tests directory structure

.travis.yml

@@ -42,9 +42,9 @@ install:
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
 # core framework:
   - travis_retry composer install --prefer-dist --no-interaction
-  - tests/unit/data/travis/apc-setup.sh
+  - tests/data/travis/apc-setup.sh
-  - tests/unit/data/travis/memcache-setup.sh
+  - tests/data/travis/memcache-setup.sh
-#  - tests/unit/data/travis/cubrid-setup.sh
+#  - tests/data/travis/cubrid-setup.sh
 
 before_script:
   # show some versions and env information

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="./tests/unit/bootstrap.php"
+<phpunit bootstrap="./tests/bootstrap.php"
 		colors="true"
 		convertErrorsToExceptions="true"
 		convertNoticesToExceptions="true"
@@ -7,7 +7,7 @@
 		stopOnFailure="false">
 		<testsuites>
 			<testsuite name="Yii Test Suite">
-				<directory>./tests/unit</directory>
+				<directory>./tests</directory>
 			</testsuite>
 		</testsuites>
 		<filter>

tests/README.md

@@ -4,12 +4,10 @@ Yii 2.0 Unit tests
 DIRECTORY STRUCTURE
 -------------------
 
-      unit/                Unit tests to run with PHPUnit
+    data/            models, config and other test data
-          data/            models, config and other test data
+        config.php   this file contains configuration for database and caching backends
-              config.php   this file contains configuration for database and caching backends
+    framework/       the framework unit tests
-          framework/       the framework unit tests
+    runtime/         the application runtime dir for the yii test app
-          runtime/         the application runtime dir for the yii test app
-      web/                 webapp for functional testing
 
 
 HOW TO RUN THE TESTS
@@ -19,18 +17,24 @@ Make sure you have PHPUnit installed and that you installed all composer depende
 
 Run PHPUnit in the yii repo base directory.
 
-```php
+```
 phpunit
 ```
 
 You can run tests for specific groups only:
 
-```php
+```
 phpunit --group=mysql,base,i18n
 ```
 
 You can get a list of available groups via `phpunit --list-groups`.
 
+A single test class could be run like the follwing:
+
+```
+phpunit tests/framework/base/ObjectTest.php
+```
+
 TEST CONFIGURATION
 ------------------
 

tests/bootstrap.php

@@ -9,13 +9,13 @@ $_SERVER['SCRIPT_NAME'] = '/' . __DIR__;
 $_SERVER['SCRIPT_FILENAME'] = __FILE__;
 
 // require composer autoloader if available
-$composerAutoload = __DIR__ . '/../../vendor/autoload.php';
+$composerAutoload = __DIR__ . '/../vendor/autoload.php';
 if (is_file($composerAutoload)) {
     require_once($composerAutoload);
 } else {
-    require_once(__DIR__ . '/../../../../autoload.php');
+    require_once(__DIR__ . '/../../../autoload.php');
 }
-require_once(__DIR__ . '/../../framework/Yii.php');
+require_once(__DIR__ . '/../framework/Yii.php');
 
 Yii::setAlias('@yiiunit', __DIR__);