From b7db4406773f888a2c391c4fbe74cbf79e9cf8cc Mon Sep 17 00:00:00 2001 From: Thomas Steur <thomas.steur@gmail.com> Date: Tue, 31 Mar 2015 03:36:33 +0000 Subject: [PATCH] fix some system tests as subtableIds are no longer hidden --- ...tion_lastN__API.getProcessedReport_day.xml | 22 +++++++++---------- ...gory_lastN__API.getProcessedReport_day.xml | 6 ++--- ...Name_lastN__API.getProcessedReport_day.xml | 14 ++++++------ ...ssedMetric__API.getProcessedReport_day.xml | 4 ++-- ...deColumns___API.getProcessedReport_day.xml | 2 +- ...owColumns___API.getProcessedReport_day.xml | 2 +- ...Site_lastN__API.getProcessedReport_day.xml | 8 +++---- ...te_lastN__API.getProcessedReport_month.xml | 4 ++-- ...Site_lastN__API.getProcessedReport_day.xml | 20 ++++++++--------- ...Site_lastN__API.getProcessedReport_day.xml | 8 +++---- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml index cad39c5a0f..3de294c1ec 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml @@ -162,47 +162,47 @@ <result prettyDate="Sunday 3 January 2010"> <row> <segment>eventAction==playTrailer</segment> - + <idsubdatatable>8</idsubdatatable> </row> <row> <segment>eventAction==Search</segment> - + <idsubdatatable>1</idsubdatatable> </row> <row> <segment>eventAction==play25%25</segment> - + <idsubdatatable>3</idsubdatatable> </row> <row> <segment>eventAction==play50%25</segment> - + <idsubdatatable>4</idsubdatatable> </row> <row> <segment>eventAction==play75%25</segment> - + <idsubdatatable>5</idsubdatatable> </row> <row> <segment>eventAction==playEnd</segment> - + <idsubdatatable>6</idsubdatatable> </row> <row> <segment>eventAction==rating</segment> - + <idsubdatatable>7</idsubdatatable> </row> <row> <segment>eventAction==clickBuyNow</segment> - + <idsubdatatable>9</idsubdatatable> </row> <row> <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> - + <idsubdatatable>11</idsubdatatable> </row> <row> <segment>eventAction==play</segment> - + <idsubdatatable>2</idsubdatatable> </row> <row> <segment>eventAction==playStart</segment> - + <idsubdatatable>10</idsubdatatable> </row> <row> <segment>eventAction==Purchase</segment> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml index 6116b82403..fd7ac3e63b 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml @@ -81,15 +81,15 @@ <result prettyDate="Sunday 3 January 2010"> <row> <segment>eventCategory==Movie</segment> - + <idsubdatatable>1</idsubdatatable> </row> <row> <segment>eventCategory==Music</segment> - + <idsubdatatable>2</idsubdatatable> </row> <row> <segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> - + <idsubdatatable>3</idsubdatatable> </row> </result> <result prettyDate="Monday 4 January 2010" /> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml index 3827317e63..dc19702220 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml @@ -117,30 +117,30 @@ <result prettyDate="Sunday 3 January 2010"> <row> <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> - + <idsubdatatable>3</idsubdatatable> </row> <row> <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> - + <idsubdatatable>2</idsubdatatable> </row> <row> - + <idsubdatatable>1</idsubdatatable> </row> <row> <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> - + <idsubdatatable>7</idsubdatatable> </row> <row> <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> - + <idsubdatatable>5</idsubdatatable> </row> <row> <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> - + <idsubdatatable>4</idsubdatatable> </row> <row> <segment>eventName==Search+query+here</segment> - + <idsubdatatable>6</idsubdatatable> </row> </result> <result prettyDate="Monday 4 January 2010" /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml index 5c5dea9f59..5d7b09708e 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml @@ -59,10 +59,10 @@ </reportData> <reportMetadata> <row> - + <idsubdatatable>1</idsubdatatable> </row> <row> - + <idsubdatatable>2</idsubdatatable> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml index ecedfa0db4..bea353ef57 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml @@ -44,7 +44,7 @@ </reportData> <reportMetadata> <row> - + <idsubdatatable>1</idsubdatatable> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml index 0997fc815f..96f4eb5e2f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml @@ -53,7 +53,7 @@ </reportData> <reportMetadata> <row> - + <idsubdatatable>1</idsubdatatable> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml index ea51e28ebb..48dfee4e72 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml @@ -107,18 +107,18 @@ <reportMetadata> <result prettyDate="Sunday 3 January 2010"> <row> - + <idsubdatatable>2</idsubdatatable> </row> <row> - + <idsubdatatable>1</idsubdatatable> </row> </result> <result prettyDate="Monday 4 January 2010"> <row> - + <idsubdatatable>2</idsubdatatable> </row> <row> - + <idsubdatatable>1</idsubdatatable> </row> </result> <result prettyDate="Tuesday 5 January 2010" /> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml index 5b5894b0f2..b1d887f466 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml @@ -76,10 +76,10 @@ <reportMetadata> <result prettyDate="2010, January"> <row> - + <idsubdatatable>2</idsubdatatable> </row> <row> - + <idsubdatatable>1</idsubdatatable> </row> </result> <result prettyDate="2010, February" /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml index 955e21d0dd..4c41dc3e7d 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml @@ -170,42 +170,42 @@ <result prettyDate="Monday 4 January 2010" /> <result prettyDate="Tuesday 5 January 2010"> <row> - + <idsubdatatable>2</idsubdatatable> </row> <row> - + <idsubdatatable>1</idsubdatatable> </row> </result> <result prettyDate="Wednesday 6 January 2010"> <row> - + <idsubdatatable>2</idsubdatatable> </row> <row> - + <idsubdatatable>1</idsubdatatable> </row> </result> <result prettyDate="Thursday 7 January 2010"> <row> - + <idsubdatatable>2</idsubdatatable> </row> <row> - + <idsubdatatable>1</idsubdatatable> </row> </result> <result prettyDate="Friday 8 January 2010"> <row> - + <idsubdatatable>2</idsubdatatable> </row> <row> - + <idsubdatatable>1</idsubdatatable> </row> </result> <result prettyDate="Saturday 9 January 2010"> <row> - + <idsubdatatable>2</idsubdatatable> </row> <row> - + <idsubdatatable>1</idsubdatatable> </row> </result> </reportMetadata> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml index 215d5fe694..49c645a098 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml @@ -110,13 +110,13 @@ <result prettyDate="Sunday 3 January 2010"> <row> <segment>referrerName==referrer.com</segment> - + <idsubdatatable>1</idsubdatatable> </row> </result> <result prettyDate="Monday 4 January 2010"> <row> <segment>referrerName==referrer.com</segment> - + <idsubdatatable>1</idsubdatatable> </row> </result> <result prettyDate="Tuesday 5 January 2010" /> @@ -125,13 +125,13 @@ <result prettyDate="Friday 8 January 2010"> <row> <segment>referrerName==referrer.com</segment> - + <idsubdatatable>1</idsubdatatable> </row> </result> <result prettyDate="Saturday 9 January 2010"> <row> <segment>referrerName==referrer.com</segment> - + <idsubdatatable>1</idsubdatatable> </row> </result> </reportMetadata> -- GitLab