update to include all new unit tests and files

1 files changed, 132 insertions, 97 deletions

diff --git a/pear/tests/package-PEARtests.xml b/pear/tests/package-PEARtests.xml
index b1ac2b403a..b96fbe0dff 100644
--- a/pear/tests/package-PEARtests.xml
+++ b/pear/tests/package-PEARtests.xml
@@ -27,103 +27,131 @@
       <dep type="ext" rel="has">pcre</dep>
     </deps>
     <filelist>
-     <dir baseinstalldir="" name="/">
-      <dir name="dirtree">
-       <file role="test" name="package-fail.xml"/>
-       <file role="test" name="package.xml"/>
-       <file role="test" name="package2.xml"/>
-       <file role="test" name="pkg1-1.0.tgz"/>
-       <file role="test" name="pkg2-1.0.tgz"/>
-       <dir name="multiplepackages">
-        <file role="test" name="pkg1file.php"/>
-        <file role="test" name="pkg2file.php"/>
-       </dir> <!-- tests/dirtree/multiplepackages -->
-       <dir name="nestedroot">
-        <file role="test" name="rootfile.php"/>
-        <dir name="emptydir">
-         <file role="test" name="fakefile1.php"/>
-         <dir name="nesteddir">
-          <file role="test" name="nestedfile.php"/>
-         </dir> <!-- tests/dirtree/nestedroot/emptydir/nesteddir -->
-        </dir> <!-- tests/dirtree/nestedroot/emptydir -->
-       </dir> <!-- tests/dirtree/nestedroot -->
-       <dir name="pkg1">
-        <file role="test" name="randomfile.php"/>
-       </dir> <!-- tests/dirtree/pkg1 -->
-      </dir> <!-- tests/dirtree -->
-      <dir name="PEAR_ErrorStack">
-       <file role="test" name="base_regression.php"/>
-       <file role="test" name="Error_Stack_TestCase_getErrorMessage.php"/>
-       <file role="test" name="Error_Stack_TestCase_getErrorMessageTemplate.php"/>
-       <file role="test" name="Error_Stack_TestCase_getErrors.php"/>
-       <file role="test" name="Error_Stack_TestCase_pushpop.php"/>
-       <file role="test" name="Error_Stack_TestCase_pushpopcallback.php"/>
-       <file role="test" name="Error_Stack_TestCase_pushpopstatic.php"/>
-       <file role="test" name="Error_Stack_TestCase_singleton.php"/>
-       <file role="test" name="Error_Stack_TestCase_staticGetErrors.php"/>
-       <file role="test" name="HTML_TestListener.php"/>
-       <file role="test" name="stylesheet.css"/>
-       <file role="test" name="testsuite.php"/>
-       <file role="test" name="TestUnit.php"/>
-      </dir> <!-- tests/PEAR_ErrorStack -->
-      <dir name="test-pkg6">
-       <file role="test" name="invalidtgz.tgz"/>
-       <file role="test" name="nopackagexml.tgz"/>
-       <file role="test" name="package.xml"/>
-       <file role="test" name="pkg6-1.1.tgz"/>
-       <file role="test" name="pkg6-2.0b1.tgz"/>
-       <file role="test" name="zoorb.php"/>
-       <dir name="goompness">
-        <file role="test" name="Mopreeb.php"/>
-        <file role="test" name="oggbrzitzkee.php"/>
-       </dir> <!-- test-pkg6/goompness -->
-      </dir> <!-- test-pkg6 -->
-      <file role="test" name="common_sortPkgDeps1_package.xml"/>
-      <file role="test" name="common_sortPkgDeps2_package.xml"/>
-      <file role="test" name="common_sortPkgDeps3_package.xml"/>
-      <file role="test" name="common_sortPkgDeps4_package.xml"/>
-      <file role="test" name="common_sortPkgDeps5_package.xml"/>
-      <file role="test" name="common_sortPkgDeps6_package.xml"/>
-      <file role="test" name="merge.input"/>
-      <file role="test" name="pear1.phpt"/>
-      <file role="test" name="pear2.phpt"/>
-      <file role="test" name="pear_autoloader.phpt"/>
-      <file role="test" name="pear_common_analyzeSC.phpt"/>
-      <file role="test" name="pear_common_buildProvidesArray.phpt"/>
-      <file role="test" name="pear_common_downloadHttp.phpt"/>
-      <file role="test" name="pear_common_infoFromString.phpt"/>
-      <file role="test" name="pear_common_sortPkgDeps.phpt"/>
-      <file role="test" name="pear_common_validPackageVersion.phpt"/>
-      <file role="test" name="pear_config.phpt"/>
-      <file role="test" name="pear_dependency_checkExtension.phpt"/>
-      <file role="test" name="pear_dependency_checkPackage.phpt"/>
-      <file role="test" name="pear_dependency_checkPackageUninstall.phpt"/>
-      <file role="test" name="pear_downloader_invalid.phpt"/>
-      <file role="test" name="pear_downloader_new.phpt"/>
-      <file role="test" name="pear_downloader_old.phpt"/>
-      <file role="test" name="pear_error.phpt"/>
-      <file role="test" name="pear_error2.phpt"/>
-      <file role="test" name="pear_error3.phpt"/>
-      <file role="test" name="pear_error4.phpt"/>
-      <file role="test" name="pear_installer1.phpt"/>
-      <file role="test" name="pear_installer2.phpt"/>
-      <file role="test" name="pear_installer3.phpt"/>
-      <file role="test" name="pear_installer4.phpt"/>
-      <file role="test" name="pear_installer5.phpt"/>
-      <file role="test" name="pear_packager.phpt"/>
-      <file role="test" name="pear_registry.phpt"/>
-      <file role="test" name="pear_system.phpt"/>
-      <file role="test" name="php.ini"/>
-      <file role="test" name="runtests.php">
-       <replace from="@PHPBIN@" to="php_bin" type="pear-config"/>
-      </file>
-      <file role="test" name="system.input"/>
-      <file role="test" name="testdownload.tgz"/>
-      <file role="test" name="toonew.conf"/>
-      <file role="test" name="user.input"/>
-      <file role="test" name="user2.input"/>
-     </dir> <!-- / -->
-   </filelist>
+      <dir baseinstalldir="PEAR" name="/">
+       <dir name="dirtree">
+        <file role="test" name="package-fail.xml"/>
+        <file role="test" name="package.xml"/>
+        <file role="test" name="package2.xml"/>
+        <file role="test" name="pkg1-1.0.tgz"/>
+        <file role="test" name="pkg2-1.0.tgz"/>
+        <dir name="multiplepackages">
+         <file role="test" name="pkg1file.php"/>
+         <file role="test" name="pkg2file.php"/>
+        </dir> <!-- dirtree/multiplepackages -->
+        <dir name="nestedroot">
+         <file role="test" name="rootfile.php"/>
+         <dir name="emptydir">
+          <file role="test" name="fakefile1.php"/>
+          <dir name="nesteddir">
+           <file role="test" name="nestedfile.php"/>
+          </dir> <!-- dirtree/nestedroot/emptydir/nesteddir -->
+         </dir> <!-- dirtree/nestedroot/emptydir -->
+        </dir> <!-- dirtree/nestedroot -->
+        <dir name="pkg1">
+         <file role="test" name="randomfile.php"/>
+        </dir> <!-- dirtree/pkg1 -->
+       </dir> <!-- dirtree -->
+       <dir name="PEAR_ErrorStack">
+        <file role="test" name="base_regression.php"/>
+        <file role="test" name="Error_Stack_TestCase_getErrorMessage.php"/>
+        <file role="test" name="Error_Stack_TestCase_getErrorMessageTemplate.php"/>
+        <file role="test" name="Error_Stack_TestCase_getErrors.php"/>
+        <file role="test" name="Error_Stack_TestCase_pushpop.php"/>
+        <file role="test" name="Error_Stack_TestCase_pushpopcallback.php"/>
+        <file role="test" name="Error_Stack_TestCase_pushpopstatic.php"/>
+        <file role="test" name="Error_Stack_TestCase_singleton.php"/>
+        <file role="test" name="Error_Stack_TestCase_staticGetErrors.php"/>
+        <file role="test" name="HTML_TestListener.php"/>
+        <file role="test" name="stylesheet.css"/>
+        <file role="test" name="testsuite.php"/>
+        <file role="test" name="TestUnit.php"/>
+       </dir> <!-- PEAR_ErrorStack -->
+       <dir name="test-pkg6">
+        <file role="test" name="conflictpackage.xml"/>
+        <file role="test" name="invalidtgz.tgz"/>
+        <file role="test" name="nopackagexml.tgz"/>
+        <file role="test" name="package.xml"/>
+        <file role="test" name="pkg6-1.1.tgz"/>
+        <file role="test" name="pkg6-2.0b1.tgz"/>
+        <file role="test" name="zoorb.php"/>
+        <dir name="goompness">
+         <file role="test" name="Mopreeb.php"/>
+         <file role="test" name="oggbrzitzkee.php"/>
+         <file role="test" name="test.dat"/>
+        </dir> <!-- test-pkg6/goompness -->
+       </dir> <!-- test-pkg6 -->
+       <file role="test" name="common_sortPkgDeps1_package.xml"/>
+       <file role="test" name="common_sortPkgDeps2_package.xml"/>
+       <file role="test" name="common_sortPkgDeps3_package.xml"/>
+       <file role="test" name="common_sortPkgDeps4_package.xml"/>
+       <file role="test" name="common_sortPkgDeps5_package.xml"/>
+       <file role="test" name="common_sortPkgDeps6_package.xml"/>
+       <file role="test" name="depnoreleases-1.0.tgz"/>
+       <file role="test" name="depunstable-1.0.tgz"/>
+       <file role="test" name="download_test.config.inc"/>
+       <file role="test" name="download_test_classes.php.inc"/>
+       <file role="test" name="merge.input"/>
+       <file role="test" name="merge2.input"/>
+       <file role="test" name="pear1.phpt"/>
+       <file role="test" name="pear2.phpt"/>
+       <file role="test" name="pear_autoloader.phpt"/>
+       <file role="test" name="pear_channelfile.phpt"/>
+       <file role="test" name="pear_common_analyzeSC.phpt"/>
+       <file role="test" name="pear_common_buildProvidesArray.phpt"/>
+       <file role="test" name="pear_common_downloadHttp.phpt"/>
+       <file role="test" name="pear_common_infoFromString.phpt"/>
+       <file role="test" name="pear_common_sortPkgDeps.phpt"/>
+       <file role="test" name="pear_common_validPackageVersion.phpt"/>
+       <file role="test" name="pear_config.phpt"/>
+       <file role="test" name="pear_config_1.1.phpt"/>
+       <file role="test" name="pear_dependency_checkExtension.phpt"/>
+       <file role="test" name="pear_dependency_checkPackage.phpt"/>
+       <file role="test" name="pear_dependency_checkPackageUninstall.phpt"/>
+       <file role="test" name="pear_downloader_invalid.phpt"/>
+       <file role="test" name="pear_downloader_new.phpt"/>
+       <file role="test" name="pear_downloader_old.phpt"/>
+       <file role="test" name="pear_error.phpt"/>
+       <file role="test" name="pear_error2.phpt"/>
+       <file role="test" name="pear_error3.phpt"/>
+       <file role="test" name="pear_error4.phpt"/>
+       <file role="test" name="pear_installer1.phpt"/>
+       <file role="test" name="pear_installer2.phpt"/>
+       <file role="test" name="pear_installer3.phpt"/>
+       <file role="test" name="pear_installer4.phpt"/>
+       <file role="test" name="pear_installer5.phpt"/>
+       <file role="test" name="pear_installer_installFile_channels.phpt"/>
+       <file role="test" name="pear_installer_install_channels.phpt"/>
+       <file role="test" name="pear_packager.phpt"/>
+       <file role="test" name="pear_registry.phpt"/>
+       <file role="test" name="pear_registry_1.1.phpt"/>
+       <file role="test" name="pear_system.phpt"/>
+       <file role="test" name="PEAR_test_mock_pearweb.php.inc"/>
+       <file role="test" name="php.ini"/>
+       <file role="test" name="php_dump.php.inc"/>
+       <file role="test" name="pkg1-1.1.tgz"/>
+       <file role="test" name="pkg1-2.0b1.tgz"/>
+       <file role="test" name="pkg2-1.1.tgz"/>
+       <file role="test" name="pkg3-1.1.tgz"/>
+       <file role="test" name="pkg3-1.4.tgz"/>
+       <file role="test" name="pkg4-1.1.tgz"/>
+       <file role="test" name="pkg4AndAHalf-1.3.tgz"/>
+       <file role="test" name="pkg5-1.1.tgz"/>
+       <file role="test" name="stabilitytoolow-0.3.tgz"/>
+       <file role="test" name="stabilitytoolow-0.5.tgz"/>
+       <file role="test" name="stabilitytoolow-0.6beta.tgz"/>
+       <file role="test" name="stabilitytoolow-1.0b1.tgz"/>
+       <file role="test" name="stabilitytoolow-2.0a1.tgz"/>
+       <file role="test" name="stabilitytoolow-2.0b1.tgz"/>
+       <file role="test" name="stabilitytoolow-2.0dev.tgz"/>
+       <file role="test" name="stabilitytoolow-3.0dev.tgz"/>
+       <file role="test" name="system.input"/>
+       <file role="test" name="testdownload.tgz"/>
+       <file role="test" name="toonew.conf"/>
+       <file role="test" name="user.input"/>
+       <file role="test" name="user2.input"/>
+       <file role="test" name="user3.input"/>
+      </dir> <!-- / -->
+    </filelist>
   </release>
   <changelog>
     <release>
@@ -133,5 +161,12 @@
       <state>stable</state>
       <notes>Installation package.xml for PEAR package tests</notes>
     </release>
+    <release>
+      <version>2.0</version>
+      <date>2004-06-01</date>
+      <license>PHP License</license>
+      <state>stable</state>
+      <notes>Installation package.xml for PEAR package tests</notes>
+    </release>
   </changelog>
 </package>