diff options
| author | benakamoorthi <benaka.moorthi@gmail.com> | 2012-11-14 06:23:34 +0400 |
|---|---|---|
| committer | benakamoorthi <benaka.moorthi@gmail.com> | 2012-11-14 06:23:34 +0400 |
| commit | f36e523327fddef0481693b4e353613785aa5e9d (patch) | |
| tree | 52d46418e7b80814360cb424397eb5f18703a252 /tests | |
| parent | 0223d19e9a3a6f1530963dc83d1279b4e2d62798 (diff) | |
Revert [7190] and [7464] while making sure tests that were not run before [7190] are still run.
git-svn-id: http://dev.piwik.org/svn/trunk@7465 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'tests')
25 files changed, 161 insertions, 202 deletions
diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php index 96df2301cc..4c8b59a216 100755 --- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php +++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php @@ -70,7 +70,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ 'VisitorInterest.getNumberOfVisitsByDaysSinceLast'); } - public function getApiForTesting( $testScheduledReports = true ) + public function getApiForTesting() { $apiToCall = $this->getApiToCall(); $singlePeriodApi = array('VisitsSummary.get', 'Goals.get'); @@ -114,13 +114,8 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ 'testSuffix' => '_' . $api . '_firstSite_lastN') ); } - - if ($testScheduledReports) - { - $result = array_merge($result, self::getApiForTestingScheduledReports(self::$dateTime, 'month')); - } - return $result; + return array_merge($result, self::getApiForTestingScheduledReports(self::$dateTime, 'month')); } public function getOutputPrefix() diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php index 96d2e11398..c70a5fa2d9 100755 --- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php +++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php @@ -8,12 +8,12 @@ */ require_once 'Goals/Goals.php'; -require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php'; + /** * Same as TwoVisitors_twoWebsites_differentDays but with goals that convert * on every url. */ -class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions extends Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays +class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions extends IntegrationTestCase { protected static $idSite1 = 1; protected static $idSite2 = 2; @@ -44,14 +44,58 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e $this->runApiTests($api, $params); } - protected function getApiToCall() + public function getApiToCall() { return array('Goals.getDaysToConversion', 'MultiSites.getAll'); } public function getApiForTesting() { - $result = parent::getApiForTesting($testScheduledReports = false); + // NOTE: copied from TwoVisitors_TwoWebsites_DifferentDays (including the test or inheriting means + // the test will get run by phpunit, even when we only want to run this one. should be put into + // non-test class later.) + $apiToCall = $this->getApiToCall(); + $singlePeriodApi = array('VisitsSummary.get', 'Goals.get'); + + $periods = array('day', 'week', 'month', 'year'); + + $result = array( + // Request data for the last 6 periods and idSite=all + array($apiToCall, array('idSite' => 'all', + 'date' => self::$dateTime, + 'periods' => $periods, + 'setDateLastN' => true)), + + // Request data for the last 6 periods and idSite=1 + array($apiToCall, array('idSite' => self::$idSite1, + 'date' => self::$dateTime, + 'periods' => $periods, + 'setDateLastN' => true, + 'testSuffix' => '_idSiteOne_')), + + // We also test a single period to check that this use case (Reports per idSite in the response) works + array($singlePeriodApi, array('idSite' => 'all', + 'date' => self::$dateTime, + 'periods' => array('day', 'month'), + 'setDateLastN' => false, + 'testSuffix' => '_NotLastNPeriods')), + ); + + // testing metadata API for multiple periods + $apiToCall = array_diff($apiToCall, array('Actions.getPageTitle', 'Actions.getPageUrl')); + foreach ($apiToCall as $api) { + list($apiModule, $apiAction) = explode(".", $api); + + $result[] = array( + 'API.getProcessedReport', array('idSite' => self::$idSite1, + 'date' => self::$dateTime, + 'periods' => array('day'), + 'setDateLastN' => true, + 'apiModule' => $apiModule, + 'apiAction' => $apiAction, + 'testSuffix' => '_' . $api . '_firstSite_lastN') + ); + } // Tests that getting a visits summary metric (nb_visits) & a Goal's metric (Goal_revenue) // at the same time works. diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml index 5134e25aeb..060d2c301a 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml @@ -36,7 +36,7 @@ <result prettyDate="Sunday 3 January 2010"> <row> <label>0 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> <revenue>$ 0</revenue> </row> <row> @@ -46,7 +46,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> <revenue>$ 0</revenue> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml index 2b634c95e8..c86dd437b0 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml @@ -65,10 +65,10 @@ <result prettyDate="Sunday 3 January 2010"> <row> <label>Site 1</label> - <nb_pageviews>4</nb_pageviews> + <nb_pageviews>2</nb_pageviews> <revenue>$ 10</revenue> - <nb_actions>7</nb_actions> - <nb_visits>2</nb_visits> + <nb_actions>1</nb_actions> + <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -84,14 +84,14 @@ <result prettyDate="Monday 4 January 2010"> <row> <label>Site 1</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>1</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> - <visits_evolution>-50%</visits_evolution> - <actions_evolution>-42.86%</actions_evolution> + <visits_evolution>0%</visits_evolution> + <actions_evolution>100%</actions_evolution> <pageviews_evolution>-50%</pageviews_evolution> + <revenue_evolution>-100%</revenue_evolution> <revenue>$ 0</revenue> - <revenue_evolution>0</revenue_evolution> <nb_conversions>0</nb_conversions> <nb_conversions_evolution>0</nb_conversions_evolution> <orders>0</orders> @@ -101,8 +101,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>4</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>2</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> @@ -120,12 +120,12 @@ <result prettyDate="Tuesday 5 January 2010"> <row> <label>Site 1</label> - <nb_pageviews>10</nb_pageviews> + <nb_pageviews>5</nb_pageviews> <revenue>$ 5</revenue> <nb_actions>5</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>0%</visits_evolution> - <actions_evolution>25%</actions_evolution> + <actions_evolution>150%</actions_evolution> <pageviews_evolution>400%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> <nb_conversions>0</nb_conversions> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml index 94810d3b56..6dc2190ded 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml @@ -3,10 +3,8 @@ <result idSite="1"> <nb_conversions>2</nb_conversions> <nb_visits_converted>1</nb_visits_converted> - <conversion_rate>50</conversion_rate> + <conversion_rate>100</conversion_rate> <revenue>10</revenue> </result> <result idSite="2" /> - <result idSite="3" /> - <result idSite="4" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml index 981b5cc805..5fee61a930 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml @@ -3,7 +3,7 @@ <result idSite="1"> <nb_conversions>3</nb_conversions> <nb_visits_converted>3</nb_visits_converted> - <conversion_rate>75</conversion_rate> + <conversion_rate>100</conversion_rate> <revenue>15</revenue> </result> <result idSite="2"> @@ -11,6 +11,4 @@ <nb_visits_converted>1</nb_visits_converted> <conversion_rate>100</conversion_rate> </result> - <result idSite="3" /> - <result idSite="4" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml index fae6c41d32..122c2f4460 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml @@ -2,17 +2,15 @@ <results> <result idSite="1"> <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>7</nb_actions> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count>1</bounce_count> <sum_visit_length /> - <max_actions>6</max_actions> - <bounce_rate>50%</bounce_rate> - <nb_actions_per_visit>3.5</nb_actions_per_visit> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> </result> <result idSite="2" /> - <result idSite="3" /> - <result idSite="4" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml index 276cdb143f..a541c425e7 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml @@ -1,29 +1,27 @@ <?xml version="1.0" encoding="utf-8" ?> <results> <result idSite="1"> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_actions>16</nb_actions> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>3</nb_visits> + <nb_actions>8</nb_actions> <nb_visits_converted>3</nb_visits_converted> <bounce_count>1</bounce_count> <sum_visit_length>1263</sum_visit_length> - <max_actions>6</max_actions> - <bounce_rate>25%</bounce_rate> - <nb_actions_per_visit>4</nb_actions_per_visit> - <avg_time_on_site>316</avg_time_on_site> + <max_actions>5</max_actions> + <bounce_rate>33%</bounce_rate> + <nb_actions_per_visit>2.7</nb_actions_per_visit> + <avg_time_on_site>421</avg_time_on_site> </result> <result idSite="2"> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> + <nb_actions>2</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count /> <sum_visit_length>1</sum_visit_length> - <max_actions>4</max_actions> + <max_actions>2</max_actions> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>4</nb_actions_per_visit> + <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> </result> - <result idSite="3" /> - <result idSite="4" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml index 7e0e17e65b..d807d81aed 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml @@ -4,7 +4,7 @@ <result date="2010-01-03"> <row> <label>0 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>1 day</label> @@ -12,7 +12,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>3 days</label> @@ -189,22 +189,4 @@ <result date="2010-01-08" /> <result date="2010-01-09" /> </result> - <result idSite="3"> - <result date="2010-01-03" /> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> - <result idSite="4"> - <result date="2010-01-03" /> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml index 209501c13b..ae27b56974 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml @@ -4,7 +4,7 @@ <result date="2010-01"> <row> <label>0 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>1 day</label> @@ -12,7 +12,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>3 days</label> @@ -132,22 +132,4 @@ <result date="2010-06" /> <result date="2010-07" /> </result> - <result idSite="3"> - <result date="2010-01" /> - <result date="2010-02" /> - <result date="2010-03" /> - <result date="2010-04" /> - <result date="2010-05" /> - <result date="2010-06" /> - <result date="2010-07" /> - </result> - <result idSite="4"> - <result date="2010-01" /> - <result date="2010-02" /> - <result date="2010-03" /> - <result date="2010-04" /> - <result date="2010-05" /> - <result date="2010-06" /> - <result date="2010-07" /> - </result> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml index 7455e5f6b1..d6ebb9ca25 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml @@ -4,7 +4,7 @@ <result date="From 2009-12-28 to 2010-01-03"> <row> <label>0 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>1 day</label> @@ -12,7 +12,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>3 days</label> @@ -189,22 +189,4 @@ <result date="From 2010-02-01 to 2010-02-07" /> <result date="From 2010-02-08 to 2010-02-14" /> </result> - <result idSite="3"> - <result date="From 2009-12-28 to 2010-01-03" /> - <result date="From 2010-01-04 to 2010-01-10" /> - <result date="From 2010-01-11 to 2010-01-17" /> - <result date="From 2010-01-18 to 2010-01-24" /> - <result date="From 2010-01-25 to 2010-01-31" /> - <result date="From 2010-02-01 to 2010-02-07" /> - <result date="From 2010-02-08 to 2010-02-14" /> - </result> - <result idSite="4"> - <result date="From 2009-12-28 to 2010-01-03" /> - <result date="From 2010-01-04 to 2010-01-10" /> - <result date="From 2010-01-11 to 2010-01-17" /> - <result date="From 2010-01-18 to 2010-01-24" /> - <result date="From 2010-01-25 to 2010-01-31" /> - <result date="From 2010-02-01 to 2010-02-07" /> - <result date="From 2010-02-08 to 2010-02-14" /> - </result> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml index 45fd97da06..715faf7ba4 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml @@ -4,7 +4,7 @@ <result date="2010"> <row> <label>0 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>1 day</label> @@ -12,7 +12,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>3 days</label> @@ -132,22 +132,4 @@ <result date="2015" /> <result date="2016" /> </result> - <result idSite="3"> - <result date="2010" /> - <result date="2011" /> - <result date="2012" /> - <result date="2013" /> - <result date="2014" /> - <result date="2015" /> - <result date="2016" /> - </result> - <result idSite="4"> - <result date="2010" /> - <result date="2011" /> - <result date="2012" /> - <result date="2013" /> - <result date="2014" /> - <result date="2015" /> - <result date="2016" /> - </result> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml index 532336cd88..8a95688245 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml @@ -3,10 +3,10 @@ <result date="2010-01-03"> <row> <label>Site 1</label> - <nb_pageviews>4</nb_pageviews> + <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> - <nb_actions>7</nb_actions> - <nb_visits>2</nb_visits> + <nb_actions>1</nb_actions> + <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -17,18 +17,19 @@ <result date="2010-01-04"> <row> <label>Site 1</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>1</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> - <visits_evolution>-50%</visits_evolution> - <actions_evolution>-42.86%</actions_evolution> + <visits_evolution>0%</visits_evolution> + <actions_evolution>100%</actions_evolution> <pageviews_evolution>-50%</pageviews_evolution> + <revenue_evolution>-100%</revenue_evolution> <idsite>1</idsite> </row> <row> <label>Site 2</label> - <nb_pageviews>4</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>2</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> @@ -39,12 +40,12 @@ <result date="2010-01-05"> <row> <label>Site 1</label> - <nb_pageviews>10</nb_pageviews> + <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <nb_actions>5</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>0%</visits_evolution> - <actions_evolution>25%</actions_evolution> + <actions_evolution>150%</actions_evolution> <pageviews_evolution>400%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> <idsite>1</idsite> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml index d338445eb6..61a8a0128b 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml @@ -3,10 +3,10 @@ <result date="2010-01"> <row> <label>Site 1</label> - <nb_pageviews>16</nb_pageviews> + <nb_pageviews>8</nb_pageviews> <revenue>15</revenue> - <nb_actions>16</nb_actions> - <nb_visits>4</nb_visits> + <nb_actions>8</nb_actions> + <nb_visits>3</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -15,8 +15,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>4</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>2</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml index b6e7b8d9e4..ff2bcd47ee 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml @@ -3,10 +3,10 @@ <result date="From 2009-12-28 to 2010-01-03"> <row> <label>Site 1</label> - <nb_pageviews>4</nb_pageviews> + <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> - <nb_actions>7</nb_actions> - <nb_visits>2</nb_visits> + <nb_actions>1</nb_actions> + <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -17,20 +17,20 @@ <result date="From 2010-01-04 to 2010-01-10"> <row> <label>Site 1</label> - <nb_pageviews>12</nb_pageviews> + <nb_pageviews>6</nb_pageviews> <revenue>5</revenue> - <nb_actions>9</nb_actions> + <nb_actions>7</nb_actions> <nb_visits>2</nb_visits> - <visits_evolution>0%</visits_evolution> - <actions_evolution>28.57%</actions_evolution> + <visits_evolution>100%</visits_evolution> + <actions_evolution>600%</actions_evolution> <pageviews_evolution>200%</pageviews_evolution> <revenue_evolution>-50%</revenue_evolution> <idsite>1</idsite> </row> <row> <label>Site 2</label> - <nb_pageviews>4</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>2</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml index d1f344bd2d..688fe16d5b 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml @@ -3,10 +3,10 @@ <result date="2010"> <row> <label>Site 1</label> - <nb_pageviews>16</nb_pageviews> + <nb_pageviews>8</nb_pageviews> <revenue>15</revenue> - <nb_actions>16</nb_actions> - <nb_visits>4</nb_visits> + <nb_actions>8</nb_actions> + <nb_visits>3</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -15,8 +15,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>4</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>2</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_getMetricsFromDifferentReports__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_getMetricsFromDifferentReports__VisitsSummary.get_range.xml index f78cf18408..f3834129a6 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_getMetricsFromDifferentReports__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_getMetricsFromDifferentReports__VisitsSummary.get_range.xml @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <results> <result idSite="1"> - <nb_visits>4</nb_visits> - <Goal_conversion_rate>75</Goal_conversion_rate> + <nb_visits>3</nb_visits> + <Goal_conversion_rate>100</Goal_conversion_rate> </result> <result idSite="2"> <nb_visits>1</nb_visits> <Goal_conversion_rate>100</Goal_conversion_rate> </result> - <result idSite="3" /> - <result idSite="4" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml index b0b6f768a3..79b5bdab1b 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml @@ -3,7 +3,7 @@ <result date="2010-01-03"> <row> <label>0 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>1 day</label> @@ -11,7 +11,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>3 days</label> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml index fbf6083fa1..7cab72dbf6 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml @@ -3,7 +3,7 @@ <result date="2010-01"> <row> <label>0 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>1 day</label> @@ -11,7 +11,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>3 days</label> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml index 15b8e00fda..08c5ce524f 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml @@ -3,7 +3,7 @@ <result date="From 2009-12-28 to 2010-01-03"> <row> <label>0 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>1 day</label> @@ -11,7 +11,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>3 days</label> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml index 059d0f9056..e47c96a000 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml @@ -3,7 +3,7 @@ <result date="2010"> <row> <label>0 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>1 day</label> @@ -11,7 +11,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>3 days</label> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml index 532336cd88..8a95688245 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml @@ -3,10 +3,10 @@ <result date="2010-01-03"> <row> <label>Site 1</label> - <nb_pageviews>4</nb_pageviews> + <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> - <nb_actions>7</nb_actions> - <nb_visits>2</nb_visits> + <nb_actions>1</nb_actions> + <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -17,18 +17,19 @@ <result date="2010-01-04"> <row> <label>Site 1</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>1</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> - <visits_evolution>-50%</visits_evolution> - <actions_evolution>-42.86%</actions_evolution> + <visits_evolution>0%</visits_evolution> + <actions_evolution>100%</actions_evolution> <pageviews_evolution>-50%</pageviews_evolution> + <revenue_evolution>-100%</revenue_evolution> <idsite>1</idsite> </row> <row> <label>Site 2</label> - <nb_pageviews>4</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>2</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> @@ -39,12 +40,12 @@ <result date="2010-01-05"> <row> <label>Site 1</label> - <nb_pageviews>10</nb_pageviews> + <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <nb_actions>5</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>0%</visits_evolution> - <actions_evolution>25%</actions_evolution> + <actions_evolution>150%</actions_evolution> <pageviews_evolution>400%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> <idsite>1</idsite> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml index d338445eb6..61a8a0128b 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml @@ -3,10 +3,10 @@ <result date="2010-01"> <row> <label>Site 1</label> - <nb_pageviews>16</nb_pageviews> + <nb_pageviews>8</nb_pageviews> <revenue>15</revenue> - <nb_actions>16</nb_actions> - <nb_visits>4</nb_visits> + <nb_actions>8</nb_actions> + <nb_visits>3</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -15,8 +15,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>4</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>2</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml index b6e7b8d9e4..ff2bcd47ee 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml @@ -3,10 +3,10 @@ <result date="From 2009-12-28 to 2010-01-03"> <row> <label>Site 1</label> - <nb_pageviews>4</nb_pageviews> + <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> - <nb_actions>7</nb_actions> - <nb_visits>2</nb_visits> + <nb_actions>1</nb_actions> + <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -17,20 +17,20 @@ <result date="From 2010-01-04 to 2010-01-10"> <row> <label>Site 1</label> - <nb_pageviews>12</nb_pageviews> + <nb_pageviews>6</nb_pageviews> <revenue>5</revenue> - <nb_actions>9</nb_actions> + <nb_actions>7</nb_actions> <nb_visits>2</nb_visits> - <visits_evolution>0%</visits_evolution> - <actions_evolution>28.57%</actions_evolution> + <visits_evolution>100%</visits_evolution> + <actions_evolution>600%</actions_evolution> <pageviews_evolution>200%</pageviews_evolution> <revenue_evolution>-50%</revenue_evolution> <idsite>1</idsite> </row> <row> <label>Site 2</label> - <nb_pageviews>4</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>2</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml index d1f344bd2d..688fe16d5b 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml @@ -3,10 +3,10 @@ <result date="2010"> <row> <label>Site 1</label> - <nb_pageviews>16</nb_pageviews> + <nb_pageviews>8</nb_pageviews> <revenue>15</revenue> - <nb_actions>16</nb_actions> - <nb_visits>4</nb_visits> + <nb_actions>8</nb_actions> + <nb_visits>3</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -15,8 +15,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>4</nb_pageviews> - <nb_actions>4</nb_actions> + <nb_pageviews>2</nb_pageviews> + <nb_actions>2</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> |