fix min and max event value is summed

1 files changed, 62 insertions, 62 deletions

diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
index ceeee487c1..42a8402b66 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
@@ -2,74 +2,74 @@
 <result>
 	<row>
 		<label>Spirited Away (千と千尋の神隠し)</label>
-		<nb_visits>16</nb_visits>
-		<nb_events>16</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>24</nb_visits>
+		<nb_events>24</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>0</min_event_value>
-		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+		<max_event_value>19.32</max_event_value>
+		<sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>16</nb_visits>
-				<nb_events>16</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>24</nb_visits>
+				<nb_events>24</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>0</min_event_value>
-				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+				<max_event_value>19.32</max_event_value>
+				<sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>La fiancée de l'eau</label>
-		<nb_visits>12</nb_visits>
-		<nb_events>14</nb_events>
-		<nb_events_with_value>4</nb_events_with_value>
-		<sum_event_value>38</sum_event_value>
+		<nb_visits>18</nb_visits>
+		<nb_events>21</nb_events>
+		<nb_events_with_value>6</nb_events_with_value>
+		<sum_event_value>57</sum_event_value>
 		<min_event_value>0</min_event_value>
-		<max_event_value>10</max_event_value>
-		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+		<max_event_value>20</max_event_value>
+		<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
 		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>Music</label>
-				<nb_visits>12</nb_visits>
-				<nb_events>14</nb_events>
-				<nb_events_with_value>4</nb_events_with_value>
-				<sum_event_value>38</sum_event_value>
+				<nb_visits>18</nb_visits>
+				<nb_events>21</nb_events>
+				<nb_events_with_value>6</nb_events_with_value>
+				<sum_event_value>57</sum_event_value>
 				<min_event_value>0</min_event_value>
-				<max_event_value>10</max_event_value>
-				<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+				<max_event_value>20</max_event_value>
+				<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.5</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Event Name not defined</label>
-		<nb_visits>7</nb_visits>
-		<nb_events>7</nb_events>
+		<nb_visits>10</nb_visits>
+		<nb_events>10</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>6</nb_visits>
-				<nb_events>6</nb_events>
+				<nb_visits>9</nb_visits>
+				<nb_events>9</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
@@ -87,100 +87,100 @@
 	</row>
 	<row>
 		<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
-		<min_event_value>9.66</min_event_value>
-		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
+		<min_event_value>19.32</min_event_value>
+		<max_event_value>19.32</max_event_value>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
-				<min_event_value>9.66</min_event_value>
-				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
+				<min_event_value>19.32</min_event_value>
+				<max_event_value>19.32</max_event_value>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Ponyo (崖の上のポニョ)</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Princess Mononoke (もののけ姫)</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Search query here</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Search+query+here</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>