Permalink
Browse files

All test working. Only rest PEAR test

  • Loading branch information...
1 parent 813d87f commit 27838b2d5b8bc9c7d206562e13db5e364c87e9d0 @clbustos committed May 31, 2010
Showing with 19 additions and 12 deletions.
  1. +9 −3 package2.xml
  2. +6 −5 tests/BeautifierBugsTest.php
  3. +4 −4 tests/BeautifierCommonTest.php
View
@@ -154,13 +154,13 @@
</file>
</dir> <!-- /scripts -->
<dir name="tests">
- <file baseinstalldir="PHP" name="BeautifierBugs.php" role="test">
+ <file baseinstalldir="PHP" name="BeautifierBugsTest.php" role="test">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file baseinstalldir="PHP" name="BeautifierCommon.php" role="test">
+ <file baseinstalldir="PHP" name="BeautifierCommonTest.php" role="test">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file baseinstalldir="PHP" name="BeautifierInternal.php" role="test">
+ <file baseinstalldir="PHP" name="BeautifierInternalTest.php" role="test">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file baseinstalldir="PHP" name="BeautifierTest.php" role="test">
@@ -208,6 +208,12 @@
</extension>
</required>
<optional>
+ <package>
+ <name>PHP_DocBlockGenerator</name>
+ <channel>pear.php.net</channel>
+ <min>1</min>
+ <exclude>1</exclude>
+ </package>
<package>
<name>Console_Getopt</name>
<channel>pear.php.net</channel>
@@ -1074,18 +1074,19 @@ function testBug14396() {
*/
function testBug14537() {
- if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+ if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
$sText = <<<SCRIPT
<?php
-namespace MyTestnamespace.someSubNS; use OtherNamespace::ClassA; use AnotherNamespace::Class1 as Class2; ?>
+namespace MyTestnamespace\someSubNS; use OtherNamespace\ClassA; use AnotherNamespace\Class1 as Class2;
+?>
SCRIPT;
$this->setText($sText);
$sExpected = <<<SCRIPT
<?php
-namespace MyTestnamespace.someSubNS;
-use OtherNamespace::ClassA;
-use AnotherNamespace::Class1 as Class2;
+namespace MyTestnamespace\someSubNS;
+use OtherNamespace\ClassA;
+use AnotherNamespace\Class1 as Class2;
?>
SCRIPT;
$this->assertEquals($sExpected, $this->oBeaut->get());
@@ -31,17 +31,17 @@ function testgetFilesByPattern()
{
$sDir = PHP_Beautifier_Common::normalizeDir(dirname(__FILE__));
$aExpected = array(
- $sDir.'Beautifier.phpt'
+ $sDir.'BeautifierTest.php'
);
- $this->assertEquals($aExpected, PHP_Beautifier_Common::getFilesByPattern($sDir, 'Beautifier\.....', false));
+ $this->assertEquals($aExpected, PHP_Beautifier_Common::getFilesByPattern($sDir, 'BeautifierTest\....', false));
}
function testgetFilesByGlob()
{
$sDir = PHP_Beautifier_Common::normalizeDir(dirname(__FILE__));
$aExpected = array(
- $sDir.'Beautifier_Common.phpt'
+ $sDir.'BeautifierCommonTest.php'
);
- $this->assertEquals($aExpected, PHP_Beautifier_Common::getFilesByGlob($sDir.basename(__FILE__, '.phpt') .'.????', false));
+ $this->assertEquals($aExpected, PHP_Beautifier_Common::getFilesByGlob($sDir.basename(__FILE__, '.php') .'.???', false));
}
function testWsToString() {
$this->assertEquals(' \t\r\n',PHP_Beautifier_Common::wsToString(" \t\r\n"));

0 comments on commit 27838b2

Please sign in to comment.