diff --git a/tests/PHPUnit/Core/Plugin/ReportTest.php b/tests/PHPUnit/Core/Plugin/ReportTest.php
deleted file mode 100644
index 820137d996d73c0bc5b45dfdb39fbb9bd33ec439..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/Core/Plugin/ReportTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-use Piwik\Plugin\Report;
-use Piwik\Plugins\ExamplePlugin\Reports\GetExampleReport;
-use Piwik\Metrics;
-
-/**
- * @group Core
- */
-class Plugin_ReportTest extends PHPUnit_Framework_TestCase
-{
- /**
- * @var Report
- */
- private $report;
-
- public function setUp()
- {
- $this->report = new GetExampleReport();
- }
-
- public function test_reportShouldUseDefaultMetrics()
- {
- $this->assertEquals(Metrics::getDefaultMetrics(), $this->report->getMetrics());
- }
-
- public function test_reportShouldUseDefaultProcessedMetrics()
- {
- $this->assertEquals(Metrics::getDefaultProcessedMetrics(), $this->report->getProcessedMetrics());
- }
-}
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index e662112861883266692a6b26f53a69783916858b..ba5dafe7221ba3d220cfde944b2e1e96edfc8db1 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -1,7 +1,3 @@
-ExampleReportName
-nb_visits,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate,label,nb_actions
-5,0%,0,00:00:00,0%,0,0
-
All Websites dashboard
label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders,orders_evolution,ecommerce_revenue,ecommerce_revenue_evolution
Site 1,10,43,43,$ 0,0,100%,100%,100%,0%,0%,0,0,$ 0,0
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index 91152824286ec6c89a82063cb5629329af50a3da..adb664ab33c7ef4eaca9cb89c61f90e4d24bb649 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
@@ -3330,7 +3330,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
- Page URL
+ Entry Page URL
</th>
<th style="padding: 6px 0;">
Entrances
@@ -3396,7 +3396,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
- Page URL
+ Exit Page URL
</th>
<th style="padding: 6px 0;">
Exits
@@ -3597,7 +3597,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
- Page Name
+ Entry Page title
</th>
<th style="padding: 6px 0;">
Entrances
@@ -3659,7 +3659,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
- Page Name
+ Exit Page Title
</th>
<th style="padding: 6px 0;">
Exits
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index 8837c3277ce57eaa4ef08aaab0714a502b4b0f5d..f4e7a9afb537ddc306a4d33498e4cf9cbbf83e90 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -20,11 +20,6 @@
</h2>
<ul>
<li>
- <a href="#ExamplePlugin_getExampleReport" style="text-decoration:none; color: rgb(68,68,68);">
- ExampleReportName
- </a>
- </li>
- <li>
<a href="#MultiSites_getAll" style="text-decoration:none; color: rgb(68,68,68);">
All Websites dashboard
</a>
@@ -305,66 +300,6 @@
</a>
</li>
</ul>
-<h2 id="ExamplePlugin_getExampleReport" style="color: rgb(126,115,99); font-size: 11pt;">
- ExampleReportName
-</h2>
-
-
-
- <table style="border-collapse:collapse; margin-left: 5px;">
- <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
- <th style="padding: 6px 0;">
- Exit Page URL
- </th>
- <th style="padding: 6px 0;">
- Visits
- </th>
- <th style="padding: 6px 0;">
- Actions
- </th>
- <th style="padding: 6px 0;">
- Actions per Visit
- </th>
- <th style="padding: 6px 0;">
- Avg. Time on Website
- </th>
- <th style="padding: 6px 0;">
- Bounce Rate
- </th>
- <th style="padding: 6px 0;">
- Conversion Rate
- </th>
- </thead>
- <tbody>
-
- <tr style="">
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0 </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 5
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 00:00:00
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0%
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0%
- </td>
- </tr>
- </tbody>
- </table>
- <br/>
- <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
- Back to top
- </a>
<h2 id="MultiSites_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
All Websites dashboard
</h2>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
index 9b86222a07cc7b1a9d6e27547d30747cc73c96b7..b615d1d9a82053ddd1032a33363082b3f15328bc 100644
Binary files a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf and b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf differ
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index 62ed8fedd7801c5dc972fffc2659ad290e52f720..c03a680ec7e19def01c2e6e3e0ddcecb8af5028c 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -1,32 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <category>ExampleCategory</category>
- <name>ExampleReportName</name>
- <module>ExamplePlugin</module>
- <action>getExampleReport</action>
- <dimension>Exit Page URL</dimension>
- <documentation>ExampleReportDocumentation</documentation>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- </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_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- </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=ExamplePlugin&apiAction=getExampleReport&period=day&date=2009-01-04</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=ExamplePlugin&apiAction=getExampleReport&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
- <uniqueId>ExamplePlugin_getExampleReport</uniqueId>
- </row>
<row>
<category>All Websites</category>
<name>All Websites dashboard</name>
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
index cfcf4e9a0b6c71f38f19b831d7a44c654dac2d96..19aefaace8f0f09044510d4f299fa93f7eb36429 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
@@ -128,20 +128,6 @@
<segment>deviceType</segment>
<acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser, smart display, camera</acceptedValues>
</row>
- <row>
- <type>dimension</type>
- <category>Visit</category>
- <name>Example Dimension</name>
- <segment>myConversionSegmentName</segment>
- <acceptedValues>Here you should explain which values are accepted/useful: Any number, for instance 1, 2, 3 , 99</acceptedValues>
- </row>
- <row>
- <type>dimension</type>
- <category>Visit</category>
- <name>Example Dimension</name>
- <segment>achievementPoints</segment>
- <acceptedValues>Here you should explain which values are accepted/useful: Any number, for instance 1, 2, 3 , 99</acceptedValues>
- </row>
<row>
<type>dimension</type>
<category>Visit</category>
@@ -392,13 +378,6 @@
<name>Entry Page title</name>
<segment>entryPageTitle</segment>
</row>
- <row>
- <type>dimension</type>
- <category>Actions</category>
- <name>Example Dimension</name>
- <segment>keywords</segment>
- <acceptedValues>Here you should explain which values are accepted/useful: Any word, for instance MyKeyword1, MyKeyword2</acceptedValues>
- </row>
<row>
<type>dimension</type>
<category>Actions</category>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index 29fef7ec110125cdcf1a3ea1b8945129d0a4a321..478590155c5cb14a251bc0880908b0356ef1ab30 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -1,7 +1,3 @@
-ExampleReportName
-nb_visits,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate,label,nb_actions
-5,0%,0,00:00:00,0%,0,0
-
All Websites dashboard
label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,orders,ecommerce_revenue,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders_evolution,ecommerce_revenue_evolution
Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,100%,100%,100%,100%,100%
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
index 47d2b984d2700d66509911f6f08085aa16fc4a86..247f01303866a271211356dc3b797076d9722165 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
@@ -4338,7 +4338,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
- Page URL
+ Entry Page URL
</th>
<th style="padding: 6px 0;">
Entrances
@@ -4388,7 +4388,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
- Page URL
+ Exit Page URL
</th>
<th style="padding: 6px 0;">
Exits
@@ -4638,7 +4638,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
- Page Name
+ Entry Page title
</th>
<th style="padding: 6px 0;">
Entrances
@@ -4714,7 +4714,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
- Page Name
+ Exit Page Title
</th>
<th style="padding: 6px 0;">
Exits
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 8cdec86451a651afc387767b965b2ca560de0822..78ca134267d3a9dfbab9b2bd9b73e890dc364d2f 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -20,11 +20,6 @@
</h2>
<ul>
<li>
- <a href="#ExamplePlugin_getExampleReport" style="text-decoration:none; color: rgb(68,68,68);">
- ExampleReportName
- </a>
- </li>
- <li>
<a href="#MultiSites_getAll" style="text-decoration:none; color: rgb(68,68,68);">
All Websites dashboard
</a>
@@ -365,66 +360,6 @@
</a>
</li>
</ul>
-<h2 id="ExamplePlugin_getExampleReport" style="color: rgb(126,115,99); font-size: 11pt;">
- ExampleReportName
-</h2>
-
-
-
- <table style="border-collapse:collapse; margin-left: 5px;">
- <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
- <th style="padding: 6px 0;">
- Exit Page URL
- </th>
- <th style="padding: 6px 0;">
- Visits
- </th>
- <th style="padding: 6px 0;">
- Actions
- </th>
- <th style="padding: 6px 0;">
- Actions per Visit
- </th>
- <th style="padding: 6px 0;">
- Avg. Time on Website
- </th>
- <th style="padding: 6px 0;">
- Bounce Rate
- </th>
- <th style="padding: 6px 0;">
- Conversion Rate
- </th>
- </thead>
- <tbody>
-
- <tr style="">
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0 </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 5
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 00:00:00
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0%
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0%
- </td>
- </tr>
- </tbody>
- </table>
- <br/>
- <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
- Back to top
- </a>
<h2 id="MultiSites_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
All Websites dashboard
</h2>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
index f7bdbe8b562e69c92408a99de586dac0ea7003fc..3a6b3333e426c2ab68956969f75bc66df590c5f8 100644
Binary files a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf and b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf differ
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index c615921137901cbbd30b0aee2b48f38706720e01..63a18878cfd5e62a7835041647408025f0992474 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit c615921137901cbbd30b0aee2b48f38706720e01
+Subproject commit 63a18878cfd5e62a7835041647408025f0992474