From 4afafdb7dcd425da246e7140d9ed521c86db3701 Mon Sep 17 00:00:00 2001 From: mattpiwik <matthieu.aubry@gmail.com> Date: Mon, 12 Jul 2010 20:33:46 +0000 Subject: [PATCH] Refs #1456 Fixing failing integration tests now that Sort filter is called by default with 'desc'. Note: to fix integration tests, compare tests/integration/processed and tests/integration/expected/ with a file compare tool (like WinMerge on windows). If it looks good, copy processed/* files over the expected/* and tests will pass. git-svn-id: http://dev.piwik.org/svn/trunk@2484 59fd770c-687e-43c8-a1e3-f5a4ff64c105 --- ...t_OneVisitorTwoVisits__Referers.getKeywords_day.xml | 2 +- ...VisitorTwoVisits__Referers.getSearchEngines_day.xml | 2 +- ...t_OneVisitorTwoVisits__Referers.getWebsites_day.xml | 2 +- ...ebsites_differentDays__Referers.getWebsites_day.xml | 6 +++--- ...woWebsites_differentDays__VisitsSummary.get_day.xml | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getKeywords_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getKeywords_day.xml index e98b361424..63c72f2efb 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getKeywords_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getKeywords_day.xml @@ -17,7 +17,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> - <idsubdatatable>77</idsubdatatable> + <idsubdatatable>63</idsubdatatable> <subtable> <row> <label>Yahoo!</label> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getSearchEngines_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getSearchEngines_day.xml index dd7ba88aa3..9c2e6a3667 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getSearchEngines_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getSearchEngines_day.xml @@ -17,7 +17,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> - <idsubdatatable>75</idsubdatatable> + <idsubdatatable>61</idsubdatatable> <url>http://search.yahoo.com</url> <logo>plugins/Referers/images/searchEngines/search.yahoo.com.png</logo> <subtable> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml index 67a9795058..0698a5617f 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>1440</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> - <idsubdatatable>80</idsubdatatable> + <idsubdatatable>66</idsubdatatable> <subtable> <row> <label>http://referer.com/page.htm?param=valuewith some spaces</label> diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml index ae0e66f612..c87e034a2f 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml @@ -11,7 +11,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <idsubdatatable>81</idsubdatatable> + <idsubdatatable>67</idsubdatatable> <subtable> <row> <label>http://referer.com/page.htm?param=valuewith some spaces</label> @@ -37,7 +37,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <idsubdatatable>22</idsubdatatable> + <idsubdatatable>8</idsubdatatable> <subtable> <row> <label>http://referer.com/Other_Page.htm</label> @@ -69,7 +69,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <idsubdatatable>22</idsubdatatable> + <idsubdatatable>8</idsubdatatable> <subtable> <row> <label>http://only-homepage-referer.com/</label> diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml index 4121ae3658..da2b4d2bc8 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml @@ -2,18 +2,18 @@ <results> <result idSite="1"> <result date="2010-01-03"> + <bounce_count>2</bounce_count> + <max_actions>1</max_actions> + <nb_actions>2</nb_actions> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <bounce_count>2</bounce_count> </result> <result date="2010-01-04" /> <result date="2010-01-05"> + <max_actions>2</max_actions> + <nb_actions>2</nb_actions> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> </result> <result date="2010-01-06" /> <result date="2010-01-07" /> -- GitLab