Fix paths

diff --git a/framework/Crypt/test/Horde/Crypt/pgp.inc b/framework/Crypt/test/Horde/Crypt/pgp.inc
index 9e10eaf..ea02f31 100644 (file)
--- a/framework/Crypt/test/Horde/Crypt/pgp.inc
+++ b/framework/Crypt/test/Horde/Crypt/pgp.inc
@@ -3,16 +3,20 @@
  * @package Horde_Crypt
  */
 
+$filedir = dirname(__FILE__);
+
 require 'PEAR.php';
 require 'Horde/Util.php';
 require 'Horde/Browser.php';
-require dirname(__FILE__) . '/../Crypt/pgp.php';
+require $filedir . '/../../../lib/Horde/Crypt.php';
 
 $_SERVER['HTTPS'] = 'on';
 $browser = &Browser::singleton();
 
-$pgp = new Horde_Crypt_pgp(array('program' => '/usr/bin/gpg',
-                                 'temp' => Util::getTempDir()));
+$pgp = Horde_Crypt::factory('pgp', array(
+    'program' => '/usr/bin/gpg',
+    'temp' => Util::getTempDir()
+));
 
-$pubkey = file_get_contents(dirname(__FILE__) . '/fixtures/pgp_public.asc');
-$privkey = file_get_contents(dirname(__FILE__) . '/fixtures/pgp_private.asc');
+$pubkey = file_get_contents($filedir . '/fixtures/pgp_public.asc');
+$privkey = file_get_contents($filedir . '/fixtures/pgp_private.asc');

diff --git a/framework/Crypt/test/Horde/Crypt/smime.inc b/framework/Crypt/test/Horde/Crypt/smime.inc
index eb406af..fab7acd 100644 (file)
--- a/framework/Crypt/test/Horde/Crypt/smime.inc
+++ b/framework/Crypt/test/Horde/Crypt/smime.inc
@@ -6,6 +6,6 @@
 require 'PEAR.php';
 require 'Horde/String.php';
 require 'Horde/Util.php';
-require dirname(__FILE__) . '/../Crypt/smime.php';
+require dirname(__FILE__) . '/../../../lib/Horde/Crypt.php';
 
-$smime = new Horde_Crypt_smime(array('temp' => Util::getTempDir()));
+$smime = Horde_Crypt::factory('smime', array('temp' => Util::getTempDir()));