From 649530ed7b0cfd7413c8b22c02715482213f4022 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 2 Jul 2009 12:20:02 -0600
Subject: [PATCH] Fix Horde_Util tests.

---
 framework/Util/test/Horde/Util/Array_sort.phpt     |  6 +++-
 .../Util/test/Horde/Util/Variables_remove.phpt     | 41 ++++++++++++----------
 framework/Util/test/Horde/Util/addParameter.phpt   |  2 +-
 framework/Util/test/Horde/Util/case.phpt           |  4 +--
 framework/Util/test/Horde/Util/case_php6.phpt      |  4 +--
 framework/Util/test/Horde/Util/length.phpt         |  4 +--
 framework/Util/test/Horde/Util/pad.phpt            |  4 +--
 .../Util/test/Horde/Util/removeParameter.phpt      |  2 +-
 framework/Util/test/Horde/Util/substr.phpt         |  4 +--
 framework/Util/test/Horde/Util/utf-8.phpt          |  4 +--
 framework/Util/test/Horde/Util/wordwrap.phpt       |  4 +--
 11 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/framework/Util/test/Horde/Util/Array_sort.phpt b/framework/Util/test/Horde/Util/Array_sort.phpt
index 57464717e..cdef38c53 100644
--- a/framework/Util/test/Horde/Util/Array_sort.phpt
+++ b/framework/Util/test/Horde/Util/Array_sort.phpt
@@ -3,7 +3,11 @@ Horde_Array::arraySort() tests
 --FILE--
 <?php
 
-require dirname(__FILE__) . '/../Array.php';
+require dirname(__FILE__) . '/../../../lib/Horde/Array.php';
+require dirname(__FILE__) . '/../../../lib/Horde/Array/Sort/Helper.php';
+require dirname(__FILE__) . '/../../../lib/Horde/String.php';
+require dirname(__FILE__) . '/../../../lib/Horde/Util.php';
+
 $array = array(
     array('name' => 'foo', 'desc' => 'foo long desc'),
     array('name' => 'aaaa', 'desc' => 'aaa foo long desc'),
diff --git a/framework/Util/test/Horde/Util/Variables_remove.phpt b/framework/Util/test/Horde/Util/Variables_remove.phpt
index ff7131590..f1faf999b 100644
--- a/framework/Util/test/Horde/Util/Variables_remove.phpt
+++ b/framework/Util/test/Horde/Util/Variables_remove.phpt
@@ -1,10 +1,12 @@
 --TEST--
-Variables::remove() tests
+Horde_Variables::remove() tests
 --FILE--
 <?php
 
-require dirname(__FILE__) . '/../Variables.php';
-$vars = new Variables(array(
+require dirname(__FILE__) . '/../../../lib/Horde/Array.php';
+require dirname(__FILE__) . '/../../../lib/Horde/Variables.php';
+
+$vars = new Horde_Variables(array(
    'a' => 'a',
    'b' => 'b',
    'c' => array(1, 2, 3),
@@ -19,28 +21,31 @@ $vars = new Variables(array(
 
 $vars->remove('a');
 $vars->remove('d[y][g]');
-print_r($vars->_vars);
+
+print_r($vars->a);
+print "\n";
+print_r($vars->b);
+print "\n";
+print_r($vars->c);
+print "\n";
+print_r($vars->d);
 
 ?>
 --EXPECT--
+b
 Array
 (
-    [b] => b
-    [c] => Array
-        (
-            [0] => 1
-            [1] => 2
-            [2] => 3
-        )
+    [0] => 1
+    [1] => 2
+    [2] => 3
+)
 
-    [d] => Array
+Array
+(
+    [z] => z
+    [y] => Array
         (
-            [z] => z
-            [y] => Array
-                (
-                    [f] => f
-                )
-
+            [f] => f
         )
 
 )
diff --git a/framework/Util/test/Horde/Util/addParameter.phpt b/framework/Util/test/Horde/Util/addParameter.phpt
index 651d72c9f..3bc4fb905 100644
--- a/framework/Util/test/Horde/Util/addParameter.phpt
+++ b/framework/Util/test/Horde/Util/addParameter.phpt
@@ -3,7 +3,7 @@ Horde_Util::addParameter() tests
 --FILE--
 <?php
 
-require_once dirname(__FILE__) . '/../../lib/Horde/Util.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/Util.php';
 
 $url = 'test';
 echo ($url = Horde_Util::addParameter($url, 'foo', 1)) . "\n";
diff --git a/framework/Util/test/Horde/Util/case.phpt b/framework/Util/test/Horde/Util/case.phpt
index aca8edfbc..5ee4d5b4a 100644
--- a/framework/Util/test/Horde/Util/case.phpt
+++ b/framework/Util/test/Horde/Util/case.phpt
@@ -7,8 +7,8 @@ if (!setlocale(LC_ALL, 'tr_TR')) echo 'skip No Turkish locale installed.';
 --FILE--
 <?php
 
-require_once dirname(__FILE__) . '/../../lib/Horde/Util.php';
-require_once dirname(__FILE__) . '/../../lib/Horde/String.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/Util.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/String.php';
 
 echo Horde_String::upper('abCDefGHiI', true, 'us-ascii') . "\n";
 echo Horde_String::lower('abCDefGHiI', true, 'us-ascii') . "\n";
diff --git a/framework/Util/test/Horde/Util/case_php6.phpt b/framework/Util/test/Horde/Util/case_php6.phpt
index 507123676..ceaad3808 100644
--- a/framework/Util/test/Horde/Util/case_php6.phpt
+++ b/framework/Util/test/Horde/Util/case_php6.phpt
@@ -9,8 +9,8 @@ if (version_compare(PHP_VERSION, '6.0', '<')) {
 --FILE--
 <?php
 
-require_once dirname(__FILE__) . '/../../lib/Horde/Util.php';
-require_once dirname(__FILE__) . '/../../lib/Horde/String.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/Util.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/String.php';
 
 echo Horde_String::upper('abCDefGHiI', true, 'iso-8859-9') . "\n";
 echo Horde_String::lower('abCDefGHiI', true, 'iso-8859-9') . "\n";
diff --git a/framework/Util/test/Horde/Util/length.phpt b/framework/Util/test/Horde/Util/length.phpt
index f59ba0c08..872467ba1 100644
--- a/framework/Util/test/Horde/Util/length.phpt
+++ b/framework/Util/test/Horde/Util/length.phpt
@@ -3,8 +3,8 @@ Horde_String::length() tests
 --FILE--
 <?php
 
-require_once dirname(__FILE__) . '/../../lib/Horde/Util.php';
-require_once dirname(__FILE__) . '/../../lib/Horde/String.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/Util.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/String.php';
 
 echo Horde_String::length('Welcome', 'Big5'). "\n";
 echo Horde_String::length('Welcome', 'Big5'). "\n";
diff --git a/framework/Util/test/Horde/Util/pad.phpt b/framework/Util/test/Horde/Util/pad.phpt
index f075dd2a7..7bda83dd5 100644
--- a/framework/Util/test/Horde/Util/pad.phpt
+++ b/framework/Util/test/Horde/Util/pad.phpt
@@ -3,8 +3,8 @@ Horde_String::pad() tests
 --FILE--
 <?php
 
-require_once dirname(__FILE__) . '/../../lib/Horde/Util.php';
-require_once dirname(__FILE__) . '/../../lib/Horde/String.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/Util.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/String.php';
 
 /* Simple single byte tests. */
 echo Horde_String::pad('abc', 2) . "\n";
diff --git a/framework/Util/test/Horde/Util/removeParameter.phpt b/framework/Util/test/Horde/Util/removeParameter.phpt
index 2a35b8332..bb69080d2 100644
--- a/framework/Util/test/Horde/Util/removeParameter.phpt
+++ b/framework/Util/test/Horde/Util/removeParameter.phpt
@@ -3,7 +3,7 @@ Horde_Util::removeParameter() tests
 --FILE--
 <?php
 
-require_once dirname(__FILE__) . '/../../lib/Horde/Util.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/Util.php';
 
 $url = 'test?foo=1&bar=2';
 echo Horde_Util::removeParameter($url, 'foo') . "\n";
diff --git a/framework/Util/test/Horde/Util/substr.phpt b/framework/Util/test/Horde/Util/substr.phpt
index 733fb8727..a9cb70375 100644
--- a/framework/Util/test/Horde/Util/substr.phpt
+++ b/framework/Util/test/Horde/Util/substr.phpt
@@ -3,8 +3,8 @@ Horde_String::substr() tests
 --FILE--
 <?php
 
-require_once dirname(__FILE__) . '/../../lib/Horde/Util.php';
-require_once dirname(__FILE__) . '/../../lib/Horde/String.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/Util.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/String.php';
 
 $string = "Lörem ipsüm dölör sit ämet";
 echo Horde_String::substr($string, 20, null, 'UTF-8') . "\n";
diff --git a/framework/Util/test/Horde/Util/utf-8.phpt b/framework/Util/test/Horde/Util/utf-8.phpt
index 0eeb663b3..2377d28a6 100644
--- a/framework/Util/test/Horde/Util/utf-8.phpt
+++ b/framework/Util/test/Horde/Util/utf-8.phpt
@@ -3,8 +3,8 @@ UTF-8 Horde_String:: tests
 --FILE--
 <?php
 
-require_once dirname(__FILE__) . '/../../lib/Horde/Util.php';
-require_once dirname(__FILE__) . '/../../lib/Horde/String.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/Util.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/String.php';
 
 /* The following strings were taken with permission from the UTF-8
  * sampler by Frank da Cruz <fdc@columbia.edu> and the Kermit Project
diff --git a/framework/Util/test/Horde/Util/wordwrap.phpt b/framework/Util/test/Horde/Util/wordwrap.phpt
index 89eb2b724..895fc47ef 100644
--- a/framework/Util/test/Horde/Util/wordwrap.phpt
+++ b/framework/Util/test/Horde/Util/wordwrap.phpt
@@ -3,8 +3,8 @@ Horde_String::wordwrap() tests
 --FILE--
 <?php
 
-require_once dirname(__FILE__) . '/../../lib/Horde/Util.php';
-require_once dirname(__FILE__) . '/../../lib/Horde/String.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/Util.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/String.php';
 
 // Test default parameters and break character.
 $string = "Lörem ipsüm dölör sit ämet, cönsectetüer ädipiscing elit. Aliqüäm söllicitüdin fäücibüs mäüris ämet.";
-- 
2.11.0