MFB: Fix tests.

diff --git a/turba/lib/tests/bug_6518.phpt b/turba/lib/tests/bug_6518.phpt
index 42b1f60..56521b8 100644 (file)
--- a/turba/lib/tests/bug_6518.phpt
+++ b/turba/lib/tests/bug_6518.phpt
@@ -3,7 +3,11 @@ Data_ldif: Bug #6518
 --FILE--
 <?php
 
-error_reporting(E_ALL);
+if (defined('E_DEPRECATED')) {
+    error_reporting(E_ALL & ~constant('E_DEPRECATED'));
+} else {
+    error_reporting(E_ALL);
+}
 
 require 'Horde.php';
 require 'Horde/Data.php';

diff --git a/turba/lib/tests/ldif_exportFile.phpt b/turba/lib/tests/ldif_exportFile.phpt
index 78f40ce..e337190 100644 (file)
--- a/turba/lib/tests/ldif_exportFile.phpt
+++ b/turba/lib/tests/ldif_exportFile.phpt
@@ -3,7 +3,11 @@ Export Simple LDIF file
 --FILE--
 <?php
 
-error_reporting(E_ALL);
+if (defined('E_DEPRECATED')) {
+    error_reporting(E_ALL & ~constant('E_DEPRECATED'));
+} else {
+    error_reporting(E_ALL);
+}
 
 require 'Horde.php';
 require 'Horde/Data.php';

diff --git a/turba/lib/tests/ldif_importFile.phpt b/turba/lib/tests/ldif_importFile.phpt
index cb29bee..e22bf0e 100644 (file)
--- a/turba/lib/tests/ldif_importFile.phpt
+++ b/turba/lib/tests/ldif_importFile.phpt
@@ -3,7 +3,11 @@ Import Simple LDIF file, LF terminated
 --FILE--
 <?php
 
-error_reporting(E_ALL);
+if (defined('E_DEPRECATED')) {
+    error_reporting(E_ALL & ~constant('E_DEPRECATED'));
+} else {
+    error_reporting(E_ALL);
+}
 
 require 'Horde.php';
 require 'Horde/Data.php';

diff --git a/turba/lib/tests/ldif_importFileCRLF.phpt b/turba/lib/tests/ldif_importFileCRLF.phpt
index 90137d6..01d9f1c 100644 (file)
--- a/turba/lib/tests/ldif_importFileCRLF.phpt
+++ b/turba/lib/tests/ldif_importFileCRLF.phpt
@@ -3,7 +3,11 @@ Import Simple LDIF file, CRLF terminated
 --FILE--
 <?php
 
-error_reporting(E_ALL);
+if (defined('E_DEPRECATED')) {
+    error_reporting(E_ALL & ~constant('E_DEPRECATED'));
+} else {
+    error_reporting(E_ALL);
+}
 
 require 'Horde.php';
 require 'Horde/Data.php';

diff --git a/turba/lib/tests/tohash.phpt b/turba/lib/tests/tohash.phpt
index dff1fcf..fbacdab 100644 (file)
--- a/turba/lib/tests/tohash.phpt
+++ b/turba/lib/tests/tohash.phpt
@@ -283,7 +283,7 @@ D
   'workStreet' => 'Hübschestr. 19',
   'workCity' => 'Köln',
   'workProvince' => 'Allgäu',
-  'workCountry' => 'DK',
+  'workCountry' => 'Dänemark',
   'timezone' => 'Europe/Berlin',
   'latitude' => 52.516276,
   'longitude' => 13.377778,
@@ -321,7 +321,7 @@ D
   'workStreet' => 'Hübschestr. 19',
   'workCity' => 'Köln',
   'workProvince' => 'Allgäu',
-  'workCountry' => 'DK',
+  'workCountry' => 'Dänemark',
   'timezone' => 'Europe/Berlin',
   'latitude' => 52.516276,
   'longitude' => 13.377778,
@@ -362,15 +362,19 @@ array (
   'lastname' => 'Lastname',
   'firstname' => 'Firstname',
   'name' => 'Lastname, Firstname',
+  'title' => '',
   'company' => 'Company Name',
   'department' => '',
+  'birthday' => '',
   'homePhone' => '(xxx) xxx-xxxx',
   'workPhone' => '(xxx) xxx-xxxx',
   'cellPhone' => '(xxx) xxx-xxxx',
   'email' => 'email@domain.com',
   'emails' => 'email@domain.com',
+  'website' => '',
   'category' => 'Friends',
   'businessCategory' => 'Friends',
+  'notes' => '',
   'homeAddress' => 'Street address
 City, St 12345
 USA',
@@ -402,6 +406,7 @@ array (
   'lastname' => 'Blow',
   'firstname' => 'Joe',
   'name' => 'Blow, Joe',
+  'title' => '',
   'company' => '',
   'department' => '',
   'birthday' => '1970-03-27',
@@ -409,8 +414,10 @@ array (
   'cellPhone' => '302 521 9999',
   'email' => 'Blow@somwhere.net',
   'emails' => 'Blow@somwhere.net',
+  'website' => '',
   'category' => 'Personal',
   'businessCategory' => 'Personal',
+  'notes' => '',
   'homeAddress' => '',
 )
 136