From 3fb1fbd55432081b562eb55a86d59f559d059b55 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Sun, 16 Jun 2013 15:50:10 +1200
Subject: [PATCH] fixing build
---
...hCustomVariables_SegmentMatchVisitorTypeTest.php | 3 ++-
...isabled_disabledAfter__VisitsSummary.get_day.xml | 13 +------------
...sabled_disabledAfter__VisitsSummary.get_week.xml | 13 +------------
3 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php
index 859be0cd8b..fd08f464cd 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 c48354bc4f..d7dfbaef5a 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 c48354bc4f..d7dfbaef5a 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
--
GitLab