we will deprecate old test classes in 4 months and not in 2, simplified test run by only allowing short version, added some examples

3 files changed, 16 insertions, 11 deletions

diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
index 2516dca051..4d07c93857 100644
--- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
+++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
@@ -30,7 +30,7 @@ class DeprecatedMethodsTest extends PHPUnit_Framework_TestCase
         $validTill = '2014-10-20';
         $this->assertDeprecatedMethodIsRemoved('\Piwik\SettingsPiwik', 'rewriteTmpPathWithHostname', $validTill);
 
-        $validTill = '2014-12-06';
+        $validTill = '2015-02-06';
         $this->assertDeprecatedClassIsRemoved('\IntegrationTestCase', $validTill);
         $this->assertDeprecatedClassIsRemoved('\DatabaseTestCase', $validTill);
         $this->assertDeprecatedClassIsRemoved('\Piwik\Tests\Fixture', $validTill);
diff --git a/tests/PHPUnit/phpunit.xml.dist b/tests/PHPUnit/phpunit.xml.dist
index fc80aa1358..a900ce40df 100644
--- a/tests/PHPUnit/phpunit.xml.dist
+++ b/tests/PHPUnit/phpunit.xml.dist
@@ -39,8 +39,6 @@
         <exclude>../../plugins/*/Test/Integration</exclude>
         <exclude>../../plugins/*/tests/Unit</exclude>
         <exclude>../../plugins/*/Test/Unit</exclude>
-        <exclude>../../plugins/*/tests/UI</exclude>
-        <exclude>../../plugins/*/Test/UI</exclude>
     </testsuite>
     <testsuite name="IntegrationTests">
         <directory>./Integration</directory>
diff --git a/tests/README.md b/tests/README.md
index dffd94a16b..16d1b1ee90 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -70,14 +70,21 @@ To execute the tests:
 
 4. 	Run the tests
 
-	$ cd /path/to/piwik/tests/PHPUnit
-	$ phpunit --testsuite UnitTests
-    $ phpunit --testsuite IntegrationTests
-    $ phpunit --testsuite SystemTests
-
-	There are also two main groups of tests: Core and Plugins
-	For example run `phpunit --group Core`
-	to run all Core Piwik tests.
+	$ cd /path/to/piwik
+	$ ./console tests:run --testsuite unit
+    $ ./console tests:run --testsuite integration
+    $ ./console tests:run --testsuite system
+
+	There are also two main groups of tests: core and plugins
+	For example run `./console tests:run core` to run all Core Piwik tests.
+
+	You can combine testsuite and groups like this:
+	`./console tests:run --testsuite unit core`. This would run all unit tests in core.
+	`./console tests:run --testsuite integration CustomAlerts`. This would run all integration tests of the CustomAlerts plugin.
+	`./console tests:run CustomAlerts`. This would run all unit, integration and system tests of the CustomAlerts plugin. (group only)
+
+	To execute multiple groups you can separate them via a comma:
+	`./console tests:run CustomAlerts,Insights`. This would run all unit, integration and system tests of the CustomAlerts and Insights plugin.
 
 5.	Write more tests :)
 	See ["Writing Unit tests with PHPUnit"](http://www.phpunit.de/manual/current/en/writing-tests-for-phpunit.html)