Refs #4503 better tests

matomo-org · Feb 12, 2014 · 362db0a · 362db0a
1 parent 52b6a2c
commit 362db0a
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 6 deletions.
diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
@@ -55,7 +55,7 @@ public function getApiForTesting()
         );
 
         // Normal standard goal
-        $apiWithSegments_visitConvertedGoal = $apiWithSegments + array('Goals.get', 'VisitsSummary.get');
+        $apiWithSegments_visitConvertedGoal = array_merge($apiWithSegments , array('Goals.get', 'VisitsSummary.get'));
         return array_merge(array(
 
                 // Segment: This will match the first visit of the fixture only
@@ -187,15 +187,25 @@ public function getApiForTesting()
                       array(
                           'idSite' => $idSite,
                           'date' => $dateTime,
-                          'periods' => array('day'),
+                          'periods' => array('week'),
                           'segment' => 'visitConvertedGoalId==1;visitConvertedGoalId!=2',
                           'testSuffix' => '_SegmentVisitHasConvertedGoal')),
 
+                // Different segment will yield same result, so we keep same testSuffix
                 array($apiWithSegments_visitConvertedGoal,
                       array(
                           'idSite' => $idSite,
                           'date' => $dateTime,
-                          'periods' => array('day'),
+                          'periods' => array('week'),
+                          'segment' => 'visitConvertedGoalId==1;visitConvertedGoalId!=2;countryCode!=xx;deviceType!=tv',
+                          'testSuffix' => '_SegmentVisitHasConvertedGoal')),
+
+                // testing a segment on log_conversion matching no visit
+                array($apiWithSegments_visitConvertedGoal,
+                      array(
+                          'idSite' => $idSite,
+                          'date' => $dateTime,
+                          'periods' => array('week'),
                           'segment' => 'visitConvertedGoalId==666',
                           'testSuffix' => '_SegmentNoVisit_HaveConvertedNonExistingGoal')),
 

diff --git a/...derWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsCategory_week.xml b/...derWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsCategory_week.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result />
diff --git a/...ceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsName_week.xml b/...ceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsName_week.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result />
diff --git a/...rceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsSku_week.xml b/...rceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsSku_week.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result />
diff --git a/...t_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.get_week.xml b/...t_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.get_week.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<nb_conversions>0</nb_conversions>
+	<nb_visits_converted>0</nb_visits_converted>
+	<conversion_rate>0</conversion_rate>
+	<revenue>0</revenue>
+</result>
diff --git a/...rceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml b/...rceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<nb_uniq_visitors>0</nb_uniq_visitors>
+	<nb_visits>0</nb_visits>
+	<nb_actions>0</nb_actions>
+	<nb_visits_converted>0</nb_visits_converted>
+	<bounce_count>0</bounce_count>
+	<sum_visit_length>0</sum_visit_length>
+	<max_actions>0</max_actions>
+	<bounce_rate>0%</bounce_rate>
+	<nb_actions_per_visit>0</nb_actions_per_visit>
+	<avg_time_on_site>0</avg_time_on_site>
+</result>
diff --git a/...ertedGoal__Goals.getItemsCategory_day.xml → ...rtedGoal__Goals.getItemsCategory_week.xml b/...ertedGoal__Goals.getItemsCategory_day.xml → ...rtedGoal__Goals.getItemsCategory_week.xml
@@ -2,9 +2,9 @@
 <result>
 	<row>
 		<label>Electronics &amp; Cameras</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<avg_price>1111.11</avg_price>
 		<avg_quantity>0</avg_quantity>
 		<conversion_rate>0%</conversion_rate>

diff --git a/...ConvertedGoal__Goals.getItemsName_day.xml → ...onvertedGoal__Goals.getItemsName_week.xml b/...ConvertedGoal__Goals.getItemsName_day.xml → ...onvertedGoal__Goals.getItemsName_week.xml
@@ -2,9 +2,9 @@
 <result>
 	<row>
 		<label>PRODUCT name</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<avg_price>1111.11</avg_price>
 		<avg_quantity>0</avg_quantity>
 		<conversion_rate>0%</conversion_rate>

diff --git a/...sConvertedGoal__Goals.getItemsSku_day.xml → ...ConvertedGoal__Goals.getItemsSku_week.xml b/...sConvertedGoal__Goals.getItemsSku_day.xml → ...ConvertedGoal__Goals.getItemsSku_week.xml
@@ -2,9 +2,9 @@
 <result>
 	<row>
 		<label>SKU2</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<avg_price>1111.11</avg_price>
 		<avg_quantity>0</avg_quantity>
 		<conversion_rate>0%</conversion_rate>

diff --git a/...on/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.get_week.xml b/...on/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.get_week.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<nb_conversions>1</nb_conversions>
+	<nb_visits_converted>1</nb_visits_converted>
+	<conversion_rate>100</conversion_rate>
+	<revenue>10</revenue>
+</result>
diff --git a/...ted/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml b/...ted/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<nb_uniq_visitors>1</nb_uniq_visitors>
+	<nb_visits>1</nb_visits>
+	<nb_actions>4</nb_actions>
+	<nb_visits_converted>1</nb_visits_converted>
+	<bounce_count>0</bounce_count>
+	<sum_visit_length>721</sum_visit_length>
+	<max_actions>4</max_actions>
+	<bounce_rate>0%</bounce_rate>
+	<nb_actions_per_visit>4</nb_actions_per_visit>
+	<avg_time_on_site>721</avg_time_on_site>
+</result>