Merge pull request #8150 from piwik/unit-tests

Improve unit tests

5 files changed, 6 insertions, 15 deletions

diff --git a/plugins/BulkTracking/tests/Unit/RequestsTest.php b/plugins/BulkTracking/tests/Unit/RequestsTest.php
index 8a89e5c220..fe5bf08116 100644
--- a/plugins/BulkTracking/tests/Unit/RequestsTest.php
+++ b/plugins/BulkTracking/tests/Unit/RequestsTest.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\BulkTracking\tests\Unit;
 
 use Piwik\Plugins\BulkTracking\Tracker\Requests;
-use Piwik\Tests\Framework\TestCase\UnitTestCase;
 use Piwik\Tracker\Request;
 
 /**
@@ -17,7 +16,7 @@ use Piwik\Tracker\Request;
  * @group RequestsTest
  * @group Plugins
  */
-class RequestsTest extends UnitTestCase
+class RequestsTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var Requests
diff --git a/plugins/ExamplePlugin/tests/Unit/SimpleTest.php b/plugins/ExamplePlugin/tests/Unit/SimpleTest.php
index 5551b4819d..a40db2bac1 100644
--- a/plugins/ExamplePlugin/tests/Unit/SimpleTest.php
+++ b/plugins/ExamplePlugin/tests/Unit/SimpleTest.php
@@ -8,25 +8,21 @@
 
 namespace Piwik\Plugins\ExamplePlugin\tests\Unit;
 
-use Piwik\Tests\Framework\TestCase\UnitTestCase;
-
 /**
  * @group ExamplePlugin
  * @group SimpleTest
  * @group Plugins
  */
-class SimpleTest extends UnitTestCase
+class SimpleTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        parent::setUp();
         // set up here if needed
     }
     
     public function tearDown()
     {
         // tear down here if needed
-        parent::tearDown();
     }
 
     /**
diff --git a/plugins/Goals/tests/Unit/AppendNameToColumnNamesTest.php b/plugins/Goals/tests/Unit/AppendNameToColumnNamesTest.php
index b409ae1fbb..8058fd6ca7 100644
--- a/plugins/Goals/tests/Unit/AppendNameToColumnNamesTest.php
+++ b/plugins/Goals/tests/Unit/AppendNameToColumnNamesTest.php
@@ -10,16 +10,14 @@ namespace Piwik\Plugins\Goals\tests\Unit;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\Tests\Framework\TestCase\UnitTestCase;
 
 /**
  * @group AppendNameToColumnNamesTest
- * @group AppendNameToColumnNames
  * @group DataTable
  * @group Filter
  * @group Goals
  */
-class AppendNameToColumnNamesTest extends UnitTestCase
+class AppendNameToColumnNamesTest extends \PHPUnit_Framework_TestCase
 {
     private $filter = 'Piwik\Plugins\Goals\DataTable\Filter\AppendNameToColumnNames';
 
@@ -97,4 +95,4 @@ class AppendNameToColumnNamesTest extends UnitTestCase
     {
         $this->assertSame($expectedColumns, $this->table->getRowFromId($rowId)->getColumns());
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/VisitTime/tests/Unit/AddSegmentByLabelInUTCTest.php b/plugins/VisitTime/tests/Unit/AddSegmentByLabelInUTCTest.php
index bf0c828321..8a70d11548 100644
--- a/plugins/VisitTime/tests/Unit/AddSegmentByLabelInUTCTest.php
+++ b/plugins/VisitTime/tests/Unit/AddSegmentByLabelInUTCTest.php
@@ -10,14 +10,13 @@ namespace Piwik\Plugins\VisitTime\tests\Unit;
 
 use Piwik\DataTable\Row;
 use Piwik\DataTable;
-use Piwik\Tests\Framework\TestCase\UnitTestCase;
 
 /**
  * @group VisitTime
  * @group AddSegmentByLabelInUTCTest
  * @group Plugins
  */
-class AddSegmentByLabelInUTCTest extends UnitTestCase
+class AddSegmentByLabelInUTCTest extends \PHPUnit_Framework_TestCase
 {
     private $filter = 'Piwik\Plugins\VisitTime\DataTable\Filter\AddSegmentByLabelInUTC';
 
diff --git a/plugins/VisitsSummary/tests/Unit/Reports/GetTest.php b/plugins/VisitsSummary/tests/Unit/Reports/GetTest.php
index df185a971e..3ddb68d1c1 100644
--- a/plugins/VisitsSummary/tests/Unit/Reports/GetTest.php
+++ b/plugins/VisitsSummary/tests/Unit/Reports/GetTest.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\VisitsSummary\tests\Unit\Reports;
 
 use Piwik\DataTable;
 use Piwik\Plugins\VisitsSummary\Reports\Get;
-use Piwik\Tests\Framework\TestCase\UnitTestCase;
 
 /**
  * @group VisitsSummary
@@ -18,7 +17,7 @@ use Piwik\Tests\Framework\TestCase\UnitTestCase;
  * @group GetTest
  * @group Plugins
  */
-class GetTest extends UnitTestCase
+class GetTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var Get