From b26039b52b509d04c5beded2f3ad59a6213c2cbe Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Mon, 17 Nov 2014 20:53:17 -0800
Subject: [PATCH] Fixing remaining tests.

---
 .../tests/System/expected/test_Contents__Actions.get_day.xml  | 2 ++
 .../System/expected/test_Contents__Actions.get_month.xml      | 2 ++
 .../expected/test_Contents__Live.getLastVisitsDetails_day.xml | 4 ++--
 .../test_Contents__Live.getLastVisitsDetails_month.xml        | 4 ++--
 ...contentInteractionMatch__Live.getLastVisitsDetails_day.xml | 4 ++--
 ...ents_contentTargetMatch__Live.getLastVisitsDetails_day.xml | 4 ++--
 ...contentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml | 4 ++--
 .../tests/System/expected/test___API.get_day.xml              | 1 +
 plugins/Insights/tests/Integration/ApiTest.php                | 3 +--
 9 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.get_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_day.xml
index f51cfaf913..6fcd987c1a 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Actions.get_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_day.xml
@@ -8,5 +8,7 @@
 	<nb_uniq_outlinks>0</nb_uniq_outlinks>
 	<nb_searches>0</nb_searches>
 	<nb_keywords>0</nb_keywords>
+	<sum_time_generation>0.67</sum_time_generation>
+	<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 	<avg_time_generation>0.335</avg_time_generation>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.get_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_month.xml
index f51cfaf913..6fcd987c1a 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Actions.get_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_month.xml
@@ -8,5 +8,7 @@
 	<nb_uniq_outlinks>0</nb_uniq_outlinks>
 	<nb_searches>0</nb_searches>
 	<nb_keywords>0</nb_keywords>
+	<sum_time_generation>0.67</sum_time_generation>
+	<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 	<avg_time_generation>0.335</avg_time_generation>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index 857c554b17..bafb226af0 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -40,7 +40,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
-		<visitDurationPretty>4 min 31s</visitDurationPretty>
+		<visitDurationPretty>4 min 31s</visitDurationPretty>
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
@@ -140,7 +140,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
-		<visitDurationPretty>4 min 31s</visitDurationPretty>
+		<visitDurationPretty>4 min 31s</visitDurationPretty>
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index 857c554b17..bafb226af0 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -40,7 +40,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
-		<visitDurationPretty>4 min 31s</visitDurationPretty>
+		<visitDurationPretty>4 min 31s</visitDurationPretty>
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
@@ -140,7 +140,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
-		<visitDurationPretty>4 min 31s</visitDurationPretty>
+		<visitDurationPretty>4 min 31s</visitDurationPretty>
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index 857c554b17..bafb226af0 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -40,7 +40,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
-		<visitDurationPretty>4 min 31s</visitDurationPretty>
+		<visitDurationPretty>4 min 31s</visitDurationPretty>
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
@@ -140,7 +140,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
-		<visitDurationPretty>4 min 31s</visitDurationPretty>
+		<visitDurationPretty>4 min 31s</visitDurationPretty>
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index 857c554b17..bafb226af0 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -40,7 +40,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
-		<visitDurationPretty>4 min 31s</visitDurationPretty>
+		<visitDurationPretty>4 min 31s</visitDurationPretty>
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
@@ -140,7 +140,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
-		<visitDurationPretty>4 min 31s</visitDurationPretty>
+		<visitDurationPretty>4 min 31s</visitDurationPretty>
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index 857c554b17..bafb226af0 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -40,7 +40,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
-		<visitDurationPretty>4 min 31s</visitDurationPretty>
+		<visitDurationPretty>4 min 31s</visitDurationPretty>
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
@@ -140,7 +140,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
-		<visitDurationPretty>4 min 31s</visitDurationPretty>
+		<visitDurationPretty>4 min 31s</visitDurationPretty>
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
diff --git a/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml b/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml
index 79d37b3acd..169fe159ee 100644
--- a/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml
+++ b/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml
@@ -14,6 +14,7 @@
 	<nb_users_returning>0</nb_users_returning>
 	<nb_visits_converted_returning>0</nb_visits_converted_returning>
 	<max_actions_returning>0</max_actions_returning>
+	<bounce_count_returning>0</bounce_count_returning>
 	<bounce_rate_returning>0%</bounce_rate_returning>
 	<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
 	<avg_time_on_site_returning>0</avg_time_on_site_returning>
diff --git a/plugins/Insights/tests/Integration/ApiTest.php b/plugins/Insights/tests/Integration/ApiTest.php
index 81ce0b34cf..dfa76dcde1 100644
--- a/plugins/Insights/tests/Integration/ApiTest.php
+++ b/plugins/Insights/tests/Integration/ApiTest.php
@@ -80,8 +80,7 @@ class ApiTest extends SystemTestCase
             'minDisappearedPercent' => 2,
             'lastTotalValue' => 59,
             'evolutionTotal' => -15.3,
-            'evolutionDifference' => -9,
-            'processed_metrics_computed' => true
+            'evolutionDifference' => -9
         );
 
         $this->assertInternalType('array', $metadata['report']);
-- 
GitLab