cellog Tue Jan 11 00:04:59 2005 EDT
Modified files:
/pear-core/tests/PEAR_Downloader/analyzeDependencies
test_analyzeDependencies_valid_1.0.phpt
Log:
upgrade test to use new pearweb stuff
http://cvs.php.net/diff.php/pear-core/tests/PEAR_Downloader/analyzeDependencies/test_analyzeDependencies_valid_1.0.phpt?r1=1.1&r2=1.2&ty=u
Index:
pear-core/tests/PEAR_Downloader/analyzeDependencies/test_analyzeDependencies_valid_1.0.phpt
diff -u
pear-core/tests/PEAR_Downloader/analyzeDependencies/test_analyzeDependencies_valid_1.0.phpt:1.1
pear-core/tests/PEAR_Downloader/analyzeDependencies/test_analyzeDependencies_valid_1.0.phpt:1.2
---
pear-core/tests/PEAR_Downloader/analyzeDependencies/test_analyzeDependencies_valid_1.0.phpt:1.1
Thu Oct 21 13:25:09 2004
+++
pear-core/tests/PEAR_Downloader/analyzeDependencies/test_analyzeDependencies_valid_1.0.phpt
Tue Jan 11 00:04:59 2005
@@ -23,94 +23,164 @@
array(array('package' => 'mainold', 'channel' => 'pear.php.net'),
'stable'),
array('version' => '1.1',
'info' =>
- array(
- 'channel' => 'pear.php.net',
- 'package' => 'mainold',
- 'license' => 'PHP License',
- 'summary' => 'Main Package',
- 'description' => 'Main Package',
- 'releasedate' => '2003-12-06 00:26:42',
- 'state' => 'stable',
- 'xsdversion' => '1.0',
- 'deps' =>
- array(
- array(
- 'type' => 'pkg',
- 'rel' => 'ge',
- 'name' => 'optional',
- 'version' => '1.1',
- 'optional' => 'yes',
- ),
- array(
- 'type' => 'pkg',
- 'rel' => 'ge',
- 'name' => 'required',
- 'version' => '1.1',
- )
- ),
- ),
+ '<?xml version="1.0"?>
+<package version="1.0">
+ <name>mainold</name>
+ <summary>Main Package</summary>
+ <description>Main Package</description>
+ <maintainers>
+ <maintainer>
+ <name>Greg Beaver</name>
+ <role>lead</role>
+ <user>cellog</user>
+ <email>cellog@xxxxxxx</email>
+ </maintainer>
+ </maintainers>
+ <date>2004-09-30</date>
+ <release>
+ <version>1.1</version>
+ <state>stable</state>
+ <license>PHP License</license>
+ <notes>test</notes>
+ <filelist>
+ <dir name="/">
+ <file baseinstalldir="/" name="main.php" role="php" />
+ </dir> <!-- / -->
+ </filelist>
+ <deps>
+ <dep type="pkg" name="optional" version="1.1" rel="ge" optional="yes"/>
+ <dep type="pkg" name="required" version="1.1" rel="ge"/>
+ </deps>
+ </release>
+</package>',
'url' => 'http://www.example.com/mainold-1.1'));
$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net',
'package.getDepDownloadURL',
array('1.0', array(
'type' =>
"pkg",
- 'rel' =>
- "ge",
'name' =>
- "required",
+ "optional",
'version' =>
"1.1",
+ 'rel' =>
+ "ge",
+ 'optional' =>
+ "yes",
'channel' =>
"pear.php.net",
'package' =>
- "required",
+ "optional",
),
array('channel' => 'pear.php.net', 'package' => 'mainold', 'version'
=> '1.1'), 'stable'),
array('version' => '1.1',
'info' =>
- array(
- 'channel' => 'pear.php.net',
- 'package' => 'optional',
- 'license' => 'PHP License',
- 'summary' => 'Required Package',
- 'description' => 'Required Package',
- 'releasedate' => '2003-12-06 00:26:42',
- 'state' => 'stable',
- 'apiversion' => '1.0',
- 'xsdversion' => '2.0',
- ),
- 'url' => 'http://www.example.com/required-1.1'));
+ '<?xml version="1.0"?>
+<package version="2.0" xmlns="http://pear.php.net/dtd/package-2.0";
xmlns:tasks="http://pear.php.net/dtd/tasks-1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+http://pear.php.net/dtd/tasks-1.0.xsd
+http://pear.php.net/dtd/package-2.0
+http://pear.php.net/dtd/package-2.0.xsd";>
+ <name>optional</name>
+ <channel>pear.php.net</channel>
+ <summary>Main Package</summary>
+ <description>Main Package</description>
+ <lead>
+ <name>Greg Beaver</name>
+ <user>cellog</user>
+ <email>cellog@xxxxxxx</email>
+ <active>yes</active>
+ </lead>
+ <date>2004-09-30</date>
+ <version>
+ <release>1.1</release>
+ <api>1.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.php.net/license/3_0.txt";>PHP License</license>
+ <notes>test</notes>
+ <contents>
+ <dir name="/">
+ <file baseinstalldir="/" name="main.php" role="php" />
+ </dir> <!-- / -->
+ </contents>
+ <dependencies>
+ <required>
+ <php>
+ <min>4.2</min>
+ <max>6.0.0</max>
+ </php>
+ <pearinstaller>
+ <min>1.4.0dev13</min>
+ </pearinstaller>
+ </required>
+ </dependencies>
+ <phprelease/>
+</package>',
+ 'url' => 'http://www.example.com/optional-1.1'));
$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net',
'package.getDepDownloadURL',
array('1.0', array(
'type' =>
"pkg",
- 'rel' =>
- "ge",
'name' =>
- "optional",
+ "required",
'version' =>
"1.1",
- 'optional' =>
- "yes",
+ 'rel' =>
+ "ge",
'channel' =>
"pear.php.net",
'package' =>
- "optional",
+ "required",
),
array('channel' => 'pear.php.net', 'package' => 'mainold', 'version'
=> '1.1'), 'stable'),
array('version' => '1.1',
'info' =>
- array(
- 'channel' => 'pear.php.net',
- 'package' => 'required',
- 'license' => 'PHP License',
- 'summary' => 'Required Package',
- 'description' => 'Required Package',
- 'releasedate' => '2003-12-06 00:26:42',
- 'state' => 'stable',
- 'apiversion' => '1.0',
- 'xsdversion' => '2.0',
- ),
+ '<?xml version="1.0"?>
+<package version="2.0" xmlns="http://pear.php.net/dtd/package-2.0";
xmlns:tasks="http://pear.php.net/dtd/tasks-1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+http://pear.php.net/dtd/tasks-1.0.xsd
+http://pear.php.net/dtd/package-2.0
+http://pear.php.net/dtd/package-2.0.xsd";>
+ <name>required</name>
+ <channel>pear.php.net</channel>
+ <summary>Main Package</summary>
+ <description>Main Package</description>
+ <lead>
+ <name>Greg Beaver</name>
+ <user>cellog</user>
+ <email>cellog@xxxxxxx</email>
+ <active>yes</active>
+ </lead>
+ <date>2004-09-30</date>
+ <version>
+ <release>1.1</release>
+ <api>1.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.php.net/license/3_0.txt";>PHP License</license>
+ <notes>test</notes>
+ <contents>
+ <dir name="/">
+ <file baseinstalldir="/" name="main.php" role="php" />
+ </dir> <!-- / -->
+ </contents>
+ <dependencies>
+ <required>
+ <php>
+ <min>4.2</min>
+ <max>6.0.0</max>
+ </php>
+ <pearinstaller>
+ <min>1.4.0dev13</min>
+ </pearinstaller>
+ </required>
+ </dependencies>
+ <phprelease/>
+</package>',
'url' => 'http://www.example.com/required-1.1'));
$dp = &newFakeDownloaderPackage(array('alldeps' => true));
$result = $dp->initialize('mainold');
@@ -123,7 +193,12 @@
$err = $dp->_downloader->analyzeDependencies($params);
$phpunit->assertNoErrors('end');
-$phpunit->assertEquals(array(), $fakelog->getLog(), 'end log');
+$phpunit->assertEquals(array(
+ array (
+ 0 => 3,
+ 1 => '+ tmp dir created at ' . $dp->_downloader->getDownloadDir(),
+ ),
+), $fakelog->getLog(), 'end log');
$phpunit->assertEquals(array(), $fakelog->getDownload(), 'end download');
echo 'tests done';
?>
--
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
