[limb-svn] r6013 - in 3.x/trunk/limb/tests_runner: src tests/cases
svn at limb-project.com
svn at limb-project.com
Mon Jun 25 18:14:35 MSD 2007
Author: pachanga
Date: 2007-06-25 18:14:34 +0400 (Mon, 25 Jun 2007)
New Revision: 6013
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6013
Modified:
3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php
3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php
Log:
-- adding support for .skip.php, it's a more readable alias of .ignore.php
-- adding broken test case for TR-11
Modified: 3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php 2007-06-24 21:39:10 UTC (rev 6012)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php 2007-06-25 14:14:34 UTC (rev 6013)
@@ -1,10 +1,10 @@
<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com
- * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
- * @license LGPL http://www.gnu.org/copyleft/lesser.html
+/*
+ * Limb PHP Framework
+ *
+ * @link http://limb-project.com
+ * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
+ * @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
require_once(dirname(__FILE__) . '/lmbTestGroup.class.php');
require_once(dirname(__FILE__) . '/lmbTestTreeNode.class.php');
@@ -14,14 +14,14 @@
require_once(dirname(__FILE__) . '/lmbTestTreePath.class.php');
@define('LIMB_TEST_RUNNER_FILE_FILTER', '*Test.class.php;*.test.php;*_test.php');
- at define('LIMB_TEST_RUNNER_CLASS_FORMAT', '%s.class.php');
-
+ at define('LIMB_TEST_RUNNER_CLASS_FORMAT', '%s.class.php');
+
/**
* class lmbTestTreeDirNode.
*
* @package tests_runner
* @version $Id$
- */
+ */
class lmbTestTreeDirNode extends lmbTestTreeNode
{
protected $dir;
@@ -75,7 +75,7 @@
function bootstrap()
{
- if($this->_shouldIgnoreDir())
+ if($this->_shouldSkipDir())
return false;
if(file_exists($this->dir . '/.init.php'))
@@ -160,13 +160,13 @@
return $clean_and_sorted;
}
- protected function _shouldIgnoreDir()
+ protected function _shouldSkipDir()
{
if(!is_null($this->ignored))
return $this->ignored;
- if(file_exists($this->dir . '/.ignore'))
- $this->ignored = true;
+ if(file_exists($this->dir . '/.skip.php'))
+ $this->ignored = (bool)include($this->dir . '/.skip.php');
elseif(file_exists($this->dir . '/.ignore.php'))
$this->ignored = (bool)include($this->dir . '/.ignore.php');
else
Modified: 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php 2007-06-24 21:39:10 UTC (rev 6012)
+++ 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php 2007-06-25 14:14:34 UTC (rev 6013)
@@ -1,10 +1,10 @@
<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com
- * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
- * @license LGPL http://www.gnu.org/copyleft/lesser.html
+/*
+ * Limb PHP Framework
+ *
+ * @link http://limb-project.com
+ * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
+ * @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
require_once(dirname(__FILE__) . '/../common.inc.php');
require_once(dirname(__FILE__) . '/../../src/lmbTestTreeDirNode.class.php');
@@ -284,7 +284,7 @@
}
- function testGetTestLabel()
+ function testUseExternalTestLabel()
{
file_put_contents($this->var_dir . '/.description', 'Foo');
@@ -370,7 +370,7 @@
$this->assertEqual($str, 'wow' . $test1->getClass());
}
- function testIgnoreTestsDirectory()
+ function testSkipTestsDirectory()
{
mkdir($this->var_dir . '/a');
mkdir($this->var_dir . '/a/b');
@@ -381,7 +381,7 @@
file_put_contents($this->var_dir . '/a/bar_test.php', $test1->generate());
file_put_contents($this->var_dir . '/a/b/foo_test.php', $test2->generate());
- touch($this->var_dir . '/a/b/.ignore');
+ file_put_contents($this->var_dir . '/a/b/.skip.php', '<?php return true; ?>');
$root_node = new lmbTestTreeDirNode($this->var_dir);
$group = $root_node->createTestGroup();
@@ -393,7 +393,7 @@
$this->assertEqual($str, $test1->getClass());
}
- function testIgnoreConditionalTrueTestsDirectory()
+ function testDontSkipTestsDirectory()
{
mkdir($this->var_dir . '/a');
mkdir($this->var_dir . '/a/b');
@@ -404,7 +404,7 @@
file_put_contents($this->var_dir . '/a/bar_test.php', $test1->generate());
file_put_contents($this->var_dir . '/a/b/foo_test.php', $test2->generate());
- file_put_contents($this->var_dir . '/a/b/.ignore.php', '<?php return true; ?>');
+ file_put_contents($this->var_dir . '/a/b/.skip.php', '<?php return false; ?>');
$root_node = new lmbTestTreeDirNode($this->var_dir);
$group = $root_node->createTestGroup();
@@ -413,22 +413,19 @@
$group->run(new SimpleReporter());
$str = ob_get_contents();
ob_end_clean();
- $this->assertEqual($str, $test1->getClass());
+ $this->assertEqual($str, $test2->getClass() . $test1->getClass());
}
- function testIgnoreConditionalFalseTestsDirectory()
+ function testSkippedDirFixtureSkippedToo()
{
mkdir($this->var_dir . '/a');
- mkdir($this->var_dir . '/a/b');
+ $test = new GeneratedTestClass();
- $test1 = new GeneratedTestClass();
- $test2 = new GeneratedTestClass();
+ file_put_contents($this->var_dir . '/a/.setup.php', '<?php echo "No!" ?>');
+ file_put_contents($this->var_dir . '/a/bar_test.php', $test->generate());
- file_put_contents($this->var_dir . '/a/bar_test.php', $test1->generate());
- file_put_contents($this->var_dir . '/a/b/foo_test.php', $test2->generate());
+ file_put_contents($this->var_dir . '/a/.skip.php', '<?php return true; ?>');
- file_put_contents($this->var_dir . '/a/b/.ignore.php', '<?php return false; ?>');
-
$root_node = new lmbTestTreeDirNode($this->var_dir);
$group = $root_node->createTestGroup();
@@ -436,19 +433,23 @@
$group->run(new SimpleReporter());
$str = ob_get_contents();
ob_end_clean();
- $this->assertEqual($str, $test2->getClass() . $test1->getClass());
+ $this->assertEqual($str, '');
}
- function testIgnoredDirFixtureIgnoredToo()
+ function testBootstrappingDoesntHappenIfDirIsSkipped()
{
mkdir($this->var_dir . '/a');
- $test = new GeneratedTestClass();
+ mkdir($this->var_dir . '/a/b');
- file_put_contents($this->var_dir . '/a/.setup.php', '<?php echo "No!" ?>');
- file_put_contents($this->var_dir . '/a/bar_test.php', $test->generate());
+ $test1 = new GeneratedTestClass();
+ $test2 = new GeneratedTestClass();
- file_put_contents($this->var_dir . '/a/.ignore.php', '<?php return true; ?>');
+ file_put_contents($this->var_dir . '/a/bar_test.php', $test1->generate());
+ file_put_contents($this->var_dir . '/a/b/foo_test.php', $test2->generate());
+ file_put_contents($this->var_dir . '/a/b/.init.php', '<?php echo "wow" ?>');
+ file_put_contents($this->var_dir . '/a/b/.skip.php', '<?php return true; ?>');
+
$root_node = new lmbTestTreeDirNode($this->var_dir);
$group = $root_node->createTestGroup();
@@ -456,10 +457,10 @@
$group->run(new SimpleReporter());
$str = ob_get_contents();
ob_end_clean();
- $this->assertEqual($str, '');
+ $this->assertEqual($str, $test1->getClass());
}
- function testBootstrappingDoesntHappenIfDirIsIgnored()
+ function testChildDirectoriesOfSkippedParentAreSkippedAsWell()
{
mkdir($this->var_dir . '/a');
mkdir($this->var_dir . '/a/b');
@@ -470,17 +471,16 @@
file_put_contents($this->var_dir . '/a/bar_test.php', $test1->generate());
file_put_contents($this->var_dir . '/a/b/foo_test.php', $test2->generate());
- file_put_contents($this->var_dir . '/a/b/.init.php', '<?php echo "wow" ?>');
- file_put_contents($this->var_dir . '/a/b/.ignore.php', '<?php return true; ?>');
+ file_put_contents($this->var_dir . '/a/.skip.php', '<?php return true; ?>');
- $root_node = new lmbTestTreeDirNode($this->var_dir);
+ $root_node = new lmbTestTreeDirNode($this->var_dir . '/a/b');
$group = $root_node->createTestGroup();
ob_start();
$group->run(new SimpleReporter());
$str = ob_get_contents();
ob_end_clean();
- $this->assertEqual($str, $test1->getClass());
+ $this->assertEqual($str, '');
}
}
More information about the limb-svn
mailing list