From 0a92194e024b365bbe4778593ce4a2c9f68530fd Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Tue, 22 Sep 2015 21:34:27 +0200
Subject: [PATCH] fixed some tests after full cldr update
---
...oVisits__subtable__API.getProcessedReport_week.xml | 2 +-
...ar__LanguagesManager.getAvailableLanguageNames.xml | 2 +-
...ScheduledReports.generateReport_week.original.html | 2 +-
...eduledReports.generateReport_week.original.sms.txt | 2 +-
...eduledReports.generateReport_week.original.sms.txt | 2 +-
tests/PHPUnit/Unit/Period/MonthTest.php | 2 +-
tests/PHPUnit/Unit/Period/WeekTest.php | 11 ++++++++---
7 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
index 8b04b80db3..bfcd3f626d 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>new name</website>
- <prettyDate>Week March 1 – 7, 2010</prettyDate>
+ <prettyDate>week March 1 – 7, 2010</prettyDate>
<metadata>
<category>Actions</category>
<name>Page URLs</name>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml
index e332105835..d0c3b6b131 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml
@@ -122,7 +122,7 @@
</row>
<row>
<code>id</code>
- <name>Bahasa Indonesia</name>
+ <name>Indonesia</name>
<english_name>Indonesian</english_name>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 96c29a57d6..deb8534668 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -12,7 +12,7 @@
</h1>
<p>
- Mail Test report - Date range: Week April 4 – 10, 2011
+ Mail Test report - Date range: week April 4 – 10, 2011
</p>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt
index d93abaaa99..645d7467c3 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt
@@ -1 +1 @@
-Week April 4 – 10, 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%). Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250 (+100%), 1 Goal conversions (+100%)
\ No newline at end of file
+week April 4 – 10, 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%). Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250 (+100%), 1 Goal conversions (+100%)
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt
index 3632f5fb81..f36a23fa6e 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt
@@ -1 +1 @@
-Week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%)
\ No newline at end of file
+week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%)
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/Period/MonthTest.php b/tests/PHPUnit/Unit/Period/MonthTest.php
index 2779a2e582..a3abb80d07 100644
--- a/tests/PHPUnit/Unit/Period/MonthTest.php
+++ b/tests/PHPUnit/Unit/Period/MonthTest.php
@@ -334,7 +334,7 @@ class MonthTest extends BasePeriodTest
{
return array(
array('en', 'October 2024'),
- array('lt', '2024 Spalis'),
+ array('lt', '2024 m. Spalis'),
array('zh-cn', '2024年10月'),
);
}
diff --git a/tests/PHPUnit/Unit/Period/WeekTest.php b/tests/PHPUnit/Unit/Period/WeekTest.php
index 4adf7666a2..5df53acb45 100644
--- a/tests/PHPUnit/Unit/Period/WeekTest.php
+++ b/tests/PHPUnit/Unit/Period/WeekTest.php
@@ -12,6 +12,11 @@ use Piwik\Container\StaticContainer;
use Piwik\Date;
use Piwik\Period\Week;
+/**
+ * Class WeekTest
+ * @package Piwik\Tests\Unit\Period
+ * @group WeekTest
+ */
class WeekTest extends BasePeriodTest
{
/**
@@ -122,7 +127,7 @@ class WeekTest extends BasePeriodTest
{
return array(
array('en', array('Oct 7 – 13, 2024', 'Nov 25 – Dec 1, 2024', 'Dec 30, 2024 – Jan 5, 2025')),
- array('lt', array('2024-10-07 – 2024-10-13', '2024-11-25 – 2024-12-01', '2024-12-30 – 2025-1-05')),
+ array('lt', array('2024 Spal. 7–13', '2024 Lapkr. 25 – Gruod. 1', '2024 Gruod. 30 – 2025 Saus. 5')),
array('zh-cn', array('2024年10月7日至13日', '2024年11月25日至12月1日', '2024年12月30日至2025年01月5日')),
);
}
@@ -150,8 +155,8 @@ class WeekTest extends BasePeriodTest
public function getLocalizedLongStrings()
{
return array(
- array('en', array('Week October 7 – 13, 2024', 'Week November 25 – December 1, 2024', 'Week December 30, 2024 – January 5, 2025')),
- array('lt', array('SavaitÄ— 2024 Spalio 7–13', 'SavaitÄ— 2024 LapkriÄio 25 – Gruodžio 1', 'SavaitÄ— 2024 Gruodžio 30 – 2025 Sausio 5')),
+ array('en', array('week October 7 – 13, 2024', 'week November 25 – December 1, 2024', 'week December 30, 2024 – January 5, 2025')),
+ array('lt', array('savaitÄ— 2024 Spalio 7–13', 'savaitÄ— 2024 LapkriÄio 25 – Gruodžio 1', 'savaitÄ— 2024 Gruodžio 30 – 2025 Sausio 5')),
array('zh-cn', array('周 2024年10月7日至13日', '周 2024年11月25日至12月1日', '周 2024年12月30日至2025年01月5日')),
);
}
--
GitLab