From ccfc07ee093025d85cfc7f1a39ce57021dc7554a Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Sat, 8 Nov 2014 22:12:47 -0800
Subject: Fixing most of the tests.

---
 ...firstSite_lastN__API.getProcessedReport_day.xml | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml')

diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index c1f7037343..0ac93d5428 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
@@ -12,19 +12,20 @@
 		<metrics>
 			<nb_hits>Pageviews</nb_hits>
 			<nb_visits>Unique Pageviews</nb_visits>
-			<bounce_rate>Bounce Rate</bounce_rate>
-			<avg_time_on_page>Avg. time on page</avg_time_on_page>
-			<exit_rate>Exit rate</exit_rate>
-			<avg_time_generation>Avg. generation time</avg_time_generation>
 		</metrics>
 		<metricsDocumentation>
 			<nb_hits>The number of times this page was visited.</nb_hits>
 			<nb_visits>The number of visits that included this page. If a page was viewed multiple times during one visit, it is only counted once.</nb_visits>
-			<bounce_rate>The percentage of visits that started on this page and left the website straight away.</bounce_rate>
 			<avg_time_on_page>The average amount of time visitors spent on this page (only the page, not the entire website).</avg_time_on_page>
+			<bounce_rate>The percentage of visits that started on this page and left the website straight away.</bounce_rate>
 			<exit_rate>The percentage of visits that left the website after viewing this page.</exit_rate>
-			<avg_time_generation>The average time it took to generate the page. This metric includes the time it took the server to generate the web page, plus the time it took for the visitor to download the response from the server. A lower 'Avg. generation time' means a faster website for your visitors!</avg_time_generation>
 		</metricsDocumentation>
+		<processedMetrics>
+			<avg_time_on_page>Avg. time on page</avg_time_on_page>
+			<bounce_rate>Bounce Rate</bounce_rate>
+			<exit_rate>Exit rate</exit_rate>
+			<avg_time_generation>Avg. generation time</avg_time_generation>
+		</processedMetrics>
 		<actionToLoadSubTables>getPageTitles</actionToLoadSubTables>
 		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Actions&amp;apiAction=getPageTitles&amp;period=range&amp;date=2010-01-03,2010-01-09</imageGraphUrl>
 		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Actions&amp;apiAction=getPageTitles&amp;period=day&amp;date=2010-01-03,2010-01-09</imageGraphEvolutionUrl>
@@ -34,10 +35,9 @@
 		<label>Page Name</label>
 		<nb_hits>Pageviews</nb_hits>
 		<nb_visits>Unique Pageviews</nb_visits>
-		<bounce_rate>Bounce Rate</bounce_rate>
 		<avg_time_on_page>Avg. time on page</avg_time_on_page>
+		<bounce_rate>Bounce Rate</bounce_rate>
 		<exit_rate>Exit rate</exit_rate>
-		<avg_time_generation>Avg. generation time</avg_time_generation>
 	</columns>
 	<reportData>
 		<result prettyDate="Sunday 3 January 2010">
@@ -45,28 +45,25 @@
 				<label> Im just a page</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
-				<avg_time_on_page>00:00:36</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
+				<avg_time_on_page>00:00:36</avg_time_on_page>
 				<exit_rate>0%</exit_rate>
-				<avg_time_generation>0s</avg_time_generation>
 			</row>
 			<row>
 				<label> Pageview, not search</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
-				<avg_time_on_page>00:00:00</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
+				<avg_time_on_page>00:00:00</avg_time_on_page>
 				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0s</avg_time_generation>
 			</row>
 			<row>
 				<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
-				<avg_time_on_page>00:03:36</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
+				<avg_time_on_page>00:03:36</avg_time_on_page>
 				<exit_rate>0%</exit_rate>
-				<avg_time_generation>0s</avg_time_generation>
 			</row>
 		</result>
 		<result prettyDate="Monday 4 January 2010" />
-- 
cgit v1.2.3