diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-04-03 03:54:39 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-04-03 03:54:39 +0400 |
| commit | 1cfa989fd1bb9324a8a329652fe7f069fe91396a (patch) | |
| tree | 4e963ea256a348a743d55aa1c0509240d5cc8183 /tests | |
| parent | 0793d2a3d520301af29aca5c8d9b38fd5883122c (diff) | |
Beautify the time in Metadata reports + tests
Small update to log analytics readme
Fixes #1700
Awesome work Timo!
Diffstat (limited to 'tests')
13 files changed, 49 insertions, 41 deletions
diff --git a/tests/PHPUnit/Core/PiwikTest.php b/tests/PHPUnit/Core/PiwikTest.php index 66e2514a7b..a4db97b17a 100644 --- a/tests/PHPUnit/Core/PiwikTest.php +++ b/tests/PHPUnit/Core/PiwikTest.php @@ -189,6 +189,10 @@ class PiwikTest extends DatabaseTestCase return array( array('revenue', 12, '$ 12'), array('revenue_evolution', '100 %', '100 %'), + array('avg_time_generation', '3.333', '3.33s'), + array('avg_time_generation', '333.333', '5 min 33.33s'), + array('avg_time_on_page', '3', '00:00:03'), + array('avg_time_on_page', '333', '00:05:33'), ); } @@ -199,6 +203,8 @@ class PiwikTest extends DatabaseTestCase */ public function testGetPrettyValue($columnName, $value, $expected) { + Piwik_Translate::getInstance()->loadEnglishTranslation(); + $access = new Piwik_Access(); Zend_Registry::set('access', $access); $access->setSuperUser(true); @@ -209,6 +215,8 @@ class PiwikTest extends DatabaseTestCase $expected, Piwik::getPrettyValue($idsite, $columnName, $value, false, false) ); + + Piwik_Translate::getInstance()->unloadEnglishTranslation(); } /** diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml index 18705c4fe7..bfe29f1d31 100755 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml @@ -26,8 +26,8 @@ </metricsDocumentation> <documentation>This report contains information about the page URLs that have been visited. <br /> The table is organized hierarchically, the URLs are displayed as a folder structure.<br />Use the plus and minus icons on the left to navigate.</documentation> <actionToLoadSubTables>getPageUrls</actionToLoadSubTables> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageUrls&period=week&date=2010-03-06&idSubtable=</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageUrls&period=week&date=2009-08-10,2010-03-07&idSubtable=</imageGraphEvolutionUrl> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageUrls&period=week&date=2010-03-06&idSubtable=1766</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageUrls&period=week&date=2009-08-10,2010-03-07&idSubtable=1766</imageGraphEvolutionUrl> <uniqueId>Actions_getPageUrls</uniqueId> </metadata> <columns> @@ -47,7 +47,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>00:00:00.13</avg_time_generation> + <avg_time_generation>0.13s</avg_time_generation> </row> </reportData> <reportMetadata> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml index 4f3650e715..5615f1f837 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml @@ -48,7 +48,7 @@ <avg_time_on_page>00:00:36</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> <row> <label> Pageview, not search</label> @@ -57,7 +57,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> <row> <label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label> @@ -66,7 +66,7 @@ <avg_time_on_page>00:04:12</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> </result> <result prettyDate="Monday 4 January 2010" /> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml index a9acd91046..e085a65084 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml @@ -48,7 +48,7 @@ <avg_time_on_page>00:00:36</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> <row> <label> Pageview, not search</label> @@ -57,7 +57,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> <row> <label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label> @@ -66,7 +66,7 @@ <avg_time_on_page>00:04:12</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> </result> <result prettyDate="2010, February" /> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml index d428ca4f5f..4d60e7116f 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml @@ -48,7 +48,7 @@ <avg_time_on_page>00:00:36</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> <row> <label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label> @@ -57,7 +57,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label> @@ -66,7 +66,7 @@ <avg_time_on_page>00:04:12</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> </result> <result prettyDate="Monday 4 January 2010" /> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml index 83593b37c0..80e35d17fe 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml @@ -48,7 +48,7 @@ <avg_time_on_page>00:00:36</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> <row> <label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label> @@ -57,7 +57,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label> @@ -66,7 +66,7 @@ <avg_time_on_page>00:04:12</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> </result> <result prettyDate="2010, February" /> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml index dd08895057..9b8feaf636 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml @@ -49,7 +49,7 @@ <nb_pageviews>4</nb_pageviews> <nb_searches>5</nb_searches> <nb_uniq_pageviews>3</nb_uniq_pageviews> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> <nb_downloads>0</nb_downloads> <nb_uniq_downloads>0</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> @@ -58,7 +58,7 @@ <result prettyDate="Monday 4 January 2010"> <nb_keywords>3</nb_keywords> <nb_searches>3</nb_searches> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> <nb_pageviews>0</nb_pageviews> <nb_uniq_pageviews>0</nb_uniq_pageviews> <nb_downloads>0</nb_downloads> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml index 19a2a7a2f1..924bf9decc 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml @@ -49,7 +49,7 @@ <nb_pageviews>4</nb_pageviews> <nb_searches>8</nb_searches> <nb_uniq_pageviews>3</nb_uniq_pageviews> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> <nb_downloads>0</nb_downloads> <nb_uniq_downloads>0</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml index 78fcaa8aab..d690a97794 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml @@ -48,7 +48,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>50%</exit_rate> - <avg_time_generation>00:00:00.13</avg_time_generation> + <avg_time_generation>0.14s</avg_time_generation> </row> </result> <result prettyDate="Monday 4 January 2010"> @@ -59,7 +59,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00.22</avg_time_generation> + <avg_time_generation>0.22s</avg_time_generation> </row> </result> <result prettyDate="Tuesday 5 January 2010"> @@ -70,7 +70,7 @@ <avg_time_on_page>00:07:30</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00.24</avg_time_generation> + <avg_time_generation>0.25s</avg_time_generation> </row> <row> <label>Checkout</label> @@ -79,7 +79,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>00:00:00.45</avg_time_generation> + <avg_time_generation>0.45s</avg_time_generation> </row> </result> <result prettyDate="Wednesday 6 January 2010" /> @@ -92,10 +92,10 @@ <result prettyDate="Monday 4 January 2010" /> <result prettyDate="Tuesday 5 January 2010"> <row> - + <idsubdatatable>72</idsubdatatable> </row> <row> - + <idsubdatatable>71</idsubdatatable> </row> </result> <result prettyDate="Wednesday 6 January 2010" /> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml index f8dd51fa8d..230733f697 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml @@ -48,7 +48,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00.12</avg_time_generation> + <avg_time_generation>0.12s</avg_time_generation> </row> <row> <label>/products</label> @@ -57,7 +57,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>00:00:00.15</avg_time_generation> + <avg_time_generation>0.15s</avg_time_generation> </row> </result> <result prettyDate="Monday 4 January 2010"> @@ -68,7 +68,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00.22</avg_time_generation> + <avg_time_generation>0.22s</avg_time_generation> </row> </result> <result prettyDate="Tuesday 5 January 2010"> @@ -79,7 +79,7 @@ <avg_time_on_page>00:06:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00.32</avg_time_generation> + <avg_time_generation>0.32s</avg_time_generation> </row> <row> <label>/thankyou</label> @@ -88,7 +88,7 @@ <avg_time_on_page>00:06:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>00:00:00.31</avg_time_generation> + <avg_time_generation>0.31s</avg_time_generation> </row> <row> <label>Page URL not defined</label> @@ -97,7 +97,7 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </row> </result> <result prettyDate="Wednesday 6 January 2010" /> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html index 5399b67175..fec52b8dfc 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html @@ -1859,7 +1859,7 @@ Unique Keywords Avg. generation time </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -00:00:00.24 +0.24s </td> </tr> </tbody> @@ -1918,7 +1918,7 @@ Page URLs 0% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -00:00:00.22 +0.22s </td> </tr> <tr style="background-color: rgb(249,250,250)"> @@ -1943,7 +1943,7 @@ Page URL not defined 0% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -00:00:00.22 +0.22s </td> </tr> <tr style=""> @@ -1968,7 +1968,7 @@ Page URL not defined 100% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -00:00:00.15 +0.15s </td> </tr> <tr style="background-color: rgb(249,250,250)"> @@ -1993,7 +1993,7 @@ Page URL not defined 100% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -00:00:00.31 +0.31s </td> </tr> </tbody> @@ -2164,7 +2164,7 @@ first page view 50% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -00:00:00.13 +0.14s </td> </tr> <tr style="background-color: rgb(249,250,250)"> @@ -2187,7 +2187,7 @@ second visitor 0% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -00:00:00.24 +0.25s </td> </tr> <tr style=""> @@ -2210,7 +2210,7 @@ Checkout 100% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -00:00:00.45 +0.45s </td> </tr> <tr style="background-color: rgb(249,250,250)"> @@ -2233,7 +2233,7 @@ Page Name not defined 0% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -00:00:00.22 +0.22s </td> </tr> </tbody> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml index 52ded0385c..b88163e467 100755 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml @@ -42,7 +42,7 @@ <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_searches>0</nb_searches> <nb_keywords>0</nb_keywords> - <avg_time_generation>00:00:00</avg_time_generation> + <avg_time_generation>0s</avg_time_generation> </reportData> <reportMetadata /> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html index c21f52d868..3fd190fc25 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html @@ -3182,7 +3182,7 @@ Unique Keywords Avg. generation time </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -00:00:00 +0s </td> </tr> </tbody> |