From 96506a770efde98697fe25b3b1050e516c650e73 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Wed, 26 Jan 2011 12:14:02 -0500
Subject: [PATCH] Tweak some Test.php files.

Remove redundant checks, update message for PDO to reflect current
state of Horde_Db driver support.
---
 ansel/lib/Test.php     | 16 +---------------
 horde/lib/Test.php     |  4 ++--
 kronolith/lib/Test.php |  9 +--------
 turba/lib/Test.php     |  9 +--------
 4 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/ansel/lib/Test.php b/ansel/lib/Test.php
index 386081a85..39597e462 100644
--- a/ansel/lib/Test.php
+++ b/ansel/lib/Test.php
@@ -23,15 +23,6 @@ class Ansel_Test extends Horde_Test
             'required' => false,
             'error' => 'Ansel can make use of the Facedetect PHP extension for automatically detecting human faces in images.'
         ),
-        'gd' => array(
-            'descrip' => 'GD Support',
-            'error' => 'You need either GD2 support in PHP, or an external driver like ImageMagick.  Either recompile PHP with GD2 support, or make sure that the path to ImageMagick\'s convert utility is set in horde/config/conf.php.'
-        ),
-        'imagick' => array(
-            'descrip' => 'Imagick Library',
-            'required' => false,
-            'error' => 'Ansel can make use of the Imagick Library, if it is installed on your system.  It is highly recommended to use either ImageMagick\'s convert utility or the Imagick php library for faster results.'
-        ),
         'libpuzzle' => array(
             'descrip' => 'Puzzle Library',
             'required' => false,
@@ -56,12 +47,7 @@ class Ansel_Test extends Horde_Test
      *
      * @var array
      */
-    protected $_pearList = array(
-        'MDB2' => array(
-            'required' => true,
-            'error' => 'You do not have the MDB2 package installed on your system. In addition to this package, you will need the appropriate MDB2_Driver package for your database backend.'
-        )
-    );
+    protected $_pearList = array();
 
     /**
      * Required configuration files.
diff --git a/horde/lib/Test.php b/horde/lib/Test.php
index e6b217c0b..1c852e2f6 100644
--- a/horde/lib/Test.php
+++ b/horde/lib/Test.php
@@ -73,7 +73,7 @@ class Horde_Test
         ),
         'gd' => array(
             'descrip' => 'GD Support',
-            'error' => 'Horde will use the GD extension to perform manipulations on image data. You can also use the ImageMagick software to do these manipulations instead.'
+            'error' => 'Horde will use the GD extension to perform manipulations on image data. You can also use either the ImageMagick software or Imagick extension to do these manipulations instead.'
         ),
         'gettext' => array(
             'descrip' => 'Gettext Support',
@@ -146,7 +146,7 @@ class Horde_Test
         ),
         'pdo' => array(
             'descrip' => 'PDO',
-            'error' => 'The PDO extension is required if you plan on using a database backend other than mysqli with Horde_Db.',
+            'error' => 'The PDO extension is required if you plan on using a database backend other than mysql or mysqli with Horde_Db.',
         ),
         'pgsql' => array(
             'descrip' => 'PostgreSQL Support',
diff --git a/kronolith/lib/Test.php b/kronolith/lib/Test.php
index 59d379cb9..9e4e41348 100644
--- a/kronolith/lib/Test.php
+++ b/kronolith/lib/Test.php
@@ -17,14 +17,7 @@ class Kronolith_Test extends Horde_Test
      *
      * @var array
      */
-    protected $_moduleList = array(
-        'mysqli' => array(
-            'descrip' => 'mysqli',
-            'error' => 'The tagging capabilites require either the PDO or mysqli extension.'),
-        'pdo' => array(
-            'descrip' => 'PDO',
-            'error' => 'The tagging capabilites require either the PDO or mysqli extension.')
-    );
+    protected $_moduleList = array();
 
     /**
      * PHP settings list.
diff --git a/turba/lib/Test.php b/turba/lib/Test.php
index ed713b4d6..26f1a095e 100644
--- a/turba/lib/Test.php
+++ b/turba/lib/Test.php
@@ -17,14 +17,7 @@ class Turba_Test extends Horde_Test
      *
      * @var array
      */
-    protected $_moduleList = array(
-        'mysql' => 'MySQL Support',
-        'pgsql' => 'PostgreSQL Support',
-        'mssql' => 'Microsoft SQL Support',
-        'oci8' => 'Oracle Support',
-        'odbc' => 'Unified ODBC Support',
-        'ldap' => 'LDAP Support'
-    );
+    protected $_moduleList = array();
 
     /**
      * PHP settings list.
-- 
2.11.0