From d82ffb608f556a5b3bd11d0102d5e31568b88ca7 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Mon, 4 Aug 2014 17:47:27 +0200
Subject: [PATCH] Revert tests that started failing after
49ae6b4030e83a9e0b5a842810c7ddda3c322b24
---
tests/PHPUnit/Core/Plugin/ReportTest.php | 37 ----------
...dReports.generateReport_month.original.csv | 4 --
...Reports.generateReport_month.original.html | 8 +--
...Reports.generateReport_month.original.html | 65 ------------------
...dReports.generateReport_month.original.pdf | Bin 506213 -> 506974 bytes
...ortMetadata__API.getReportMetadata_day.xml | 27 --------
...eportMetadata__API.getSegmentsMetadata.xml | 21 ------
...edReports.generateReport_week.original.csv | 4 --
...dReports.generateReport_week.original.html | 8 +--
...dReports.generateReport_week.original.html | 65 ------------------
...edReports.generateReport_week.original.pdf | Bin 525682 -> 525709 bytes
tests/PHPUnit/UI | 2 +-
12 files changed, 9 insertions(+), 232 deletions(-)
delete mode 100644 tests/PHPUnit/Core/Plugin/ReportTest.php
diff --git a/tests/PHPUnit/Core/Plugin/ReportTest.php b/tests/PHPUnit/Core/Plugin/ReportTest.php
deleted file mode 100644
index 820137d996..0000000000
--- 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 e662112861..ba5dafe722 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 9115282428..adb664ab33 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 8837c3277c..f4e7a9afb5 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
GIT binary patch
delta 12392
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
delta 11955
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
U-j1i4fgG51W^wVu23pMj0oW{A(f|Me
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 62ed8fedd7..c03a680ec7 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 cfcf4e9a0b..19aefaace8 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 29fef7ec11..478590155c 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 47d2b984d2..247f013038 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 8cdec86451..78ca134267 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
GIT binary patch
delta 8839
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
Z-T^lo0-nf0Las)EMN#teD`;G${1<AzV>ti-
delta 8824
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
YzPR9+Cs;}vO<D||PE=G)`z+o60J9*BjsO4v
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index c615921137..63a18878cf 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit c615921137901cbbd30b0aee2b48f38706720e01
+Subproject commit 63a18878cfd5e62a7835041647408025f0992474
--
GitLab