Refs #6078, rename test methods.

plugins/CoreConsole/Commands/TestsRun.php

@@ -87,7 +87,7 @@ class TestsRun extends ConsoleCommand
 
     private function executeTestFile($testFile, $options, $command, OutputInterface $output)
     {
-        $params = $testFile . " " . $options;
+        $params = $options . " " . $testFile;
         $cmd = sprintf("cd %s/tests/PHPUnit && %s %s", PIWIK_DOCUMENT_ROOT, $command, $params);
         $output->writeln('Executing command: <info>' . $cmd . '</info>');
         passthru($cmd);

tests/PHPUnit/Core/API/ApiRendererTest.php

@@ -10,6 +10,7 @@ use Piwik\API\ApiRenderer;
 
 /**
  * @group Core
+ * @group Only2
  */
 class ApiRendererTest extends PHPUnit_Framework_TestCase
 {

tests/PHPUnit/Core/DataTable/Filter/PivotByDimensionTest.php

@@ -70,7 +70,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
      * @expectedException Exception
      * @expectedExceptionMessage Unsupported pivot: report 'ExampleReport.ExampleReportName' has no subtable dimension.
      */
-    public function testConstructionFailsWhenReportHasNoSubtableAndSegmentFetchingIsDisabled()
+    public function test_construction_ShouldFail_WhenReportHasNoSubtableAndSegmentFetchingIsDisabled()
     {
         $this->loadPlugins('ExampleReport', 'UserCountry');
 
@@ -81,7 +81,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
      * @expectedException Exception
      * @expectedExceptionMessage Unsupported pivot: the subtable dimension for 'Referrers.Referrers_Keywords' does not match the requested pivotBy dimension.
      */
-    public function testConstructionFailsWhenDimensionIsNotSubtableAndSegmentFetchingIsDisabled()
+    public function test_construction_ShouldFail_WhenDimensionIsNotSubtableAndSegmentFetchingIsDisabled()
     {
         $this->loadPlugins('Referrers', 'UserCountry');
 
@@ -92,7 +92,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
      * @expectedException Exception
      * @expectedExceptionMessage Unsupported pivot: No segment for dimension of report 'UserSettings.UserSettings_WidgetBrowserFamilies'
      */
-    public function testConstructionFailsWhenDimensionIsNotSubtableAndSegmentFetchingIsEnabledButThereIsNoSegment()
+    public function test_construction_ShouldFail_WhenDimensionIsNotSubtableAndSegmentFetchingIsEnabledButThereIsNoSegment()
     {
         $this->loadPlugins('Referrers', 'UserSettings');
 
@@ -103,7 +103,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
      * @expectedException Exception
      * @expectedExceptionMessage Invalid dimension 'ExampleTracker.InvalidDimension'
      */
-    public function testConstructionFailsWhenDimensionDoesNotExist()
+    public function test_construction_ShouldFail_WhenDimensionDoesNotExist()
     {
         $this->loadPlugins('ExampleReport', 'ExampleTracker');
 
@@ -114,7 +114,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
      * @expectedException Exception
      * @expectedExceptionMessage Unsupported pivot: No report for pivot dimension 'ExampleTracker.ExampleDimension'
      */
-    public function testConstructionFailsWhenThereIsNoReportForADimension()
+    public function test_construction_ShouldFail_WhenThereIsNoReportForADimension()
     {
         $this->loadPlugins('ExampleReport', 'ExampleTracker');
 
@@ -125,14 +125,14 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
      * @expectedException Exception
      * @expectedExceptionMessage Unable to find report 'ExampleReport.InvalidReport'
      */
-    public function testConstructionFailsWhenSpecifiedReportIsNotValid()
+    public function test_construction_ShouldFail_WhenSpecifiedReportIsNotValid()
     {
         $this->loadPlugins('ExampleReport', 'Referrers');
 
         new PivotByDimension(new DataTable(), "ExampleReport.InvalidReport", "Referrers.Keyword", "nb_visits");
     }
 
-    public function testFilterReturnsEmptyResultWhenTableToFilterIsEmpty()
+    public function test_filter_ReturnsEmptyResult_WhenTableToFilterIsEmpty()
     {
         $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables');
 
@@ -144,7 +144,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(array(), $table->getRows());
     }
 
-    public function testFilterCorrectlyCreatesPivotTableUsingSubtableReport()
+    public function test_filter_CorrectlyCreatesPivotTable_WhenUsingSubtableReport()
     {
         $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables');
 
@@ -161,7 +161,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
         $this->assertTableRowsEquals($expectedRows, $table);
     }
 
-    public function testFilterCorrectlyCreatesPivotTableUsingSegment()
+    public function test_filter_CorrectlyCreatesPivotTable_WhenUsingSegment()
     {
         $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables');
 
@@ -181,7 +181,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
         $this->assertTableRowsEquals($expectedRows, $table);
     }
 
-    public function testFilterUsesCorrectSegmentWhenPivotingSegmentedReport()
+    public function test_filter_UsesCorrectSegment_WhenPivotingSegmentedReport()
     {
         $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables');
 
@@ -200,7 +200,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($expectedSegmentParams, $this->segmentUsedToGetIntersected);
     }
 
-    public function testFilterCorrectlyCreatesPivotTableWhenPivotMetricDoesNotExistInTable()
+    public function test_filter_CorrectlyCreatesPivotTable_WhenPivotMetricDoesNotExistInTable()
     {
         $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables');
 
@@ -217,7 +217,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
         $this->assertTableRowsEquals($expectedRows, $table);
     }
 
-    public function testFilterCorrectlyCreatesPivotTableWhenSubtablesHaveNoRows()
+    public function test_filter_CorrectlyCreatesPivotTable_WhenSubtablesHaveNoRows()
     {
         $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables');
 
@@ -235,7 +235,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
         $this->assertTableRowsEquals($expectedRows, $table);
     }
 
-    public function testFilterCorrectlyDefaultsPivotByColumnWhenNoneProvided()
+    public function test_filter_CorrectlyDefaultsPivotByColumn_WhenNoneProvided()
     {
         $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables');
 
@@ -252,7 +252,7 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
         $this->assertTableRowsEquals($expectedRows, $table);
     }
 
-    public function testFilterCorrectlyLimitsTheColumnNumberWhenColumnLimitProvided()
+    public function test_filter_CorrectlyLimitsTheColumnNumber_WhenColumnLimitProvided()
     {
         $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables');
 

tests/PHPUnit/Integration/PivotByQueryParamTest.php

@@ -30,7 +30,7 @@ class PivotByQueryParamTest extends IntegrationTestCase
         Config::getInstance()->General['pivot_by_filter_enable_fetch_by_segment'] = 1;
     }
 
-    public function testPivotBySubtableDimensionCreatesCorrectPivotTable()
+    public function test_PivotBySubtableDimension_CreatesCorrectPivotTable()
     {
         $this->assertApiResponseEqualsExpected("Referrers.getKeywords", array(
             'idSite' => self::$fixture->idSite,
@@ -43,7 +43,7 @@ class PivotByQueryParamTest extends IntegrationTestCase
         ));
     }
 
-    public function testPivotBySubtableDimensionCreatesCorrectPivotTableWhenEntireHirearchyIsNotLoaded()
+    public function test_PivotBySubtableDimension_CreatesCorrectPivotTable_WhenEntireHirearchyIsNotLoaded()
     {
         $this->assertApiResponseEqualsExpected("Referrers.getKeywords", array(
             'idSite' => self::$fixture->idSite,
@@ -56,7 +56,7 @@ class PivotByQueryParamTest extends IntegrationTestCase
         ));
     }
 
-    public function testPivotBySegmentCreatesCorrectPivotTable()
+    public function test_PivotBySegment_CreatesCorrectPivotTable()
     {
         $this->assertApiResponseEqualsExpected("Referrers.getKeywords", array(
             'idSite' => self::$fixture->idSite,
@@ -68,7 +68,7 @@ class PivotByQueryParamTest extends IntegrationTestCase
         ));
     }
 
-    public function testPivotBySegmentCreatesCorrectPivotTableWhenSegmentUsedInRequest()
+    public function test_PivotBySegment_CreatesCorrectPivotTable_WhenSegmentUsedInRequest()
     {
         $this->assertApiResponseEqualsExpected("Referrers.getKeywords", array(
             'idSite' => self::$fixture->idSite,
@@ -81,7 +81,7 @@ class PivotByQueryParamTest extends IntegrationTestCase
         ));
     }
 
-    public function testPivotByParamPlaysNiceWithOtherQueryParams()
+    public function test_PivotByParam_PlaysNiceWithOtherQueryParams()
     {
         $this->assertApiResponseEqualsExpected("Referrers.getKeywords", array(
             'idSite' => self::$fixture->idSite,
@@ -98,7 +98,7 @@ class PivotByQueryParamTest extends IntegrationTestCase
         ));
     }
 
-    public function testPivotByParamPlaysNiceWithQueuedFilters()
+    public function test_PivotByParam_PlaysNiceWithQueuedFilters()
     {
         // TODO: known issue: some segment/report relationships are more complicated; for example, UserCountry.GetCity labels are combinations
         // of city, region & country dimensions, so the segment to get an intersected table needs all 3 of those.
@@ -115,7 +115,7 @@ class PivotByQueryParamTest extends IntegrationTestCase
         ));
     }
 
-    public function testPivotByParamWorksWithReportWhoseSubtableIsSelf()
+    public function test_PivotByParam_WorksWithReportWhoseSubtableIsSelf()
     {
         $this->assertApiResponseEqualsExpected("Actions.getPageUrls", array(
             'idSite' => self::$fixture->idSite,
@@ -127,7 +127,7 @@ class PivotByQueryParamTest extends IntegrationTestCase
         ));
     }
 
-    public function testPivotByParamWorksWithColumnLimiting()
+    public function test_PivotByParam_WorksWithColumnLimiting()
     {
         $this->assertApiResponseEqualsExpected("Referrers.getKeywords", array(
             'idSite' => self::$fixture->idSite,
@@ -139,7 +139,7 @@ class PivotByQueryParamTest extends IntegrationTestCase
         ));
     }
 
-    public function testPivotByParamWorksWithJsonOutput()
+    public function test_PivotByParam_WorksWithJsonOutput()
     {
         $this->assertApiResponseEqualsExpected("Referrers.getKeywords", array(
             'idSite' => self::$fixture->idSite,
@@ -152,7 +152,7 @@ class PivotByQueryParamTest extends IntegrationTestCase
         ));
     }
 
-    public function testPivotByParamWorksWithCsvOutput()
+    public function test_PivotByParam_WorksWithCsvOutput()
     {
         $this->assertApiResponseEqualsExpected("Referrers.getKeywords", array(
             'idSite' => self::$fixture->idSite,
@@ -165,7 +165,7 @@ class PivotByQueryParamTest extends IntegrationTestCase
         ));
     }
 
-    public function testPivotByParamPlaysNiceWithDataTableMaps()
+    public function test_PivotByParam_PlaysNiceWithDataTableMaps()
     {
         $this->assertApiResponseEqualsExpected("Referrers.getKeywords", array(
             'idSite' => 'all',