Fixes #3924 (see previous commit 778b543b9bcccaa95ca344f1fdc587033868b691

1 files changed, 51 insertions, 63 deletions

diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index 0fbb20f515..70a177156b 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -2,39 +2,39 @@
 <result>
 	<row>
 		<label>Not-Bot</label>
-		<nb_visits>4</nb_visits>
-		<nb_actions>6</nb_actions>
+		<nb_visits>7</nb_visits>
+		<nb_actions>10</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>123</sum_visit_length>
-		<bounce_count>3</bounce_count>
+		<sum_visit_length>305</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>2</nb_conversions>
-				<nb_visits_converted>2</nb_visits_converted>
-				<revenue>10</revenue>
+				<nb_conversions>5</nb_conversions>
+				<nb_visits_converted>5</nb_visits_converted>
+				<revenue>25</revenue>
 			</row>
 		</goals>
-		<nb_conversions>2</nb_conversions>
-		<revenue>10</revenue>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<nb_conversions>5</nb_conversions>
+		<revenue>25</revenue>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<subtable>
 			<row>
 				<label>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</label>
-				<nb_visits>3</nb_visits>
-				<nb_actions>5</nb_actions>
+				<nb_visits>4</nb_visits>
+				<nb_actions>7</nb_actions>
 				<max_actions>3</max_actions>
-				<sum_visit_length>123</sum_visit_length>
+				<sum_visit_length>305</sum_visit_length>
 				<bounce_count>2</bounce_count>
 				<goals>
 					<row idgoal='1'>
-						<nb_conversions>2</nb_conversions>
-						<nb_visits_converted>2</nb_visits_converted>
-						<revenue>10</revenue>
+						<nb_conversions>3</nb_conversions>
+						<nb_visits_converted>3</nb_visits_converted>
+						<revenue>15</revenue>
 					</row>
 				</goals>
-				<nb_conversions>2</nb_conversions>
-				<revenue>10</revenue>
-				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+				<nb_conversions>3</nb_conversions>
+				<revenue>15</revenue>
+				<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 			</row>
 			<row>
 				<label>Apache-HttpClient/4.2.1 (java 1.5)</label>
@@ -46,38 +46,8 @@
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			</row>
-		</subtable>
-	</row>
-	<row>
-		<label>HTTP-code</label>
-		<nb_visits>3</nb_visits>
-		<nb_actions>4</nb_actions>
-		<max_actions>2</max_actions>
-		<sum_visit_length>182</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>3</nb_conversions>
-				<nb_visits_converted>3</nb_visits_converted>
-				<revenue>15</revenue>
-			</row>
-		</goals>
-		<nb_conversions>3</nb_conversions>
-		<revenue>15</revenue>
-		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<subtable>
-			<row>
-				<label>307</label>
-				<nb_visits>1</nb_visits>
-				<nb_actions>2</nb_actions>
-				<max_actions>2</max_actions>
-				<sum_visit_length>182</sum_visit_length>
-				<bounce_count>0</bounce_count>
-				<nb_visits_converted>1</nb_visits_converted>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			</row>
 			<row>
-				<label>404</label>
+				<label>Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
 				<max_actions>1</max_actions>
@@ -95,7 +65,7 @@
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			</row>
 			<row>
-				<label>500</label>
+				<label>Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
 				<max_actions>1</max_actions>
@@ -112,18 +82,6 @@
 				<revenue>5</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			</row>
-			<row>
-				<label>301</label>
-				<goals>
-					<row idgoal='1'>
-						<nb_conversions>1</nb_conversions>
-						<nb_visits_converted>1</nb_visits_converted>
-						<revenue>5</revenue>
-					</row>
-				</goals>
-				<nb_conversions>1</nb_conversions>
-				<revenue>5</revenue>
-			</row>
 		</subtable>
 	</row>
 	<row>
@@ -202,4 +160,34 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>HTTP-code</label>
+		<nb_actions>4</nb_actions>
+		<subtable>
+			<row>
+				<label>301</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>307</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>404</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>500</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+		</subtable>
+	</row>
 </result>
\ No newline at end of file