refs #5940 IntegrationTestCase => SystemTestCase

.travis.yml

@@ -47,7 +47,7 @@ matrix:
     - php: 5.4
       env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Plugins
     - php: 5.4
-      env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Integration
+      env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=System
   include:
     # Code Coverage
     - php: 5.4
@@ -55,7 +55,7 @@ matrix:
     - php: 5.4
       env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Plugins
     - php: 5.4
-      env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Integration
+      env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=System
   exclude:
     # Javascript tests need to run only on one PHP version
     - php: 5.4

plugins/Contents/tests/ContentsTest.php

@@ -7,7 +7,7 @@
  */
 namespace Piwik\Plugins\Contents\tests;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Plugins\Contents\tests\Fixtures\TwoVisitsWithContents;
 
 /**
@@ -17,7 +17,7 @@ use Piwik\Plugins\Contents\tests\Fixtures\TwoVisitsWithContents;
  * @group Integration
  * @group Plugins
  */
-class ContentsTest extends IntegrationTestCase
+class ContentsTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 

plugins/CoreConsole/Commands/TestsSetupFixture.php

@@ -216,9 +216,8 @@ class TestsSetupFixture extends ConsoleCommand
         require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
         require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/FakeAccess.php';
         require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php';
-        require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
+        require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/SystemTestCase.php';
         require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixture.php';
-        require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
 
         $fixturesToLoad = array(
             '/tests/PHPUnit/Fixtures/*.php',

plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php

@@ -8,14 +8,14 @@
 
 namespace Piwik\Plugins\CustomVariables\tests;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 
 /**
  * @group CustomVariables
  * @group CustomVariablesIntegrationTest
  * @group Database
  */
-class CustomVariablesIntegrationTest extends IntegrationTestCase
+class CustomVariablesIntegrationTest extends SystemTestCase
 {
     /**
      * @var Fixtures\VisitWithManyCustomVariables

plugins/ExamplePlugin/tests/SimpleIntegrationTest.php

@@ -9,14 +9,14 @@
 namespace Piwik\Plugins\ExamplePlugin\tests;
 
 use Piwik\Plugins\ExamplePlugin\tests\fixtures\SimpleFixtureTrackFewVisits;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 
 /**
  * @group ExamplePlugin
  * @group SimpleIntegrationTest
  * @group Plugins
  */
-class SimpleIntegrationTest extends IntegrationTestCase
+class SimpleIntegrationTest extends SystemTestCase
 {
     /**
      * @var SimpleFixtureTrackFewVisits

plugins/Insights/tests/ApiTest.php

@@ -12,7 +12,7 @@ use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Plugins\Insights\API;
 use Piwik\Plugins\Insights\tests\Fixtures\SomeVisitsDifferentPathsOnTwoDays;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 
 /**
  * @group Insights
@@ -20,7 +20,7 @@ use Piwik\Tests\IntegrationTestCase;
  * @group Database
  * @group Plugins
  */
-class ApiTest extends IntegrationTestCase
+class ApiTest extends SystemTestCase
 {
     /**
      * @var SomeVisitsDifferentPathsOnTwoDays

plugins/Insights/tests/ModelTest.php

@@ -11,7 +11,7 @@ namespace Piwik\Plugins\Insights\tests;
 use Piwik\DataTable;
 use Piwik\Plugins\Insights\Model;
 use Piwik\Plugins\Insights\tests\Fixtures\SomeVisitsDifferentPathsOnTwoDays;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 
 /**
  * @group Insights
@@ -19,7 +19,7 @@ use Piwik\Tests\IntegrationTestCase;
  * @group Database
  * @group Plugins
  */
-class ModelTest extends IntegrationTestCase
+class ModelTest extends SystemTestCase
 {
     /**
      * @var SomeVisitsDifferentPathsOnTwoDays

plugins/Live/tests/APITest.php

@@ -15,7 +15,7 @@ use Piwik\Plugins\Live\API;
 use FakeAccess;
 use Piwik\Access;
 use Piwik\Tests\Fixture;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 
 /**
  * @group Live
@@ -23,7 +23,7 @@ use Piwik\Tests\IntegrationTestCase;
  * @group Integration
  * @group Plugins
  */
-class APITest extends IntegrationTestCase
+class APITest extends SystemTestCase
 {
     /**
      * @var API

plugins/UserSettings/tests/GetLanguageIntegrationTest.php

@@ -10,7 +10,7 @@ namespace Piwik\Plugins\UserSettings\tests;
 
 
 use Piwik\Plugins\UserSettings\tests\Fixtures\LanguageFixture;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 
 /**
  * Class GetLanguageIntegrationTest
@@ -19,7 +19,7 @@ use Piwik\Tests\IntegrationTestCase;
  * @group Plugins
  * @group UserSettings
  */
-class GetLanguageIntegrationTest extends IntegrationTestCase {
+class GetLanguageIntegrationTest extends SystemTestCase {
 
     public static $fixture = null;
 

tests/PHPUnit/BenchmarkTestCase.php

@@ -10,7 +10,7 @@ use Piwik\Db;
 use Piwik\Plugins\Goals\API;
 use Piwik\Tests\Fixture;
 
-require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
+require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/SystemTestCase.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/LocalTracker.php';
 
 // require fixtures
@@ -21,7 +21,7 @@ foreach (glob(PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Benchmarks/Fixtures/*.php') a
 /**
  * Base class for benchmarks.
  */
-abstract class BenchmarkTestCase extends \Piwik\Tests\IntegrationTestCase
+abstract class BenchmarkTestCase extends \Piwik\Tests\SystemTestCase
 {
     protected static $fixture;
 

tests/PHPUnit/ConsoleCommandTestCase.php

@@ -13,7 +13,7 @@ use Piwik\Console;
 use Symfony\Component\Console\Tester\ApplicationTester;
 
 /**
- * Base class for test cases that test Piwik console commands. Derives from IntegrationTestCase
+ * Base class for test cases that test Piwik console commands. Derives from SystemTestCase
  * so the entire Piwik environment is set up.
  *
  * This will create an ApplicationTester instance (provided by Symfony) which should be used to
@@ -33,7 +33,7 @@ use Symfony\Component\Console\Tester\ApplicationTester;
  *         // other checks
  *     }
  */
-class ConsoleCommandTestCase extends IntegrationTestCase
+class ConsoleCommandTestCase extends SystemTestCase
 {
     protected $applicationTester = null;
 

tests/PHPUnit/Fixture.php

@@ -90,7 +90,7 @@ class Fixture extends PHPUnit_Framework_Assert
         if(\Piwik\SettingsServer::isWindows()) {
             return "C:\Python27\python.exe";
         }
-        if(IntegrationTestCase::isTravisCI()) {
+        if(SystemTestCase::isTravisCI()) {
             return 'python2.6';
         }
         return 'python';

tests/PHPUnit/Impl/ApiTestConfig.php

@@ -20,7 +20,7 @@ use \Exception;
  * processed before comparison.
  *
  * Instances of this class are not created directly. Instead, an array mapping config
- * property names w/ values is passed to IntegrationTestCase::runApiTests. For example,
+ * property names w/ values is passed to SystemTestCase::runApiTests. For example,
  *
  *     $this->runApiTests("UserCountry", array(
  *         'idSite' => 1,
@@ -135,7 +135,7 @@ class ApiTestConfig
     public $fileExtension = false;
 
     /**
-     * An array of API methods that shouldn't be called. If `'all'` is specified in IntegrationTestCase::runApiTests,
+     * An array of API methods that shouldn't be called. If `'all'` is specified in SystemTestCase::runApiTests,
      * the methods in this property will be ignored when calling all API methods.
      *
      * @var string[]|false eg, `array("Actions", "Referrers.getWebsites", ...)`

tests/PHPUnit/Impl/TestRequestCollection.php

@@ -12,7 +12,7 @@ use Piwik\API\DocumentationGenerator;
 use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\UrlHelper;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use \Exception;
 use \PHPUnit_Framework_Assert;
 
@@ -222,7 +222,7 @@ class TestRequestCollection
                                                      ));
 
                     $content = $request->process();
-                    IntegrationTestCase::assertApiResponseHasNoError($content);
+                    SystemTestCase::assertApiResponseHasNoError($content);
 
                     // find first row w/ subtable
                     foreach ($content as $row) {

tests/PHPUnit/Impl/TestRequestResponse.php

@@ -9,7 +9,7 @@
 namespace Piwik\Tests\Impl;
 
 use Piwik\API\Request;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use PHPUnit_Framework_Assert as Asserts;
 use Exception;
 
@@ -115,7 +115,7 @@ class TestRequestResponse
 
     private function normalizeEncodingPhp533($apiResponse)
     {
-        if(!IntegrationTestCase::isPhpVersion53()
+        if(!SystemTestCase::isPhpVersion53()
             || strpos($apiResponse, '<result') === false) {
             return $apiResponse;
         }

tests/PHPUnit/Integration/AnnotationsTest.php

@@ -10,7 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\Access;
 use Piwik\API\Request;
 use Piwik\Plugins\Annotations\API;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesWithAnnotations;
 use FakeAccess;
 use Exception;
@@ -19,7 +19,7 @@ use Exception;
  * @group Integration
  * @group AnnotationsTest
  */
-class AnnotationsTest extends IntegrationTestCase
+class AnnotationsTest extends SystemTestCase
 {
     public static $fixture = null;
 

tests/PHPUnit/Integration/ApiGetReportMetadataTest.php

@@ -8,7 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\API\Proxy;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ThreeGoalsOnePageview;
 
 /**
@@ -19,7 +19,7 @@ use Piwik\Tests\Fixtures\ThreeGoalsOnePageview;
  * @group Integration
  * @group ApiGetReportMetadataTest
  */
-class ApiGetReportMetadataTest extends IntegrationTestCase
+class ApiGetReportMetadataTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 

tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php

@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\InvalidVisits;
 
 /**
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixtures\InvalidVisits;
  * @group Integration
  * @group ApiGetReportMetadataYearTest
  */
-class ApiGetReportMetadataYearTest extends IntegrationTestCase
+class ApiGetReportMetadataYearTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 

tests/PHPUnit/Integration/ArchiveCronTest.php

@@ -9,7 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Date;
 use Piwik\Plugins\SitesManager\API;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ManySitesImportedLogs;
 use Piwik\Tests\Fixture;
 use Exception;
@@ -23,7 +23,7 @@ use Exception;
  * @group Integration
  * @group ArchiveCronTest
  */
-class ArchiveCronTest extends IntegrationTestCase
+class ArchiveCronTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 

tests/PHPUnit/Integration/ArchiveInvalidationTest.php

@@ -10,7 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\API\Request;
 use Piwik\Config;
 use Piwik\Tests\Fixtures\VisitsTwoWebsitesWithAdditionalVisits;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Exception;
 
 /**
@@ -23,7 +23,7 @@ use Exception;
  * @group Integration
  * @group ArchiveInvalidationTest
  */
-class ArchiveInvalidationTest extends IntegrationTestCase
+class ArchiveInvalidationTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition