use fake pearweb - now anyone can run the download unit tests.

These tests require channels to pass

3 files changed, 90 insertions, 52 deletions

diff --git a/pear/tests/pear_downloader_invalid.phpt b/pear/tests/pear_downloader_invalid.phpt
index 3dc7b51764..22f61e92ad 100644
--- a/pear/tests/pear_downloader_invalid.phpt
+++ b/pear/tests/pear_downloader_invalid.phpt
@@ -68,6 +68,9 @@ if (!empty($home)) {
     putenv('HOME="'.$temp_path);
 }
 require_once "PEAR/Downloader.php";
+require_once 'PEAR/Installer.php';
+require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'php_dump.php';
+require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'download_test_classes.php.inc';
 
 // no UI is needed for these tests
 $ui = false;
@@ -90,38 +93,46 @@ function catchit($err)
 }
 
 $config = &PEAR_Config::singleton();
+// initialize fake pear channel
+require_once 'PEAR/ChannelFile.php';
+$chan = new PEAR_ChannelFile;
+$chan->setName('pear');
+$chan->setSummary('PEAR');
+$chan->setServer($server);
+$chan->setDefaultPEARProtocols();
+$reg = new PEAR_Registry($config->get('php_dir'), $chan);
 $options = array();
-$installer = &new PEAR_Downloader($ui, $options, $config);
+$installer = &new test_PEAR_Downloader($ui, $options, $config);
 
 echo "-=-=-=-=-=-=-=-=- Failure Tests -=-=-=-=-=-=-=-=-=-=-\n";
 
 echo "Test invalid package name:\n";
 $packages = array("/invalid+packagename");
-$a = $installer->download($packages);
+$a = $installer->doDownload($packages);
 $installpackages = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs(), $installpackages);
 
 echo "Test download of a package with no releases:\n";
 $packages = array("noreleases");
-$a = $installer->download($packages);
+$a = $installer->doDownload($packages);
 $installpackages = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs(), $installpackages);
 
 echo "Test download of a non-existing package version:\n";
 $packages = array("pkg1-1976.9.2");
-$a = $installer->download($packages);
+$a = $installer->doDownload($packages);
 $installpackages = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs(), $installpackages);
 
 echo "Test download of a non-existing package release state:\n";
 $packages = array("pkg1-snapshot");
-$a = $installer->download($packages);
+$a = $installer->doDownload($packages);
 $installpackages = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs(), $installpackages);
 
 echo "Test download of invalid release state:\n";
 $packages = array("pkg1-burgerking");
-$a = $installer->download($packages);
+$a = $installer->doDownload($packages);
 $installpackages = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs(), $installpackages);
 
@@ -129,14 +140,14 @@ $installer->configSet('preferred_state', 'stable');
 
 echo "Test automatic version resolution (stable):\n";
 $packages = array("stabilitytoolow");
-$a = $installer->download($packages);
+$a = $installer->doDownload($packages);
 $installpackages = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs(), $installpackages);
 
 echo "Test automatic version resolution (stable) with --force:\n";
 $packages = array("stabilitytoolow");
 $installer->setOptions(array('force' => true));
-$a = $installer->download($packages);
+$a = $installer->doDownload($packages);
 $installpackages = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs(), $installpackages[0]['info']['version']);
 
@@ -144,7 +155,7 @@ $installer->configSet('preferred_state', 'beta');
 
 echo "Test automatic version resolution (beta):\n";
 $packages = array("stabilitytoolow");
-$a = $installer->download($packages);
+$a = $installer->doDownload($packages);
 $installpackages = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs(), $installpackages[0]['info']['version']);
 
@@ -152,7 +163,7 @@ $installer->configSet('preferred_state', 'alpha');
 
 echo "Test automatic version resolution (alpha):\n";
 $packages = array("stabilitytoolow");
-$a = $installer->download($packages);
+$a = $installer->doDownload($packages);
 $installpackages = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs(), $installpackages[0]['info']['version']);
 
@@ -160,27 +171,27 @@ $installer->configSet('preferred_state', 'devel');
 
 echo "Test automatic version resolution (devel):\n";
 $packages = array("stabilitytoolow");
-$a = $installer->download($packages);
+$a = $installer->doDownload($packages);
 $installpackages = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs(), $installpackages[0]['info']['version']);
 
 echo "Test download attempt if a version is already installed:\n";
 
-require_once 'PEAR/Installer.php';
-$install = &new PEAR_Installer($ui);
+$forinstall = &new PEAR_Installer($ui);
+$forinstall->setOptions(array());
 $installer->setOptions(array());
 
-$installer->download(array('pkg6'));
-$pkgs = $installer->getDownloadedPackages();
-$install->install($pkgs[0]['file']);
-$installer->download(array('pkg6'));
+$forinstall->doDownload(array('pkg6'));
+$pkgs = $forinstall->getDownloadedPackages();
+$forinstall->install($pkgs[0]['file']);
+$installer->doDownload(array('pkg6'));
 var_dump(get_class($a), $installer->getErrorMsgs());
 
 echo "Test download attempt if a version is already installed with --force:\n";
 
 $installer->setOptions(array('force' => true));
 
-$installer->download(array('pkg6'));
+$installer->doDownload(array('pkg6'));
 $pkgs = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs(), $pkgs[0]['info']['version']);
 
@@ -188,7 +199,7 @@ echo "Test download attempt if a version is already installed with upgrade, same
 
 $installer->setOptions(array('upgrade' => true));
 
-$installer->download(array('pkg6'));
+$installer->doDownload(array('pkg6'));
 $pkgs = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs());
 
@@ -196,7 +207,7 @@ echo "Test download attempt if a version is already installed with upgrade, less
 
 $installer->setOptions(array('upgrade' => true));
 
-$installer->download(array('pkg6-1.1'));
+$installer->doDownload(array('pkg6-1.1'));
 $pkgs = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs());
 
@@ -204,7 +215,7 @@ echo "Test download attempt with --alldeps, but dependency has no releases:\n";
 
 $installer->setOptions(array('alldeps' => true));
 
-$installer->download(array('depnoreleases'));
+$installer->doDownload(array('depnoreleases'));
 $pkgs = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs());
 
@@ -212,7 +223,7 @@ echo "Test download attempt with --onlyreqdeps, but dependency has no releases:\
 
 $installer->setOptions(array('onlyreqdeps' => true));
 
-$installer->download(array('depnoreleases'));
+$installer->doDownload(array('depnoreleases'));
 $pkgs = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs());
 
@@ -220,7 +231,7 @@ $installer->configSet('preferred_state', 'stable');
 echo "Test download attempt with --alldeps, but dependency is too unstable:\n";
 $installer->setOptions(array('alldeps' => true));
 
-$installer->download(array('depunstable'));
+$installer->doDownload(array('depunstable'));
 $pkgs = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs());
 
@@ -228,12 +239,16 @@ echo "Test download attempt with --onlyreqdeps, but dependency is too unstable:\
 
 $installer->setOptions(array('onlyreqdeps' => true));
 
-$installer->download(array('depunstable'));
+$installer->doDownload(array('depunstable'));
 $pkgs = $installer->getDownloadedPackages();
 var_dump(get_class($a), $installer->getErrorMsgs());
 
 chdir($curdir);
 cleanall($temp_path);
+
+//echo implode("\n", array_values($GLOBALS['totalPHP']));
+
+
 // ------------------------------------------------------------------------- //
 
 function cleanall($dir)
@@ -263,21 +278,21 @@ array(0) {
 array(0) {
 }
 Test download of a package with no releases:
-Caught error: No releases found for package 'noreleases'
+Caught error: No releases found for package 'pear::noreleases'
 string(10) "pear_error"
 array(0) {
 }
 array(0) {
 }
 Test download of a non-existing package version:
-Caught error: No release with version '1976.9.2' found for 'pkg1'
+Caught error: No release with version '1976.9.2' found for 'pear::pkg1'
 string(10) "pear_error"
 array(0) {
 }
 array(0) {
 }
 Test download of a non-existing package release state:
-Caught error: No release with state 'snapshot' found for 'pkg1'
+Caught error: No release with state 'snapshot' found for 'pear::pkg1'
 string(10) "pear_error"
 array(0) {
 }
@@ -291,14 +306,14 @@ array(0) {
 array(0) {
 }
 Test automatic version resolution (stable):
-Caught error: No release with state equal to: 'stable' found for 'stabilitytoolow'
+Caught error: No release with state equal to: 'stable' found for 'pear::stabilitytoolow'
 string(10) "pear_error"
 array(0) {
 }
 array(0) {
 }
 Test automatic version resolution (stable) with --force:
-Warning: stabilitytoolow is state 'devel' which is less stable than state 'stable'
+Warning: pear::stabilitytoolow is state 'devel' which is less stable than state 'stable'
 bool(false)
 array(0) {
 }
@@ -319,7 +334,7 @@ array(0) {
 }
 string(6) "3.0dev"
 Test download attempt if a version is already installed:
-Package 'pkg6' already installed, skipping
+Package 'pear::pkg6' already installed, skipping
 bool(false)
 array(0) {
 }
@@ -329,12 +344,12 @@ array(0) {
 }
 string(5) "2.0b1"
 Test download attempt if a version is already installed with upgrade, same version:
-Package 'pkg6-2.0b1' already installed, skipping
+Package 'pear::pkg6-2.0b1' already installed, skipping
 bool(false)
 array(0) {
 }
 Test download attempt if a version is already installed with upgrade, lesser version:
-Package 'pkg6' version '2.0b1'  is installed and 2.0b1 is > requested '1.1', skipping
+Package 'pear::pkg6' version '2.0b1'  is installed and 2.0b1 is > requested '1.1', skipping
 bool(false)
 array(0) {
 }
@@ -342,23 +357,23 @@ Test download attempt with --alldeps, but dependency has no releases:
 bool(false)
 array(1) {
   [0]=>
-  string(63) "Package 'depnoreleases' dependency 'noreleases' has no releases"
+  string(75) "Package 'pear::depnoreleases' dependency 'pear::noreleases' has no releases"
 }
 Test download attempt with --onlyreqdeps, but dependency has no releases:
 bool(false)
 array(1) {
   [0]=>
-  string(63) "Package 'depnoreleases' dependency 'noreleases' has no releases"
+  string(75) "Package 'pear::depnoreleases' dependency 'pear::noreleases' has no releases"
 }
 Test download attempt with --alldeps, but dependency is too unstable:
 bool(false)
 array(1) {
   [0]=>
-  string(91) "Release for 'depunstable' dependency 'stabilitytoolow' has state 'devel', requires 'stable'"
+  string(103) "Release for 'pear::depunstable' dependency 'pear::stabilitytoolow' has state 'devel', requires 'stable'"
 }
 Test download attempt with --onlyreqdeps, but dependency is too unstable:
 bool(false)
 array(1) {
   [0]=>
-  string(91) "Release for 'depunstable' dependency 'stabilitytoolow' has state 'devel', requires 'stable'"
+  string(103) "Release for 'pear::depunstable' dependency 'pear::stabilitytoolow' has state 'devel', requires 'stable'"
 }
\ No newline at end of file
diff --git a/pear/tests/pear_downloader_new.phpt b/pear/tests/pear_downloader_new.phpt
index 8913f14ceb..bcbbf026a5 100644
--- a/pear/tests/pear_downloader_new.phpt
+++ b/pear/tests/pear_downloader_new.phpt
@@ -68,6 +68,7 @@ if (!empty($home)) {
     putenv('HOME="'.$temp_path);
 }
 require_once "PEAR/Downloader.php";
+require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'download_test_classes.php.inc';
 
 // no UI is needed for these tests
 $ui = false;
@@ -92,9 +93,18 @@ function catchit($err)
 echo "Test simple direct url download:\n";
 
 $config = &PEAR_Config::singleton();
+// initialize fake pear channel
+require_once 'PEAR/ChannelFile.php';
+$chan = new PEAR_ChannelFile;
+$chan->setName('pear');
+$chan->setSummary('PEAR');
+$chan->setServer($server);
+$chan->setDefaultPEARProtocols();
+
+$reg = new PEAR_Registry($config->get('php_dir'), $chan);
 $packages = array("http://$server/get/pkg6-1.1.tgz");
 $options = array();
-$installer = &new PEAR_Downloader($ui, $options, $config);
+$installer = &new test_PEAR_Downloader($ui, $options, $config);
 $a = $installer->download($packages);
 $installpackages = $installer->getDownloadedPackages();
 var_dump($a, $installer->getErrorMsgs());
@@ -193,7 +203,7 @@ unset($installpackages[0]['file']);
 echo "\n================Test --alldeps\nTest preferred_state = stable\n";
 $installer->configSet('preferred_state', 'stable');
 
-$installer = &new PEAR_Downloader($ui, array('alldeps' => true), $config);
+$installer = &new test_PEAR_Downloader($ui, array('alldeps' => true), $config);
 $packages = array("http://$server/get/pkg1-1.1.tgz");
 $a = $installer->download($packages);
 $installpackages = $installer->getDownloadedPackages();
@@ -237,7 +247,7 @@ foreach ($installpackages as $package) {
 echo "\n================Test --onlyreqdeps\nTest preferred_state = stable\n";
 $config->set('preferred_state', 'stable');
 
-$installer = &new PEAR_Downloader($ui, array('onlyreqdeps' => true), $config);
+$installer = &new test_PEAR_Downloader($ui, array('onlyreqdeps' => true), $config);
 $packages = array("http://$server/get/pkg1-1.1.tgz");
 $a = $installer->download($packages);
 $installpackages = $installer->getDownloadedPackages();
@@ -319,7 +329,7 @@ array(1) {
       array(0) {
       }
       ["filelist"]=>
-      &array(3) {
+      array(3) {
         ["zoorb.php"]=>
         array(2) {
           ["role"]=>
@@ -351,7 +361,7 @@ array(1) {
       ["maintainers"]=>
       array(1) {
         [0]=>
-        &array(4) {
+        array(4) {
           ["handle"]=>
           string(8) "fakeuser"
           ["name"]=>
@@ -392,7 +402,7 @@ array(1) {
       array(0) {
       }
       ["filelist"]=>
-      &array(3) {
+      array(3) {
         ["zoorb.php"]=>
         array(2) {
           ["role"]=>
@@ -424,7 +434,7 @@ array(1) {
       ["maintainers"]=>
       array(1) {
         [0]=>
-        &array(4) {
+        array(4) {
           ["handle"]=>
           string(8) "fakeuser"
           ["name"]=>
@@ -555,7 +565,7 @@ pkg4-1.1
 pkg5-1.1
 pkg6-2.0b1
 Test preferred_state = alpha:
-skipping Package 'pkg3' optional dependency 'pkg4AndAHalf'
+skipping Package 'pear::pkg3' optional dependency 'pear::pkg4AndAHalf'
 NULL
 array(0) {
 }
diff --git a/pear/tests/pear_downloader_old.phpt b/pear/tests/pear_downloader_old.phpt
index d682213c19..6e7225f44b 100644
--- a/pear/tests/pear_downloader_old.phpt
+++ b/pear/tests/pear_downloader_old.phpt
@@ -8,7 +8,10 @@ if (!getenv('PHP_PEAR_RUNTESTS')) {
 ?>
 --FILE--
 <?php
-
+if (!defined('PATH_SEPARATOR')) {
+    define('PATH_SEPARATOR', (DIRECTORY_SEPARATOR == '/') ? ':' : ';');
+}
+ini_set('include_path', dirname(__FILE__) . PATH_SEPARATOR . ini_get('include_path'));
 $server = 'pear.Chiara';
 //$server = 'test.pear.php.net';
 $temp_path = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'testinstallertemp';
@@ -68,10 +71,11 @@ if (!empty($home)) {
     putenv('HOME="'.$temp_path);
 }
 require_once "PEAR/Installer.php";
-
+require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'download_test_classes.php.inc';
+//echo 1;
 // no UI is needed for these tests
 $ui = false;
-$installer = new PEAR_Installer($ui);
+$installer = new test_PEAR_Installer($ui);
 $curdir = getcwd();
 chdir(dirname(__FILE__));
 
@@ -109,6 +113,14 @@ function catchit($err)
 echo "Test simple direct url download:\n";
 
 $config = &PEAR_Config::singleton();
+// initialize fake pear channel
+require_once 'PEAR/ChannelFile.php';
+$chan = new PEAR_ChannelFile;
+$chan->setName('pear');
+$chan->setSummary('PEAR');
+$chan->setServer($server);
+$chan->setDefaultPEARProtocols();
+$reg = new PEAR_Registry($config->get('php_dir'), $chan);
 $packages = array("http://$server/get/pkg6-1.1.tgz");
 $a = $installer->download($packages, array(), &$config, &$installpackages, &$errors);
 var_dump($a, $errors);
@@ -287,6 +299,7 @@ foreach ($installpackages as $package) {
 
 chdir($curdir);
 cleanall($temp_path);
+
 /*
 echo "File exists? ";
 echo (is_file($installpackages[0]['file'])) ? "yes\n" : "no\n";
@@ -334,7 +347,7 @@ array(1) {
       array(0) {
       }
       ["filelist"]=>
-      &array(3) {
+      array(3) {
         ["zoorb.php"]=>
         array(2) {
           ["role"]=>
@@ -366,7 +379,7 @@ array(1) {
       ["maintainers"]=>
       array(1) {
         [0]=>
-        &array(4) {
+        array(4) {
           ["handle"]=>
           string(8) "fakeuser"
           ["name"]=>
@@ -408,7 +421,7 @@ array(1) {
       array(0) {
       }
       ["filelist"]=>
-      &array(3) {
+      array(3) {
         ["zoorb.php"]=>
         array(2) {
           ["role"]=>
@@ -440,7 +453,7 @@ array(1) {
       ["maintainers"]=>
       array(1) {
         [0]=>
-        &array(4) {
+        array(4) {
           ["handle"]=>
           string(8) "fakeuser"
           ["name"]=>
@@ -582,7 +595,7 @@ pkg4-1.1
 pkg5-1.1
 pkg6-2.0b1
 Test preferred_state = alpha:
-skipping Package 'pkg3' optional dependency 'pkg4AndAHalf'
+skipping Package 'pear::pkg3' optional dependency 'pear::pkg4AndAHalf'
 Warning: PEAR Warning: PEAR_Installer::download() is deprecated in favor of PEAR_Downloader class
 NULL
 array(0) {