cellog Sat Sep 24 01:48:43 2005 EDT
Modified files:
/pear-core/tests/PEAR_Command_Package/convert/packagefiles
invalidv1.xml
/pear-core/tests/PEAR_Command_Package/convert test_fail.phpt
Log:
fix test - conversion is so much smarter, what used to fail does not fail any
longer.
add illogical role combos that do fail
http://cvs.php.net/diff.php/pear-core/tests/PEAR_Command_Package/convert/packagefiles/invalidv1.xml?r1=1.1&r2=1.2&ty=u
Index: pear-core/tests/PEAR_Command_Package/convert/packagefiles/invalidv1.xml
diff -u
pear-core/tests/PEAR_Command_Package/convert/packagefiles/invalidv1.xml:1.1
pear-core/tests/PEAR_Command_Package/convert/packagefiles/invalidv1.xml:1.2
--- pear-core/tests/PEAR_Command_Package/convert/packagefiles/invalidv1.xml:1.1
Mon Dec 27 01:57:12 2004
+++ pear-core/tests/PEAR_Command_Package/convert/packagefiles/invalidv1.xml
Sat Sep 24 01:48:42 2005
@@ -40,7 +40,7 @@
<file role="php" baseinstalldir="freeb"
md5sum="8332264d2e0e3c3091ebd6d8cee5d3a3" install-as="merbl.php" name="foo.php">
<replace from="@pv@" to="version" type="package-info"/>
</file>
- <file role="php" baseinstalldir="freeb" name="validv1.xml">
+ <file role="ext" baseinstalldir="freeb" name="validv1.xml">
<replace from="@pv@" to="version" type="package-info"/>
</file>
</filelist>
http://cvs.php.net/diff.php/pear-core/tests/PEAR_Command_Package/convert/test_fail.phpt?r1=1.3&r2=1.4&ty=u
Index: pear-core/tests/PEAR_Command_Package/convert/test_fail.phpt
diff -u pear-core/tests/PEAR_Command_Package/convert/test_fail.phpt:1.3
pear-core/tests/PEAR_Command_Package/convert/test_fail.phpt:1.4
--- pear-core/tests/PEAR_Command_Package/convert/test_fail.phpt:1.3 Fri Sep
23 12:26:23 2005
+++ pear-core/tests/PEAR_Command_Package/convert/test_fail.phpt Sat Sep 24
01:48:42 2005
@@ -18,12 +18,12 @@
$temp_path . DIRECTORY_SEPARATOR . 'nosummary.xml');
$e = $command->run('convert', array(), array($temp_path . DIRECTORY_SEPARATOR
. 'invalid.xml'));
$phpunit->assertErrors(array(
- array('package' => 'PEAR_PackageFile_v2', 'message' => 'Invalid tag order
in <extsrcrelease>, found <installconditions> expected one of "configureoption,
binarypackage, filelist"'),
+ array('package' => 'PEAR_PackageFile_v2', 'message' => 'File "validv1.xml"
in directory "<dir name="/">" has invalid role "ext", should be one of data,
doc, php, script, src, test'),
), 'invalid packagexml 1');
$phpunit->assertEquals(array (
0 =>
array (
- 'info' => 'Invalid tag order in <extsrcrelease>, found <installconditions>
expected one of "configureoption, binarypackage, filelist"',
+ 'info' => 'File "validv1.xml" in directory "<dir name="/">" has invalid
role "ext", should be one of data, doc, php, script, src, test',
'cmd' => 'no command',
),
1 =>
|
