From 2965a981b7ec22866fbdf2d567d87e2d068d3617 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 31 Jul 2015 16:04:08 -0400
Subject: [PATCH] Allow to search and import missing PGP pubkeys from keyservers using Publickey.js
---
tests/Framework/Utils.php | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/tests/Framework/Utils.php b/tests/Framework/Utils.php
index f7389f0..b881cea 100644
--- a/tests/Framework/Utils.php
+++ b/tests/Framework/Utils.php
@@ -275,18 +275,21 @@
*/
function test_strtotime()
{
+ // this test depends on system timezone if not set
+ date_default_timezone_set('UTC');
+
$test = array(
'1' => 1,
'' => 0,
'abc-555' => 0,
- '2013-04-22' => 1366581600,
- '2013/04/22' => 1366581600,
- '2013.04.22' => 1366581600,
- '22-04-2013' => 1366581600,
- '22/04/2013' => 1366581600,
- '22.04.2013' => 1366581600,
- '22.4.2013' => 1366581600,
- '20130422' => 1366581600,
+ '2013-04-22' => 1366588800,
+ '2013/04/22' => 1366588800,
+ '2013.04.22' => 1366588800,
+ '22-04-2013' => 1366588800,
+ '22/04/2013' => 1366588800,
+ '22.04.2013' => 1366588800,
+ '22.4.2013' => 1366588800,
+ '20130422' => 1366588800,
'2013/06/21 12:00:00 UTC' => 1371816000,
'2013/06/21 12:00:00 Europe/Berlin' => 1371808800,
);
@@ -372,15 +375,19 @@
'abc def' => 'abc def',
'ÇçäâàåæéêëèïîìÅÉöôòüûùÿøØáíóúñÑÁÂÀãÃÊËÈÍÎÏÓÔõÕÚÛÙýÝ' => 'ccaaaaaeeeeiiiaeooouuuyooaiounnaaaaaeeeiiioooouuuyy',
'ąáâäćçčéęëěíîłľĺńňóôöŕřśšşťţůúűüźžżýĄŚŻŹĆ' => 'aaaaccceeeeiilllnnooorrsssttuuuuzzzyaszzc',
- 'ß' => '',
'ßs' => 'sss',
'Xae' => 'xa',
'Xoe' => 'xo',
'Xue' => 'xu',
'项目' => '项目',
- '日' => '', // FIXME: this should not be stripped although minlen = 2
);
+ // this test fails on PHP 5.3.3
+ if (PHP_VERSION_ID > 50303) {
+ $test['ß'] = '';
+ $test['日'] = '';
+ }
+
foreach ($test as $input => $output) {
$result = rcube_utils::normalize_string($input);
$this->assertSame($output, $result, "Error normalizing '$input'");
--
Gitblit v1.9.1