Fixing lots of system tests.

core/API/DataTablePostProcessor.php

@@ -271,7 +271,9 @@ class DataTablePostProcessor
                 $allTemporaryMetrics = array_merge($allTemporaryMetrics, $metric->getTemporaryMetrics());
             }
 
-            $table->filter('ColumnDelete', array($allTemporaryMetrics));
+            if (!empty($allTemporaryMetrics)) {
+                $table->filter('ColumnDelete', array($allTemporaryMetrics));
+            }
         });
     }
 

plugins/Actions/Columns/Metrics/AveragePageGenerationTime.php

@@ -68,7 +68,10 @@ class AveragePageGenerationTime extends ProcessedMetric
     {
         $hasTimeGeneration = array_sum($this->getMetricValues($table, 'sum_time_generation')) > 0;
 
-        if (!$hasTimeGeneration) {
+        if (!$hasTimeGeneration
+            && $table->getRowsCount() != 0
+            && !$this->hasAverageTimeGeneration($table)
+        ) {
             // No generation time: remove it from the API output and add it to empty_columns metadata, so that
             // the columns can also be removed from the view
             $table->filter('ColumnDelete', array(array(
@@ -97,4 +100,9 @@ class AveragePageGenerationTime extends ProcessedMetric
 
         return $hasTimeGeneration;
     }
+
+    private function hasAverageTimeGeneration(DataTable $table)
+    {
+        return $table->getFirstRow()->getColumn('avg_time_generation') !== false;
+    }
 }
\ No newline at end of file

plugins/MultiSites/Reports/Base.php

@@ -17,15 +17,21 @@ abstract class Base extends \Piwik\Plugin\Report
     {
         $this->category = 'General_MultiSitesSummary';
 
+        $allMetricsInfo = API::getApiMetrics($enhanced = true);
+
         $metadataMetrics = array();
-        foreach (API::getApiMetrics($enhanced = true) as $metricName => $metricSettings) {
+        $processedMetricsMetadata = array();
+
+        foreach ($allMetricsInfo as $metricName => $metricSettings) {
             $metadataMetrics[$metricName] =
                 Piwik::translate($metricSettings[API::METRIC_TRANSLATION_KEY]);
-            $metadataMetrics[$metricSettings[API::METRIC_EVOLUTION_COL_NAME_KEY]] =
+
+            $processedMetricsMetadata[$metricSettings[API::METRIC_EVOLUTION_COL_NAME_KEY]] =
                 Piwik::translate($metricSettings[API::METRIC_TRANSLATION_KEY]) . " " . Piwik::translate('MultiSites_Evolution');
         }
 
         $this->metrics = array_keys($metadataMetrics);
+        $this->processedMetrics = array_keys($processedMetricsMetadata);
     }
 
 }

plugins/MultiSites/Reports/GetAll.php

@@ -19,7 +19,6 @@ class GetAll extends Base
         $this->dimension     = new Website();
         $this->name          = Piwik::translate('General_AllWebsitesDashboard');
         $this->documentation = ''; // TODO
-        $this->processedMetrics = false;
         $this->constantRowsCount = false;
         $this->order = 4;
     }

plugins/MultiSites/Reports/GetOne.php

@@ -20,7 +20,6 @@ class GetOne extends Base
         $this->name          = Piwik::translate('General_SingleWebsitesDashboard');
         $this->documentation = ''; // TODO
         $this->constantRowsCount = false;
-        $this->processedMetrics = false;
         $this->order = 5;
     }
 

tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml

@@ -5,6 +5,9 @@
 		<nb_users>0</nb_users>
 		<nb_visits>9</nb_visits>
 		<nb_actions>9</nb_actions>
+		<nb_visits_converted>9</nb_visits_converted>
+		<bounce_count>9</bounce_count>
+		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
 		<bounce_rate>100%</bounce_rate>
 		<nb_actions_per_visit>1</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml

@@ -5,6 +5,9 @@
 		<nb_users>0</nb_users>
 		<nb_visits>27</nb_visits>
 		<nb_actions>30</nb_actions>
+		<nb_visits_converted>25</nb_visits_converted>
+		<bounce_count>25</bounce_count>
+		<sum_visit_length>305</sum_visit_length>
 		<max_actions>3</max_actions>
 		<bounce_rate>93%</bounce_rate>
 		<nb_actions_per_visit>1.1</nb_actions_per_visit>
@@ -15,6 +18,9 @@
 		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<nb_visits_converted>0</nb_visits_converted>
+		<bounce_count>1</bounce_count>
+		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
 		<bounce_rate>100%</bounce_rate>
 		<nb_actions_per_visit>1</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__VisitsSummary.get_month.xml

@@ -5,6 +5,9 @@
 		<nb_users>0</nb_users>
 		<nb_visits>2</nb_visits>
 		<nb_actions>12</nb_actions>
+		<nb_visits_converted>0</nb_visits_converted>
+		<bounce_count>0</bounce_count>
+		<sum_visit_length>2</sum_visit_length>
 		<max_actions>6</max_actions>
 		<bounce_rate>0%</bounce_rate>
 		<nb_actions_per_visit>6</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml

@@ -5,6 +5,9 @@
 		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>6</nb_actions>
+		<nb_visits_converted>0</nb_visits_converted>
+		<bounce_count>0</bounce_count>
+		<sum_visit_length>1</sum_visit_length>
 		<max_actions>6</max_actions>
 		<bounce_rate>0%</bounce_rate>
 		<nb_actions_per_visit>6</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__VisitsSummary.get_month.xml

@@ -5,6 +5,9 @@
 		<nb_users>0</nb_users>
 		<nb_visits>2</nb_visits>
 		<nb_actions>18</nb_actions>
+		<nb_visits_converted>0</nb_visits_converted>
+		<bounce_count>0</bounce_count>
+		<sum_visit_length>2</sum_visit_length>
 		<max_actions>12</max_actions>
 		<bounce_rate>0%</bounce_rate>
 		<nb_actions_per_visit>9</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml

@@ -5,6 +5,9 @@
 		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>6</nb_actions>
+		<nb_visits_converted>0</nb_visits_converted>
+		<bounce_count>0</bounce_count>
+		<sum_visit_length>1</sum_visit_length>
 		<max_actions>6</max_actions>
 		<bounce_rate>0%</bounce_rate>
 		<nb_actions_per_visit>6</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml

@@ -5,6 +5,9 @@
 		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>6</nb_actions>
+		<nb_visits_converted>0</nb_visits_converted>
+		<bounce_count>0</bounce_count>
+		<sum_visit_length>1</sum_visit_length>
 		<max_actions>6</max_actions>
 		<bounce_rate>0%</bounce_rate>
 		<nb_actions_per_visit>6</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml

@@ -2,6 +2,9 @@
 <result>
 	<nb_visits>18</nb_visits>
 	<nb_actions>18</nb_actions>
+	<nb_visits_converted>18</nb_visits_converted>
+	<bounce_count>18</bounce_count>
+	<sum_visit_length>0</sum_visit_length>
 	<max_actions>1</max_actions>
 	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml

@@ -2,6 +2,9 @@
 <result>
 	<nb_visits>27</nb_visits>
 	<nb_actions>47</nb_actions>
+	<nb_visits_converted>27</nb_visits_converted>
+	<bounce_count>14</bounce_count>
+	<sum_visit_length>16393</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>52%</bounce_rate>
 	<nb_actions_per_visit>1.7</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml

@@ -2,6 +2,9 @@
 <result>
 	<nb_visits>1</nb_visits>
 	<nb_actions>1</nb_actions>
+	<nb_visits_converted>1</nb_visits_converted>
+	<bounce_count>1</bounce_count>
+	<sum_visit_length>0</sum_visit_length>
 	<max_actions>1</max_actions>
 	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml

@@ -2,6 +2,9 @@
 <result>
 	<nb_visits>27</nb_visits>
 	<nb_actions>47</nb_actions>
+	<nb_visits_converted>27</nb_visits_converted>
+	<bounce_count>14</bounce_count>
+	<sum_visit_length>16393</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>52%</bounce_rate>
 	<nb_actions_per_visit>1.7</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml

@@ -2,6 +2,9 @@
 <result>
 	<nb_visits>10</nb_visits>
 	<nb_actions>18</nb_actions>
+	<nb_visits_converted>10</nb_visits_converted>
+	<bounce_count>5</bounce_count>
+	<sum_visit_length>6305</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>50%</bounce_rate>
 	<nb_actions_per_visit>1.8</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml

@@ -2,6 +2,9 @@
 <result>
 	<nb_visits>20</nb_visits>
 	<nb_actions>36</nb_actions>
+	<nb_visits_converted>20</nb_visits_converted>
+	<bounce_count>10</bounce_count>
+	<sum_visit_length>12610</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>50%</bounce_rate>
 	<nb_actions_per_visit>1.8</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml

@@ -2,6 +2,9 @@
 <result>
 	<nb_visits>10</nb_visits>
 	<nb_actions>18</nb_actions>
+	<nb_visits_converted>10</nb_visits_converted>
+	<bounce_count>5</bounce_count>
+	<sum_visit_length>6305</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>50%</bounce_rate>
 	<nb_actions_per_visit>1.8</nb_actions_per_visit>

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml

@@ -2,6 +2,9 @@
 <result>
 	<nb_visits>30</nb_visits>
 	<nb_actions>50</nb_actions>
+	<nb_visits_converted>30</nb_visits_converted>
+	<bounce_count>17</bounce_count>
+	<sum_visit_length>16393</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>57%</bounce_rate>
 	<nb_actions_per_visit>1.7</nb_actions_per_visit>