Handle evolution metrics & goal metrics in Inconsistencies::getPercentMetrics, use correct time formatting in two other places, and fix ImportLogsTest.

1 files changed, 54 insertions, 54 deletions

diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index a0cd8d2485..dafd6523e3 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -220,7 +220,7 @@
 				<eventAction>play50%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>1320</timeSpent>
-				<timeSpentPretty>22 min 0s</timeSpentPretty>
+				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -233,7 +233,7 @@
 				<eventAction>play75%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>420</timeSpent>
-				<timeSpentPretty>7 min 0s</timeSpentPretty>
+				<timeSpentPretty>7 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -246,7 +246,7 @@
 				<eventAction>Search</eventAction>
 				<eventName>Search query here</eventName>
 				<timeSpent>900</timeSpent>
-				<timeSpentPretty>15 min 0s</timeSpentPretty>
+				<timeSpentPretty>15 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -259,7 +259,7 @@
 				<eventAction>playEnd</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>120</timeSpent>
-				<timeSpentPretty>2 min 0s</timeSpentPretty>
+				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -273,7 +273,7 @@
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<eventValue>9.66</eventValue>
 				<timeSpent>720</timeSpent>
-				<timeSpentPretty>12 min 0s</timeSpentPretty>
+				<timeSpentPretty>12 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -310,7 +310,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3481</visitDuration>
-		<visitDurationPretty>58 min 1s</visitDurationPretty>
+		<visitDurationPretty>58 min 1s</visitDurationPretty>
 		<customVariables>
 			<row>
 				<customVariableName1>Visit Scope Custom var</customVariableName1>
@@ -489,9 +489,9 @@
 				<pageIdAction>2</pageIdAction>
 				
 				<pageId>1</pageId>
-				<generationTime>0.33s</generationTime>
+				<generationTime>00:00:00.33</generationTime>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
 			</row>
 			<row>
@@ -518,9 +518,9 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -537,9 +537,9 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -556,9 +556,9 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -575,7 +575,7 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -594,7 +594,7 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -613,7 +613,7 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<eventValue>9</eventValue>
 				<timeSpent>1</timeSpent>
 				<timeSpentPretty>1s</timeSpentPretty>
@@ -633,10 +633,10 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<eventValue>10</eventValue>
 				<timeSpent>1499</timeSpent>
-				<timeSpentPretty>24 min 59s</timeSpentPretty>
+				<timeSpentPretty>24 min 59s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -646,9 +646,9 @@
 				<pageIdAction>12</pageIdAction>
 				
 				<pageId>9</pageId>
-				<generationTime>0.67s</generationTime>
+				<generationTime>00:00:00.66</generationTime>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
 			</row>
 			<row>
@@ -661,7 +661,7 @@
 				<eventAction>playTrailer</eventAction>
 				<eventName>Princess Mononoke (もののけ姫)</eventName>
 				<timeSpent>120</timeSpent>
-				<timeSpentPretty>2 min 0s</timeSpentPretty>
+				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -674,7 +674,7 @@
 				<eventAction>playTrailer</eventAction>
 				<eventName>Ponyo (崖の上のポニョ)</eventName>
 				<timeSpent>120</timeSpent>
-				<timeSpentPretty>2 min 0s</timeSpentPretty>
+				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -687,7 +687,7 @@
 				<eventAction>playTrailer</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -700,7 +700,7 @@
 				<eventAction>clickBuyNow</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>120</timeSpent>
-				<timeSpentPretty>2 min 0s</timeSpentPretty>
+				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -713,7 +713,7 @@
 				<eventAction>playStart</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>1320</timeSpent>
-				<timeSpentPretty>22 min 0s</timeSpentPretty>
+				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -749,7 +749,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3601</visitDuration>
-		<visitDurationPretty>1 hours 0 min</visitDurationPretty>
+		<visitDurationPretty>1 hours 0 min</visitDurationPretty>
 		<customVariables>
 			<row>
 				<customVariableName1>Visit Scope Custom var</customVariableName1>
@@ -1025,7 +1025,7 @@
 				<eventAction>play50%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>1320</timeSpent>
-				<timeSpentPretty>22 min 0s</timeSpentPretty>
+				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1038,7 +1038,7 @@
 				<eventAction>play75%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>420</timeSpent>
-				<timeSpentPretty>7 min 0s</timeSpentPretty>
+				<timeSpentPretty>7 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1051,7 +1051,7 @@
 				<eventAction>Search</eventAction>
 				<eventName>Search query here</eventName>
 				<timeSpent>900</timeSpent>
-				<timeSpentPretty>15 min 0s</timeSpentPretty>
+				<timeSpentPretty>15 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1064,7 +1064,7 @@
 				<eventAction>playEnd</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>120</timeSpent>
-				<timeSpentPretty>2 min 0s</timeSpentPretty>
+				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1078,7 +1078,7 @@
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<eventValue>9.66</eventValue>
 				<timeSpent>720</timeSpent>
-				<timeSpentPretty>12 min 0s</timeSpentPretty>
+				<timeSpentPretty>12 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1115,7 +1115,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3481</visitDuration>
-		<visitDurationPretty>58 min 1s</visitDurationPretty>
+		<visitDurationPretty>58 min 1s</visitDurationPretty>
 		<customVariables>
 			<row>
 				<customVariableName1>Visit Scope Custom var</customVariableName1>
@@ -1286,9 +1286,9 @@
 				<pageIdAction>2</pageIdAction>
 				
 				<pageId>25</pageId>
-				<generationTime>0.33s</generationTime>
+				<generationTime>00:00:00.33</generationTime>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
 			</row>
 			<row>
@@ -1315,9 +1315,9 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1334,9 +1334,9 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1353,9 +1353,9 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1372,7 +1372,7 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -1391,7 +1391,7 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -1410,7 +1410,7 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<eventValue>9</eventValue>
 				<timeSpent>1</timeSpent>
 				<timeSpentPretty>1s</timeSpentPretty>
@@ -1430,10 +1430,10 @@
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l&amp;#039;eau</eventName>
+				<eventName>La fiancée de l'eau</eventName>
 				<eventValue>10</eventValue>
 				<timeSpent>1499</timeSpent>
-				<timeSpentPretty>24 min 59s</timeSpentPretty>
+				<timeSpentPretty>24 min 59s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1443,9 +1443,9 @@
 				<pageIdAction>12</pageIdAction>
 				
 				<pageId>33</pageId>
-				<generationTime>0.67s</generationTime>
+				<generationTime>00:00:00.66</generationTime>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
 			</row>
 			<row>
@@ -1458,7 +1458,7 @@
 				<eventAction>playTrailer</eventAction>
 				<eventName>Princess Mononoke (もののけ姫)</eventName>
 				<timeSpent>120</timeSpent>
-				<timeSpentPretty>2 min 0s</timeSpentPretty>
+				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1471,7 +1471,7 @@
 				<eventAction>playTrailer</eventAction>
 				<eventName>Ponyo (崖の上のポニョ)</eventName>
 				<timeSpent>120</timeSpent>
-				<timeSpentPretty>2 min 0s</timeSpentPretty>
+				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1484,7 +1484,7 @@
 				<eventAction>playTrailer</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1497,7 +1497,7 @@
 				<eventAction>clickBuyNow</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>120</timeSpent>
-				<timeSpentPretty>2 min 0s</timeSpentPretty>
+				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1510,7 +1510,7 @@
 				<eventAction>playStart</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<timeSpent>1320</timeSpent>
-				<timeSpentPretty>22 min 0s</timeSpentPretty>
+				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
 			</row>
 			<row>
@@ -1546,7 +1546,7 @@
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3601</visitDuration>
-		<visitDurationPretty>1 hours 0 min</visitDurationPretty>
+		<visitDurationPretty>1 hours 0 min</visitDurationPretty>
 		<customVariables>
 			<row>
 				<customVariableName1>Visit Scope Custom var</customVariableName1>