diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2016-08-29 07:13:24 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2016-08-29 18:28:55 +0300 |
commit | 903b870466b62e8a655a0f6564d052583c0fb7ec (patch) | |
tree | 8a25f6c18322aeb0a062840152d259b5ac5265b3 /tests/PHPUnit/System | |
parent | 4c9d1274408fb57d5e0b53dcda425dc4892c7b00 (diff) |
fix tests
Diffstat (limited to 'tests/PHPUnit/System')
6 files changed, 458 insertions, 367 deletions
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 0832775d9d..0cb2dea6f6 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 @@ -58,7 +58,7 @@ <reportMetadata> <row> - <idsubdatatable>5149</idsubdatatable> + <idsubdatatable>5151</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 e25c8e2282..37fac32b40 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 @@ -67,7 +67,7 @@ <reportMetadata> <row> - <idsubdatatable>5153</idsubdatatable> + <idsubdatatable>5155</idsubdatatable> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 5bca6ae875..1129cf1caa 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -99,6 +99,37 @@ </row> <row> <category>Visitors</category> + <subcategory>Users</subcategory> + <name>Users</name> + <module>UserId</module> + <action>getUsers</action> + <dimension>UserId</dimension> + <metrics> + <label>Label</label> + <nb_visits>Visits</nb_visits> + <nb_actions>Actions</nb_actions> + <nb_visits_converted>Visits with Conversions</nb_visits_converted> + </metrics> + <metricsDocumentation> + <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> + <avg_time_on_site>The average duration of a visit.</avg_time_on_site> + <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate> + <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate> + </metricsDocumentation> + <processedMetrics> + <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> + <avg_time_on_site>Avg. Time on Website</avg_time_on_site> + <bounce_rate>Bounce Rate</bounce_rate> + <conversion_rate>Conversion Rate</conversion_rate> + </processedMetrics> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserId&apiAction=getUsers&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserId&apiAction=getUsers&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>UserId_getUsers</uniqueId> + </row> + <row> + <category>Visitors</category> <subcategory>Custom Variables</subcategory> <name>Custom Variables</name> <module>CustomVariables</module> @@ -2350,35 +2381,6 @@ <uniqueId>ExampleUI_getPlanetRatiosWithLogos</uniqueId> </row> <row> - <name>Users</name> - <module>UserId</module> - <action>getUsers</action> - <dimension>UserId</dimension> - <metrics> - <label>Label</label> - <nb_visits>Visits</nb_visits> - <nb_actions>Actions</nb_actions> - <nb_visits_converted>Visits with Conversions</nb_visits_converted> - </metrics> - <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> - <avg_time_on_site>The average duration of a visit.</avg_time_on_site> - <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate> - <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate> - </metricsDocumentation> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserId&apiAction=getUsers&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserId&apiAction=getUsers&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>UserId_getUsers</uniqueId> - </row> - <row> <category>API</category> <name>Main metrics</name> <module>API</module> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml index f3518e6424..188428ebdb 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml @@ -1087,6 +1087,35 @@ </widgets> </row> <row> + <uniqueId>General_Visitors.UserId_UserReportTitle</uniqueId> + <category> + <id>General_Visitors</id> + <name>Visitors</name> + <order>5</order> + <icon>icon-reporting-visitors</icon> + </category> + <subcategory> + <id>UserId_UserReportTitle</id> + <name>Users</name> + <order>6</order> + </subcategory> + <widgets> + <row> + <name>Users</name> + <module>UserId</module> + <action>getUsers</action> + <order>109</order> + <parameters> + <module>UserId</module> + <action>getUsers</action> + </parameters> + <uniqueId>widgetUserIdgetUsers</uniqueId> + <viewDataTable>table</viewDataTable> + <isReport>1</isReport> + </row> + </widgets> + </row> + <row> <uniqueId>Dashboard_Dashboard.1</uniqueId> <category> <id>Dashboard_Dashboard</id> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 14f8e614de..1443e8873d 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -118,6 +118,30 @@ <isReport>1</isReport> </row> <row> + <name>Users</name> + <category> + <id>General_Visitors</id> + <name>Visitors</name> + <order>5</order> + <icon>icon-reporting-visitors</icon> + </category> + <subcategory> + <id>UserId_UserReportTitle</id> + <name>Users</name> + <order>6</order> + </subcategory> + <module>UserId</module> + <action>getUsers</action> + <order>109</order> + <parameters> + <module>UserId</module> + <action>getUsers</action> + </parameters> + <uniqueId>widgetUserIdgetUsers</uniqueId> + <viewDataTable>table</viewDataTable> + <isReport>1</isReport> + </row> + <row> <name>Custom Variables</name> <category> <id>General_Visitors</id> @@ -238,30 +262,6 @@ <isReport>1</isReport> </row> <row> - <name>Browser version</name> - <category> - <id>General_Visitors</id> - <name>Visitors</name> - <order>5</order> - <icon>icon-reporting-visitors</icon> - </category> - <subcategory> - <id>DevicesDetection_Software</id> - <name>Software</name> - <order>20</order> - </subcategory> - <module>DevicesDetection</module> - <action>getBrowserVersions</action> - <order>106</order> - <parameters> - <module>DevicesDetection</module> - <action>getBrowserVersions</action> - </parameters> - <uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId> - <viewDataTable>table</viewDataTable> - <isReport>1</isReport> - </row> - <row> <name>Configurations</name> <category> <id>General_Visitors</id> @@ -286,55 +286,7 @@ <isReport>1</isReport> </row> <row> - <name>Browsers</name> - <category> - <id>General_Visitors</id> - <name>Visitors</name> - <order>5</order> - <icon>icon-reporting-visitors</icon> - </category> - <subcategory> - <id>DevicesDetection_Software</id> - <name>Software</name> - <order>20</order> - </subcategory> - <module>DevicesDetection</module> - <action>getBrowsers</action> - <order>105</order> - <parameters> - <module>DevicesDetection</module> - <action>getBrowsers</action> - </parameters> - <uniqueId>widgetDevicesDetectiongetBrowsers</uniqueId> - <viewDataTable>table</viewDataTable> - <isReport>1</isReport> - </row> - <row> - <name>Operating System versions</name> - <category> - <id>General_Visitors</id> - <name>Visitors</name> - <order>5</order> - <icon>icon-reporting-visitors</icon> - </category> - <subcategory> - <id>DevicesDetection_Software</id> - <name>Software</name> - <order>20</order> - </subcategory> - <module>DevicesDetection</module> - <action>getOsVersions</action> - <order>102</order> - <parameters> - <module>DevicesDetection</module> - <action>getOsVersions</action> - </parameters> - <uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId> - <viewDataTable>table</viewDataTable> - <isReport>1</isReport> - </row> - <row> - <name>Operating System families</name> + <name>Browser Plugins</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -346,14 +298,14 @@ <name>Software</name> <order>20</order> </subcategory> - <module>DevicesDetection</module> - <action>getOsFamilies</action> - <order>108</order> + <module>DevicePlugins</module> + <action>getPlugin</action> + <order>113</order> <parameters> - <module>DevicesDetection</module> - <action>getOsFamilies</action> + <module>DevicePlugins</module> + <action>getPlugin</action> </parameters> - <uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId> + <uniqueId>widgetDevicePluginsgetPlugin</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -457,7 +409,7 @@ <isReport>1</isReport> </row> <row> - <name>Browser Plugins</name> + <name>Browsers</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -469,14 +421,86 @@ <name>Software</name> <order>20</order> </subcategory> - <module>DevicePlugins</module> - <action>getPlugin</action> - <order>113</order> + <module>DevicesDetection</module> + <action>getBrowsers</action> + <order>105</order> <parameters> - <module>DevicePlugins</module> - <action>getPlugin</action> + <module>DevicesDetection</module> + <action>getBrowsers</action> </parameters> - <uniqueId>widgetDevicePluginsgetPlugin</uniqueId> + <uniqueId>widgetDevicesDetectiongetBrowsers</uniqueId> + <viewDataTable>table</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Operating System versions</name> + <category> + <id>General_Visitors</id> + <name>Visitors</name> + <order>5</order> + <icon>icon-reporting-visitors</icon> + </category> + <subcategory> + <id>DevicesDetection_Software</id> + <name>Software</name> + <order>20</order> + </subcategory> + <module>DevicesDetection</module> + <action>getOsVersions</action> + <order>102</order> + <parameters> + <module>DevicesDetection</module> + <action>getOsVersions</action> + </parameters> + <uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId> + <viewDataTable>table</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Browser version</name> + <category> + <id>General_Visitors</id> + <name>Visitors</name> + <order>5</order> + <icon>icon-reporting-visitors</icon> + </category> + <subcategory> + <id>DevicesDetection_Software</id> + <name>Software</name> + <order>20</order> + </subcategory> + <module>DevicesDetection</module> + <action>getBrowserVersions</action> + <order>106</order> + <parameters> + <module>DevicesDetection</module> + <action>getBrowserVersions</action> + </parameters> + <uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId> + <viewDataTable>table</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Operating System families</name> + <category> + <id>General_Visitors</id> + <name>Visitors</name> + <order>5</order> + <icon>icon-reporting-visitors</icon> + </category> + <subcategory> + <id>DevicesDetection_Software</id> + <name>Software</name> + <order>20</order> + </subcategory> + <module>DevicesDetection</module> + <action>getOsFamilies</action> + <order>108</order> + <parameters> + <module>DevicesDetection</module> + <action>getOsFamilies</action> + </parameters> + <uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -765,7 +789,7 @@ <uniqueId>widgetLivegetVisitorProfilePopup</uniqueId> </row> <row> - <name>Visits per number of pages</name> + <name>Visits by Visit Number</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -778,18 +802,18 @@ <order>30</order> </subcategory> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerPage</action> - <order>120</order> + <action>getNumberOfVisitsByVisitCount</action> + <order>125</order> <parameters> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerPage</action> + <action>getNumberOfVisitsByVisitCount</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId> - <viewDataTable>cloud</viewDataTable> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsByVisitCount</uniqueId> + <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Visits by Visit Number</name> + <name>Visits per number of pages</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -802,18 +826,18 @@ <order>30</order> </subcategory> <module>VisitorInterest</module> - <action>getNumberOfVisitsByVisitCount</action> - <order>125</order> + <action>getNumberOfVisitsPerPage</action> + <order>120</order> <parameters> <module>VisitorInterest</module> - <action>getNumberOfVisitsByVisitCount</action> + <action>getNumberOfVisitsPerPage</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsByVisitCount</uniqueId> - <viewDataTable>table</viewDataTable> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId> + <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Visits per local time</name> + <name>Visits per server time</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -826,18 +850,18 @@ <order>35</order> </subcategory> <module>VisitTime</module> - <action>getVisitInformationPerLocalTime</action> - <order>115</order> + <action>getVisitInformationPerServerTime</action> + <order>120</order> <parameters> <module>VisitTime</module> - <action>getVisitInformationPerLocalTime</action> + <action>getVisitInformationPerServerTime</action> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerLocalTime</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId> <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Visits per server time</name> + <name>Visits per local time</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -850,13 +874,13 @@ <order>35</order> </subcategory> <module>VisitTime</module> - <action>getVisitInformationPerServerTime</action> - <order>120</order> + <action>getVisitInformationPerLocalTime</action> + <order>115</order> <parameters> <module>VisitTime</module> - <action>getVisitInformationPerServerTime</action> + <action>getVisitInformationPerLocalTime</action> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerLocalTime</uniqueId> <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> @@ -931,7 +955,7 @@ <isReport>1</isReport> </row> <row> - <name>Entry pages</name> + <name>Entry Page Titles</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -944,18 +968,18 @@ <order>10</order> </subcategory> <module>Actions</module> - <action>getEntryPageUrls</action> - <order>103</order> + <action>getEntryPageTitles</action> + <order>106</order> <parameters> <module>Actions</module> - <action>getEntryPageUrls</action> + <action>getEntryPageTitles</action> </parameters> - <uniqueId>widgetActionsgetEntryPageUrls</uniqueId> + <uniqueId>widgetActionsgetEntryPageTitles</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Entry Page Titles</name> + <name>Entry pages</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -968,18 +992,18 @@ <order>10</order> </subcategory> <module>Actions</module> - <action>getEntryPageTitles</action> - <order>106</order> + <action>getEntryPageUrls</action> + <order>103</order> <parameters> <module>Actions</module> - <action>getEntryPageTitles</action> + <action>getEntryPageUrls</action> </parameters> - <uniqueId>widgetActionsgetEntryPageTitles</uniqueId> + <uniqueId>widgetActionsgetEntryPageUrls</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Exit page titles</name> + <name>Exit pages</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -992,18 +1016,18 @@ <order>15</order> </subcategory> <module>Actions</module> - <action>getExitPageTitles</action> - <order>107</order> + <action>getExitPageUrls</action> + <order>104</order> <parameters> <module>Actions</module> - <action>getExitPageTitles</action> + <action>getExitPageUrls</action> </parameters> - <uniqueId>widgetActionsgetExitPageTitles</uniqueId> + <uniqueId>widgetActionsgetExitPageUrls</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Exit pages</name> + <name>Exit page titles</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1016,13 +1040,13 @@ <order>15</order> </subcategory> <module>Actions</module> - <action>getExitPageUrls</action> - <order>104</order> + <action>getExitPageTitles</action> + <order>107</order> <parameters> <module>Actions</module> - <action>getExitPageUrls</action> + <action>getExitPageTitles</action> </parameters> - <uniqueId>widgetActionsgetExitPageUrls</uniqueId> + <uniqueId>widgetActionsgetExitPageTitles</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1051,7 +1075,7 @@ <isReport>1</isReport> </row> <row> - <name>Pages Following a Site Search</name> + <name>Search Keywords with No Results</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1064,18 +1088,18 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getPageUrlsFollowingSiteSearch</action> - <order>116</order> + <action>getSiteSearchNoResultKeywords</action> + <order>118</order> <parameters> <module>Actions</module> - <action>getPageUrlsFollowingSiteSearch</action> + <action>getSiteSearchNoResultKeywords</action> </parameters> - <uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId> + <uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Site Search Keywords</name> + <name>Pages Following a Site Search</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1088,18 +1112,18 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getSiteSearchKeywords</action> - <order>115</order> + <action>getPageUrlsFollowingSiteSearch</action> + <order>116</order> <parameters> <module>Actions</module> - <action>getSiteSearchKeywords</action> + <action>getPageUrlsFollowingSiteSearch</action> </parameters> - <uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId> + <uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Page Titles Following a Site Search</name> + <name>Site Search Keywords</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1112,18 +1136,18 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getPageTitlesFollowingSiteSearch</action> - <order>119</order> + <action>getSiteSearchKeywords</action> + <order>115</order> <parameters> <module>Actions</module> - <action>getPageTitlesFollowingSiteSearch</action> + <action>getSiteSearchKeywords</action> </parameters> - <uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId> + <uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Search Keywords with No Results</name> + <name>Page Titles Following a Site Search</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1136,13 +1160,13 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getSiteSearchNoResultKeywords</action> - <order>118</order> + <action>getPageTitlesFollowingSiteSearch</action> + <order>119</order> <parameters> <module>Actions</module> - <action>getSiteSearchNoResultKeywords</action> + <action>getPageTitlesFollowingSiteSearch</action> </parameters> - <uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId> + <uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1219,7 +1243,7 @@ <isReport>1</isReport> </row> <row> - <name>Event Names</name> + <name>Event Actions</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1232,19 +1256,19 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getName</action> - <order>102</order> + <action>getAction</action> + <order>101</order> <parameters> <module>Events</module> - <action>getName</action> - <secondaryDimension>eventAction</secondaryDimension> + <action>getAction</action> + <secondaryDimension>eventName</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId> + <uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Event Categories</name> + <name>Event Names</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1257,19 +1281,19 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getCategory</action> - <order>100</order> + <action>getName</action> + <order>102</order> <parameters> <module>Events</module> - <action>getCategory</action> + <action>getName</action> <secondaryDimension>eventAction</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId> + <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Event Actions</name> + <name>Event Categories</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1282,14 +1306,14 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getAction</action> - <order>101</order> + <action>getCategory</action> + <order>100</order> <parameters> <module>Events</module> - <action>getAction</action> - <secondaryDimension>eventName</secondaryDimension> + <action>getCategory</action> + <secondaryDimension>eventAction</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId> + <uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1319,7 +1343,7 @@ <isReport>1</isReport> </row> <row> - <name>Event Names</name> + <name>Event Categories</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1332,19 +1356,19 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getName</action> - <order>102</order> + <action>getCategory</action> + <order>100</order> <parameters> <module>Events</module> - <action>getName</action> + <action>getCategory</action> <secondaryDimension>eventAction</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId> + <uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Event Categories</name> + <name>Event Names</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1357,14 +1381,14 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getCategory</action> - <order>100</order> + <action>getName</action> + <order>102</order> <parameters> <module>Events</module> - <action>getCategory</action> + <action>getName</action> <secondaryDimension>eventAction</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId> + <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1393,7 +1417,7 @@ <isReport>1</isReport> </row> <row> - <name>Content Name</name> + <name>Content Piece</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1406,18 +1430,18 @@ <order>45</order> </subcategory> <module>Contents</module> - <action>getContentNames</action> - <order>135</order> + <action>getContentPieces</action> + <order>136</order> <parameters> <module>Contents</module> - <action>getContentNames</action> + <action>getContentPieces</action> </parameters> - <uniqueId>widgetContentsgetContentNames</uniqueId> + <uniqueId>widgetContentsgetContentPieces</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Content Piece</name> + <name>Content Name</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1430,13 +1454,13 @@ <order>45</order> </subcategory> <module>Contents</module> - <action>getContentPieces</action> - <order>136</order> + <action>getContentNames</action> + <order>135</order> <parameters> <module>Contents</module> - <action>getContentPieces</action> + <action>getContentNames</action> </parameters> - <uniqueId>widgetContentsgetContentPieces</uniqueId> + <uniqueId>widgetContentsgetContentNames</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1465,7 +1489,7 @@ <isReport>1</isReport> </row> <row> - <name>Referrer Types</name> + <name>Referrers</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1478,18 +1502,18 @@ <order>5</order> </subcategory> <module>Referrers</module> - <action>getReferrerType</action> - <order>101</order> + <action>getAll</action> + <order>102</order> <parameters> <module>Referrers</module> - <action>getReferrerType</action> + <action>getAll</action> </parameters> - <uniqueId>widgetReferrersgetReferrerType</uniqueId> + <uniqueId>widgetReferrersgetAll</uniqueId> <viewDataTable>tableAllColumns</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Referrers</name> + <name>Referrer Types</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1502,18 +1526,18 @@ <order>5</order> </subcategory> <module>Referrers</module> - <action>getAll</action> - <order>102</order> + <action>getReferrerType</action> + <order>101</order> <parameters> <module>Referrers</module> - <action>getAll</action> + <action>getReferrerType</action> </parameters> - <uniqueId>widgetReferrersgetAll</uniqueId> + <uniqueId>widgetReferrersgetReferrerType</uniqueId> <viewDataTable>tableAllColumns</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Keywords</name> + <name>Search Engines</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1526,18 +1550,18 @@ <order>10</order> </subcategory> <module>Referrers</module> - <action>getKeywords</action> - <order>103</order> + <action>getSearchEngines</action> + <order>107</order> <parameters> <module>Referrers</module> - <action>getKeywords</action> + <action>getSearchEngines</action> </parameters> - <uniqueId>widgetReferrersgetKeywords</uniqueId> + <uniqueId>widgetReferrersgetSearchEngines</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Search Engines</name> + <name>Keywords</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1550,13 +1574,13 @@ <order>10</order> </subcategory> <module>Referrers</module> - <action>getSearchEngines</action> - <order>107</order> + <action>getKeywords</action> + <order>103</order> <parameters> <module>Referrers</module> - <action>getSearchEngines</action> + <action>getKeywords</action> </parameters> - <uniqueId>widgetReferrersgetSearchEngines</uniqueId> + <uniqueId>widgetReferrersgetKeywords</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1814,7 +1838,7 @@ <isReport>1</isReport> </row> <row> - <name>Product Name</name> + <name>Product SKU</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -1827,18 +1851,18 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsName</action> - <order>131</order> + <action>getItemsSku</action> + <order>130</order> <parameters> <module>Goals</module> - <action>getItemsName</action> + <action>getItemsSku</action> </parameters> - <uniqueId>widgetGoalsgetItemsName</uniqueId> + <uniqueId>widgetGoalsgetItemsSku</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Product Category</name> + <name>Product Name</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -1851,18 +1875,18 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsCategory</action> - <order>132</order> + <action>getItemsName</action> + <order>131</order> <parameters> <module>Goals</module> - <action>getItemsCategory</action> + <action>getItemsName</action> </parameters> - <uniqueId>widgetGoalsgetItemsCategory</uniqueId> + <uniqueId>widgetGoalsgetItemsName</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Product SKU</name> + <name>Product Name</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -1875,18 +1899,18 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsSku</action> - <order>130</order> + <action>getItemsName</action> + <order>131</order> <parameters> <module>Goals</module> - <action>getItemsSku</action> + <action>getItemsName</action> </parameters> - <uniqueId>widgetGoalsgetItemsSku</uniqueId> + <uniqueId>widgetGoalsgetItemsName</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Product Name</name> + <name>Product Category</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -1899,13 +1923,13 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsName</action> - <order>131</order> + <action>getItemsCategory</action> + <order>132</order> <parameters> <module>Goals</module> - <action>getItemsName</action> + <action>getItemsCategory</action> </parameters> - <uniqueId>widgetGoalsgetItemsName</uniqueId> + <uniqueId>widgetGoalsgetItemsCategory</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -2436,6 +2460,30 @@ <isReport>1</isReport> </row> <row> + <name>Advanced tag cloud: with logos and links</name> + <category> + <id>ExampleUI_UiFramework</id> + <name>UI Framework</name> + <order>90</order> + <icon /> + </category> + <subcategory> + <id>Tag clouds</id> + <name>Tag clouds</name> + <order>99</order> + </subcategory> + <module>ExampleUI</module> + <action>getPlanetRatiosWithLogos</action> + <order>213</order> + <parameters> + <module>ExampleUI</module> + <action>getPlanetRatiosWithLogos</action> + </parameters> + <uniqueId>widgetExampleUIgetPlanetRatiosWithLogos</uniqueId> + <viewDataTable>cloud</viewDataTable> + <isReport>1</isReport> + </row> + <row> <name>Data tables</name> <category> <id>ExampleUI_UiFramework</id> @@ -2544,7 +2592,7 @@ <isReport>1</isReport> </row> <row> - <name>Advanced tag cloud: with logos and links</name> + <name>Pie graph</name> <category> <id>ExampleUI_UiFramework</id> <name>UI Framework</name> @@ -2552,19 +2600,19 @@ <icon /> </category> <subcategory> - <id>Tag clouds</id> - <name>Tag clouds</name> + <id>Pie graph</id> + <name>Pie graph</name> <order>99</order> </subcategory> <module>ExampleUI</module> - <action>getPlanetRatiosWithLogos</action> - <order>213</order> + <action>getPlanetRatios</action> + <order>212</order> <parameters> <module>ExampleUI</module> - <action>getPlanetRatiosWithLogos</action> + <action>getPlanetRatios</action> </parameters> - <uniqueId>widgetExampleUIgetPlanetRatiosWithLogos</uniqueId> - <viewDataTable>cloud</viewDataTable> + <uniqueId>widgetExampleUIgetPlanetRatios</uniqueId> + <viewDataTable>graphPie</viewDataTable> <isReport>1</isReport> </row> <row> @@ -2594,67 +2642,61 @@ <isReport>1</isReport> </row> <row> - <name>Pie graph</name> + <name>Piwik Changelog</name> <category> - <id>ExampleUI_UiFramework</id> - <name>UI Framework</name> - <order>90</order> + <id>About Piwik</id> + <name>About Piwik</name> + <order>99</order> <icon /> </category> - <subcategory> - <id>Pie graph</id> - <name>Pie graph</name> - <order>99</order> - </subcategory> - <module>ExampleUI</module> - <action>getPlanetRatios</action> - <order>212</order> + <subcategory /> + <module>ExampleRssWidget</module> + <action>rssChangelog</action> + <order>99</order> <parameters> - <module>ExampleUI</module> - <action>getPlanetRatios</action> + <module>ExampleRssWidget</module> + <action>rssChangelog</action> </parameters> - <uniqueId>widgetExampleUIgetPlanetRatios</uniqueId> - <viewDataTable>graphPie</viewDataTable> - <isReport>1</isReport> + <uniqueId>widgetExampleRssWidgetrssChangelog</uniqueId> </row> <row> - <name>Movers and Shakers</name> + <name>System Summary</name> <category> - <id>Insights_WidgetCategory</id> - <name>Insights</name> + <id>About Piwik</id> + <name>About Piwik</name> <order>99</order> <icon /> </category> <subcategory /> - <module>Insights</module> - <action>getOverallMoversAndShakers</action> - <order>99</order> + <module>CoreHome</module> + <action>getSystemSummary</action> + <order>15</order> <parameters> - <module>Insights</module> - <action>getOverallMoversAndShakers</action> + <module>CoreHome</module> + <action>getSystemSummary</action> </parameters> - <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId> + <uniqueId>widgetCoreHomegetSystemSummary</uniqueId> </row> <row> - <name>Support Piwik!</name> + <name>Top Keywords for Page URL</name> <category> - <id>About Piwik</id> - <name>About Piwik</name> + <id>SEO</id> + <name>SEO</name> <order>99</order> <icon /> </category> <subcategory /> - <module>CoreHome</module> - <action>getDonateForm</action> - <order>5</order> + <module>Referrers</module> + <action>getKeywordsForPage</action> + <order>99</order> <parameters> - <module>CoreHome</module> - <action>getDonateForm</action> + <module>Referrers</module> + <action>getKeywordsForPage</action> </parameters> - <uniqueId>widgetCoreHomegetDonateForm</uniqueId> + <uniqueId>widgetReferrersgetKeywordsForPage</uniqueId> </row> <row> - <name>System Check</name> + <name>Piwik.org Blog</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2662,53 +2704,53 @@ <icon /> </category> <subcategory /> - <module>Installation</module> - <action>getSystemCheck</action> - <order>16</order> + <module>ExampleRssWidget</module> + <action>rssPiwik</action> + <order>99</order> <parameters> - <module>Installation</module> - <action>getSystemCheck</action> + <module>ExampleRssWidget</module> + <action>rssPiwik</action> </parameters> - <uniqueId>widgetInstallationgetSystemCheck</uniqueId> + <uniqueId>widgetExampleRssWidgetrssPiwik</uniqueId> </row> <row> - <name>Top Keywords for Page URL</name> + <name>Latest Piwik Plugin Updates</name> <category> - <id>SEO</id> - <name>SEO</name> + <id>About Piwik</id> + <name>About Piwik</name> <order>99</order> <icon /> </category> <subcategory /> - <module>Referrers</module> - <action>getKeywordsForPage</action> - <order>99</order> + <module>CorePluginsAdmin</module> + <action>getNewPlugins</action> + <order>19</order> <parameters> - <module>Referrers</module> - <action>getKeywordsForPage</action> + <module>CorePluginsAdmin</module> + <action>getNewPlugins</action> </parameters> - <uniqueId>widgetReferrersgetKeywordsForPage</uniqueId> + <uniqueId>widgetCorePluginsAdmingetNewPlugins</uniqueId> </row> <row> - <name>System Summary</name> + <name>SEO Rankings</name> <category> - <id>About Piwik</id> - <name>About Piwik</name> + <id>SEO</id> + <name>SEO</name> <order>99</order> <icon /> </category> <subcategory /> - <module>CoreHome</module> - <action>getSystemSummary</action> - <order>15</order> + <module>SEO</module> + <action>getRank</action> + <order>99</order> <parameters> - <module>CoreHome</module> - <action>getSystemSummary</action> + <module>SEO</module> + <action>getRank</action> </parameters> - <uniqueId>widgetCoreHomegetSystemSummary</uniqueId> + <uniqueId>widgetSEOgetRank</uniqueId> </row> <row> - <name>Piwik.org Blog</name> + <name>Professional Services for Piwik</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2716,14 +2758,14 @@ <icon /> </category> <subcategory /> - <module>ExampleRssWidget</module> - <action>rssPiwik</action> + <module>ProfessionalServices</module> + <action>promoServices</action> <order>99</order> <parameters> - <module>ExampleRssWidget</module> - <action>rssPiwik</action> + <module>ProfessionalServices</module> + <action>promoServices</action> </parameters> - <uniqueId>widgetExampleRssWidgetrssPiwik</uniqueId> + <uniqueId>widgetProfessionalServicespromoServices</uniqueId> </row> <row> <name>Welcome!</name> @@ -2744,7 +2786,25 @@ <uniqueId>widgetCoreHomegetPromoVideo</uniqueId> </row> <row> - <name>Latest Piwik Plugin Updates</name> + <name>Movers and Shakers</name> + <category> + <id>Insights_WidgetCategory</id> + <name>Insights</name> + <order>99</order> + <icon /> + </category> + <subcategory /> + <module>Insights</module> + <action>getOverallMoversAndShakers</action> + <order>99</order> + <parameters> + <module>Insights</module> + <action>getOverallMoversAndShakers</action> + </parameters> + <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId> + </row> + <row> + <name>System Check</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2752,35 +2812,35 @@ <icon /> </category> <subcategory /> - <module>CorePluginsAdmin</module> - <action>getNewPlugins</action> - <order>19</order> + <module>Installation</module> + <action>getSystemCheck</action> + <order>16</order> <parameters> - <module>CorePluginsAdmin</module> - <action>getNewPlugins</action> + <module>Installation</module> + <action>getSystemCheck</action> </parameters> - <uniqueId>widgetCorePluginsAdmingetNewPlugins</uniqueId> + <uniqueId>widgetInstallationgetSystemCheck</uniqueId> </row> <row> - <name>Insights Overview</name> + <name>Example Widget Name</name> <category> - <id>Insights_WidgetCategory</id> - <name>Insights</name> + <id>About Piwik</id> + <name>About Piwik</name> <order>99</order> <icon /> </category> <subcategory /> - <module>Insights</module> - <action>getInsightsOverview</action> + <module>ExamplePlugin</module> + <action>myExampleWidget</action> <order>99</order> <parameters> - <module>Insights</module> - <action>getInsightsOverview</action> + <module>ExamplePlugin</module> + <action>myExampleWidget</action> </parameters> - <uniqueId>widgetInsightsgetInsightsOverview</uniqueId> + <uniqueId>widgetExamplePluginmyExampleWidget</uniqueId> </row> <row> - <name>Piwik Changelog</name> + <name>Support Piwik!</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2788,31 +2848,31 @@ <icon /> </category> <subcategory /> - <module>ExampleRssWidget</module> - <action>rssChangelog</action> - <order>99</order> + <module>CoreHome</module> + <action>getDonateForm</action> + <order>5</order> <parameters> - <module>ExampleRssWidget</module> - <action>rssChangelog</action> + <module>CoreHome</module> + <action>getDonateForm</action> </parameters> - <uniqueId>widgetExampleRssWidgetrssChangelog</uniqueId> + <uniqueId>widgetCoreHomegetDonateForm</uniqueId> </row> <row> - <name>SEO Rankings</name> + <name>Insights Overview</name> <category> - <id>SEO</id> - <name>SEO</name> + <id>Insights_WidgetCategory</id> + <name>Insights</name> <order>99</order> <icon /> </category> <subcategory /> - <module>SEO</module> - <action>getRank</action> + <module>Insights</module> + <action>getInsightsOverview</action> <order>99</order> <parameters> - <module>SEO</module> - <action>getRank</action> + <module>Insights</module> + <action>getInsightsOverview</action> </parameters> - <uniqueId>widgetSEOgetRank</uniqueId> + <uniqueId>widgetInsightsgetInsightsOverview</uniqueId> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserId.getUsers_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserId.getUsers_week.xml index 5cfb246edc..867400a47a 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserId.getUsers_week.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserId.getUsers_week.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <results> - <result date="From 2008-12-29 to 2009-01-04" /> - <result date="From 2009-01-05 to 2009-01-11" /> - <result date="From 2009-01-12 to 2009-01-18" /> - <result date="From 2009-01-19 to 2009-01-25" /> - <result date="From 2009-01-26 to 2009-02-01" /> - <result date="From 2009-02-02 to 2009-02-08" /> - <result date="From 2009-02-09 to 2009-02-15" /> + <result date="2008-12-29,2009-01-04" /> + <result date="2009-01-05,2009-01-11" /> + <result date="2009-01-12,2009-01-18" /> + <result date="2009-01-19,2009-01-25" /> + <result date="2009-01-26,2009-02-01" /> + <result date="2009-02-02,2009-02-08" /> + <result date="2009-02-09,2009-02-15" /> </results>
\ No newline at end of file |