fix up unit tests - registry was ridiculously out of date. Guess nobody ever runs...

diff --git a/pear/tests/pear1.phpt b/pear/tests/pear1.phpt
index 2961ff7284a4c3e25c2efc900281fd84f71db0f7..400a97ebd770f26b08f4c0ac5f049e08365ae083 100644 (file)
--- a/pear/tests/pear1.phpt
+++ b/pear/tests/pear1.phpt
@@ -1,7 +1,11 @@
 --TEST--
 PEAR constructor/destructor test
 --SKIPIF--
-skip
+<?php
+if (!getenv('PHP_PEAR_RUNTESTS')) {
+    echo 'skip';
+}
+?>
 --FILE--
 <?php
 

diff --git a/pear/tests/pear2.phpt b/pear/tests/pear2.phpt
index d5fc9770df704cbfd9c50a4ada5482064dfed500..a0174a19636f9a610bf38221965851f34b63d4f6 100644 (file)
--- a/pear/tests/pear2.phpt
+++ b/pear/tests/pear2.phpt
@@ -1,11 +1,15 @@
 --TEST--
 PEAR complete set/push/pop error-handling test (run from pear/tests dir)
 --SKIPIF--
-skip
+<?php
+if (!getenv('PHP_PEAR_RUNTESTS')) {
+    echo 'skip';
+}
+?>
 --FILE--
 <?php
 
-require_once "../PEAR.php";
+require_once "PEAR.php";
 
 class testErrorHandlingStatic {
     function doSetErrorHandlingFunction()

diff --git a/pear/tests/pear_common_buildProvidesArray.phpt b/pear/tests/pear_common_buildProvidesArray.phpt
index 8a747a26bdd969f803813a145512216822a90e2a..d76c3503e1c6135f60d46efbf0fe64f15314bf6d 100644 (file)
--- a/pear/tests/pear_common_buildProvidesArray.phpt
+++ b/pear/tests/pear_common_buildProvidesArray.phpt
@@ -1,5 +1,5 @@
 --TEST--
-PEAR_Common::analyzeSourceCode test
+PEAR_Common::buildProvidesArray test
 --SKIPIF--
 <?php
 if (!getenv('PHP_PEAR_RUNTESTS')) {

diff --git a/pear/tests/pear_common_infoFromString.phpt b/pear/tests/pear_common_infoFromString.phpt
index 1de1212bbd3e5bff5e771e20be899a1c2a951e12..fa45390afb5c2e7700195ea7684dabd4c905e725 100644 (file)
--- a/pear/tests/pear_common_infoFromString.phpt
+++ b/pear/tests/pear_common_infoFromString.phpt
@@ -1,5 +1,5 @@
 --TEST--
-PEAR_Common::analyzeSourceCode test
+PEAR_Common::infoFromString test
 --SKIPIF--
 <?php
 if (!getenv('PHP_PEAR_RUNTESTS')) {

diff --git a/pear/tests/pear_config.phpt b/pear/tests/pear_config.phpt
index 715dff1bb643bc31f9ec935dc432b74f9763651c..5bc00165b801195b7ab04c72e1303e7a932f87e5 100644 (file)
--- a/pear/tests/pear_config.phpt
+++ b/pear/tests/pear_config.phpt
@@ -11,7 +11,7 @@ if (!getenv('PHP_PEAR_RUNTESTS')) {
 
 error_reporting(E_ALL);
 chdir(dirname(__FILE__));
-include "../PEAR/Config.php";
+include "PEAR/Config.php";
 copy("system.input", "system.conf");
 copy("user.input", "user.conf");
 copy("user2.input", "user2.conf");
@@ -226,7 +226,7 @@ string(9) "directory"
 master_server: name of the main PEAR server
 
 #9 testing: getKeys
-bin_dir cache_dir cache_ttl data_dir doc_dir ext_dir http_proxy master_server password php_dir preferred_state sig_bin sig_keydir sig_type test_dir umask username verbose
+bin_dir cache_dir cache_ttl data_dir doc_dir ext_dir http_proxy master_server password php_bin php_dir preferred_state sig_bin sig_keydir sig_keyid sig_type test_dir umask username verbose
 
 #10 testing: definedBy
 string(7) "default"
@@ -251,10 +251,12 @@ ext_dir: File Locations
 http_proxy: Internet Access
 master_server: Internet Access
 password: Maintainers
+php_bin: File Locations (Advanced)
 php_dir: File Locations
 preferred_state: Advanced
 sig_bin: Maintainers
 sig_keydir: Maintainers
+sig_keyid: Maintainers
 sig_type: Maintainers
 test_dir: File Locations (Advanced)
 umask: Advanced
@@ -267,9 +269,9 @@ Advanced, File Locations, File Locations (Advanced), Internet Access, Maintainer
 #14 testing: getGroupKeys
 Advanced: cache_ttl, preferred_state, umask, verbose
 File Locations: bin_dir, doc_dir, ext_dir, php_dir
-File Locations (Advanced): cache_dir, data_dir, test_dir
+File Locations (Advanced): cache_dir, data_dir, php_bin, test_dir
 Internet Access: http_proxy, master_server
-Maintainers: password, sig_bin, sig_keydir, sig_type, username
+Maintainers: password, sig_bin, sig_keydir, sig_keyid, sig_type, username
 
 #15 testing: getPrompt
 bin_dir: PEAR executables directory
@@ -281,13 +283,15 @@ ext_dir: PHP extension directory
 http_proxy: HTTP Proxy Server Address
 master_server: PEAR server
 password: PEAR password (for maintainers)
+php_bin: PHP CLI/CGI binary
 php_dir: PEAR directory
 preferred_state: Preferred Package State
 sig_bin: Signature Handling Program
 sig_keydir: Signature Key Directory
+sig_keyid: Signature Key Id
 sig_type: Package Signature Type
 test_dir: PEAR test directory
 umask: Unix file mask
 username: PEAR username (for maintainers)
 verbose: Debug Log Level
-done
+done
\ No newline at end of file

diff --git a/pear/tests/pear_registry.phpt b/pear/tests/pear_registry.phpt
index b8237dfd2ccc7ba72a5b2a027e1559002e429a97..ebec1763fde40b97a6f296cdbaa3b7b47d98ab6c 100644 (file)
--- a/pear/tests/pear_registry.phpt
+++ b/pear/tests/pear_registry.phpt
@@ -75,7 +75,9 @@ dumpall($reg);
 $reg->updatePackage("pkg3", array("version" => "3.1b1", "status" => "beta"));
 dumpall($reg);
 
-print_r($reg->checkFilemap(array_merge($files3, $files2)));
+$testing = $reg->checkFilemap(array_merge($files3, $files2));
+$ok = ($testing == array('pkg3-1.php' => 'pkg3', 'pkg3' . DIRECTORY_SEPARATOR . 'pkg3-2.php' => 'pkg3'));
+echo 'filemap OK? ' . ($ok ? "yes\n" : "no\n");
 
 $reg->updatePackage("pkg3", array("filelist" => $files3_new));
 dumpall($reg);
@@ -160,11 +162,7 @@ dumping registry...
 pkg1: version="1.0" filelist=array(pkg1-1.php[role=php],pkg1-2.php[role=php,baseinstalldir=pkg1])
 pkg3: version="3.1b1" filelist=array(pkg3-1.php[role=php],pkg3-2.php[role=php,baseinstalldir=pkg3]) status="beta"
 dump done
-Array
-(
-    [pkg3-1.php] => pkg3
-    [pkg3/pkg3-2.php] => pkg3
-)
+filemap OK? yes
 dumping registry...
 pkg1: version="1.0" filelist=array(pkg1-1.php[role=php],pkg1-2.php[role=php,baseinstalldir=pkg1])
 pkg3: version="3.1b1" filelist=array(pkg3-3.php[role=php,baseinstalldir=pkg3],pkg3-4.php[role=php]) status="beta"