diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php index 859be0cd8baaeae82cb39c9eec75409b52e13dee..fd08f464cd357c796d6d9e459cc79d528f1740e0 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php @@ -77,7 +77,7 @@ class Test_Piwik_Integration_TwoVisitsWithCustomVariables_SegmentMatchVisitorTyp // 2) CHECK 'week' archive stored in December (week starts the month before) // We expect 2 segments * (1 custom variable name + 2 ref metrics + 6 subtable for the values of the name + 5 referers blob) - 'archive_blob_2009_12' => 28, + 'archive_blob_2009_12' => 30, // 6 metrics, // 2 Referer metrics (Referers_distinctSearchEngines/Referers_distinctKeywords), // 3 done flag (referers, CustomVar, VisitsSummary), @@ -87,6 +87,7 @@ class Test_Piwik_Integration_TwoVisitsWithCustomVariables_SegmentMatchVisitorTyp foreach ($tests as $table => $expectedRows) { $sql = "SELECT count(*) FROM " . Piwik_Common::prefixTable($table); $countBlobs = Zend_Registry::get('db')->fetchOne($sql); + if($expectedRows != $countBlobs) { var_export(Zend_Registry::get('db')->fetchAll("SELECT * FROM " . Piwik_Common::prefixTable($table) . " ORDER BY name, idarchive ASC")); } diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml index c48354bc4f5137699794629ae09d719ce54db054..d7dfbaef5a120118a7c2ee23a16a8a0ea288e7a2 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml @@ -12,16 +12,5 @@ <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> </result> - <result idSite="2"> - <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> + <result idSite="2" /> </results> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml index c48354bc4f5137699794629ae09d719ce54db054..d7dfbaef5a120118a7c2ee23a16a8a0ea288e7a2 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml @@ -12,16 +12,5 @@ <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> </result> - <result idSite="2"> - <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> + <result idSite="2" /> </results> \ No newline at end of file