Refs matomo-org#4087, fix bug in capture.js and allow multiple UI tes…

…t cases to be written.
sabl0r · Aug 22, 2013 · 8bb5f17 · 8bb5f17
1 parent 1fe353b
commit 8bb5f17
Show file tree

Hide file tree

Showing 39 changed files with 247 additions and 231 deletions.
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -16,7 +16,7 @@
  */
 class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture
 {
-    public $dateTime = '2010-03-06 11:22:33';
+    public $dateTime = '2012-08-09 11:22:33';
     public $idSite = 1;
     public $idSite2 = 2;
     public $idGoal = 1;

diff --git a/tests/PHPUnit/Integration/AnnotationsTest.php b/tests/PHPUnit/Integration/AnnotationsTest.php
@@ -14,7 +14,7 @@ class AnnotationsTest extends IntegrationTestCase
 {
     public static $fixture = null;
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'annotations';
     }

diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
@@ -34,7 +34,7 @@ public function tearDown()
         Proxy::getInstance()->setHideIgnoredFunctions(true);
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'apiGetReportMetadata';
     }

diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadata_yearTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadata_yearTest.php
@@ -30,7 +30,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'apiGetReportMetadata_year';
     }

diff --git a/tests/PHPUnit/Integration/BlobReportLimitingTest.php b/tests/PHPUnit/Integration/BlobReportLimitingTest.php
@@ -153,7 +153,7 @@ public function testApiWithRankingQueryDisabled()
         }
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'reportLimiting';
     }

diff --git a/tests/PHPUnit/Integration/CsvExportTest.php b/tests/PHPUnit/Integration/CsvExportTest.php
@@ -57,7 +57,7 @@ public function testApi($api, $params)
         $this->runApiTests($api, $params);
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'csvExport';
     }

diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
@@ -174,7 +174,7 @@ public function getApiForTesting()
                            ), self::getApiForTestingScheduledReports($dateTime, 'week'));
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'ecommerceOrderWithItems';
     }

diff --git a/tests/PHPUnit/Integration/FlattenReportsTest.php b/tests/PHPUnit/Integration/FlattenReportsTest.php
@@ -112,7 +112,7 @@ public function getApiForTesting()
         return $return;
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'FlattenReports';
     }

diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/Integration/ImportLogsTest.php
@@ -69,7 +69,7 @@ public function testDynamicResolverSitesCreated()
         $this->assertEquals(1, count($whateverDotCom));
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'ImportLogs';
     }

diff --git a/tests/PHPUnit/Integration/LabelFilterTest.php b/tests/PHPUnit/Integration/LabelFilterTest.php
@@ -114,7 +114,7 @@ public function getApiForTesting()
         return $return;
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'LabelFilter';
     }

diff --git a/tests/PHPUnit/Integration/NoVisitTest.php b/tests/PHPUnit/Integration/NoVisitTest.php
@@ -39,7 +39,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'noVisit';
     }

diff --git a/tests/PHPUnit/Integration/NonUnicodeTest.php b/tests/PHPUnit/Integration/NonUnicodeTest.php
@@ -40,7 +40,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'NonUnicode';
     }

diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRangeTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRangeTest.php
@@ -85,7 +85,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'oneVisitor_oneWebsite_severalDays_DateRange';
     }

diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php
@@ -16,7 +16,7 @@ class Test_Piwik_Integration_OneVisitorOneWebsite_SeveralDaysDateRange_Archiving
 {
     public static $fixture = null; // initialized below test definition
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'oneVisitor_oneWebsite_severalDays_DateRange';
     }

diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisits_withCookieSupportTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisits_withCookieSupportTest.php
@@ -36,7 +36,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'OneVisitorTwoVisits_withCookieSupport';
     }

diff --git a/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php b/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php
@@ -39,7 +39,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'OneVisitor_LongUrlsTruncated';
     }

diff --git a/tests/PHPUnit/Integration/OneVisitor_NoKeywordSpecifiedTest.php b/tests/PHPUnit/Integration/OneVisitor_NoKeywordSpecifiedTest.php
@@ -37,7 +37,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'OneVisitor_NoKeywordSpecified';
     }

diff --git a/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php b/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php
@@ -93,7 +93,7 @@ public function getApiForTesting()
         return $result;
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'periodIsRange_dateIsLastN_MetadataAndNormalAPI';
     }

diff --git a/tests/PHPUnit/Integration/RowEvolutionTest.php b/tests/PHPUnit/Integration/RowEvolutionTest.php
@@ -210,7 +210,7 @@ public function getApiForTesting()
         return $return;
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'RowEvolution';
     }

diff --git a/tests/PHPUnit/Integration/SiteSearchTest.php b/tests/PHPUnit/Integration/SiteSearchTest.php
@@ -81,7 +81,7 @@ public function getApiForTesting()
         return $result;
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'SiteSearch';
     }

diff --git a/...PUnit/Integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristicsTest.php b/...PUnit/Integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristicsTest.php
@@ -34,7 +34,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking';
     }

diff --git a/tests/PHPUnit/Integration/TrackGoals_AllowMultipleConversionsPerVisitTest.php b/tests/PHPUnit/Integration/TrackGoals_AllowMultipleConversionsPerVisitTest.php
@@ -52,7 +52,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'trackGoals_allowMultipleConversionsPerVisit';
     }

diff --git a/tests/PHPUnit/Integration/TrackerWindowLookBack.php b/tests/PHPUnit/Integration/TrackerWindowLookBack.php
@@ -37,7 +37,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'TrackerWindowLookBack';
     }

diff --git a/tests/PHPUnit/Integration/TransitionsTest.php b/tests/PHPUnit/Integration/TransitionsTest.php
@@ -71,7 +71,7 @@ public function getApiForTesting()
         return $return;
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'Transitions';
     }

diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
@@ -102,7 +102,7 @@ public function getApiForTesting()
         return array_merge($result, self::getApiForTestingScheduledReports($dateTime, 'month'));
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'TwoVisitors_twoWebsites_differentDays';
     }

diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php
@@ -53,7 +53,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'TwoVisitors_twoWebsites_differentDays_ArchivingDisabled';
     }

diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php
@@ -104,7 +104,7 @@ public function getApiForTesting()
         return $result;
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'TwoVisitors_twoWebsites_differentDays_Conversions';
     }

diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
@@ -49,7 +49,7 @@ public function testApi($api, $params)
         $this->runApiTests($api, $params);
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'twoVisitsWithCustomVariables';
     }

diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentContainsTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentContainsTest.php
@@ -13,7 +13,7 @@ class Test_Piwik_Integration_TwoVisitsWithCustomVariables_SegmentContains extend
 {
     public static $fixture = null; // initialized below class definition
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'twoVisitsWithCustomVariables';
     }

diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoalDataTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoalDataTest.php
@@ -38,7 +38,7 @@ public function getApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'twoVisitsWithCustomVariables_segmentMatchALL_noGoalData';
     }

diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php
@@ -70,7 +70,7 @@ public function getSegmentToTest()
         return $segment;
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'twoVisitsWithCustomVariables_segmentMatchNONE';
     }

diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php
@@ -96,7 +96,7 @@ public function testCheck()
         }
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'twoVisitsWithCustomVariables_segmentMatchVisitorType';
     }

diff --git a/tests/PHPUnit/Integration/UrlNormalizationTest.php b/tests/PHPUnit/Integration/UrlNormalizationTest.php
@@ -104,7 +104,7 @@ public function testCheckPostConditions()
         $this->assertEquals($expected, $urls, "normalization went wrong");
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'UrlNormalization';
     }

diff --git a/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php b/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php
@@ -115,7 +115,7 @@ public function getAnotherApiForTesting()
         );
     }
 
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
         return 'VisitsInPast_InvalidateOldReports';
     }

diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
@@ -941,9 +941,9 @@ public function getApiForTesting()
     /**
      * Gets the string prefix used in the name of the expected/processed output files.
      */
-    public function getOutputPrefix()
+    public static function getOutputPrefix()
     {
-        return str_replace('Test_Piwik_Integration_', '', get_class($this));
+        return str_replace('Test_Piwik_Integration_', '', get_called_class());
     }
 
     protected function _setCallableApi($api)
@@ -974,7 +974,7 @@ protected function _setCallableApi($api)
      */
     protected function runApiTests($api, $params)
     {
-        $testName = 'test_' . $this->getOutputPrefix();
+        $testName = 'test_' . static::getOutputPrefix();
         $this->missingExpectedFiles = array();
         $this->comparisonFailures = array();
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ public function getApiForTesting() @@
             );
         }
-        public function getOutputPrefix()
+        public static function getOutputPrefix()
         {
             return 'apiGetReportMetadata_year';
         }
@@ Expand Down @@