[limb-svn] r6709 - in 3.x/trunk/limb/tests_runner: src tests/cases

[svn at limb-project.com]

Author: pachanga
Date: 2008-01-20 22:06:51 +0300 (Sun, 20 Jan 2008)
New Revision: 6709
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6709

Modified:
   3.x/trunk/limb/tests_runner/src/lmbTestGetopt.class.php
   3.x/trunk/limb/tests_runner/src/lmbTestShellUI.class.php
   3.x/trunk/limb/tests_runner/src/lmbTestTreeNode.class.php
   3.x/trunk/limb/tests_runner/src/lmbTestTreeShallowDirNode.class.php
   3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php
Log:
-- removing obsolete init() stuff\ 
-- lmbTestGetopt now extracts constants from command line arguments list

Modified: 3.x/trunk/limb/tests_runner/src/lmbTestGetopt.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestGetopt.class.php	2008-01-19 15:28:28 UTC (rev 6708)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestGetopt.class.php	2008-01-20 19:06:51 UTC (rev 6709)
@@ -90,14 +90,18 @@
         return lmbTestGetopt::doGetopt(1, $args, $short_options, $long_options);
     }
 
-    function defineConstants($argv)
+    function defineAndExtractConstants(&$argv)
     {
         for($i=0;$i<sizeof($argv);$i++) {
           if(preg_match('~^[A-Z_][A-Z0-9_]+$~', $argv[$i])) {
             @define($argv[$i], $argv[$i+1]);
+            unset($argv[$i]);
+            unset($argv[$i+1]);
+            $i++;
           }
           elseif(preg_match('~^([A-Z_][A-Z0-9_]+)=(.*)$~', $argv[$i], $m)) {
             @define($m[1], $m[2]);
+            unset($argv[$i]);
           }
         }
     }

Modified: 3.x/trunk/limb/tests_runner/src/lmbTestShellUI.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestShellUI.class.php	2008-01-19 15:28:28 UTC (rev 6708)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestShellUI.class.php	2008-01-20 19:06:51 UTC (rev 6709)
@@ -60,6 +60,8 @@
   Advanced SimpleTest unit tests runner. Finds and executes unit tests within filesystem.
 Arguments:
   <file|dir> [<file1|dir1>, ... <fileN|dirN>] - a list of files/directories, globs are supported(e.g. '*')
+  KEY1=value1 [KEY2=value2, ... KEYN=valueN]  - a list of arbitrary key=value pairs which will be declared 
+                                                as constants using PHP define call
 Options:
   -h, --help                        Displays this help and exit
   -c, --config=/file.php            PHP configuration file path
@@ -147,6 +149,8 @@
     $short_opts = self :: getShortOpts();
     $long_opts = self :: getLongOpts();
 
+    lmbTestGetopt :: defineAndExtractConstants($this->argv);
+
     try
     {
       if($this->posix_opts)
@@ -159,8 +163,6 @@
       $this->_help(1);
     }
 
-    lmbTestGetopt :: defineConstants($this->argv);
-
     $config_file = null;
     $cover_include = '';
     $cover_exclude = '';

Modified: 3.x/trunk/limb/tests_runner/src/lmbTestTreeNode.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestTreeNode.class.php	2008-01-19 15:28:28 UTC (rev 6708)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestTreeNode.class.php	2008-01-20 19:06:51 UTC (rev 6709)
@@ -103,8 +103,6 @@
     return false;
   }
 
-  function init(){}
-
   function getTestLabel()
   {
     return 'Test Group';
@@ -131,7 +129,6 @@
     {
       if($child->isSkipped())
         continue;
-      $child->init();//obsolete stuff
       $test->addTestCase($child->createTestCase(false));
     }
     return $test;

Modified: 3.x/trunk/limb/tests_runner/src/lmbTestTreeShallowDirNode.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestTreeShallowDirNode.class.php	2008-01-19 15:28:28 UTC (rev 6708)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestTreeShallowDirNode.class.php	2008-01-20 19:06:51 UTC (rev 6709)
@@ -49,13 +49,6 @@
     return $this->dir;
   }
 
-  function init()
-  {
-    //deprecated
-    if(file_exists($this->dir . '/.init.php'))
-      include_once($this->dir . '/.init.php');
-  }
-
   function getTestLabel()
   {
     if(file_exists($this->dir . '/.description'))

Modified: 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php	2008-01-19 15:28:28 UTC (rev 6708)
+++ 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php	2008-01-20 19:06:51 UTC (rev 6709)
@@ -157,19 +157,6 @@
     $this->assertEqual($group->getLabel(), 'Group test in "' . $this->var_dir . '"');
   }
 
-  function testInit()
-  {
-    file_put_contents($this->var_dir . '/.init.php', '<?php echo "hey!"; ?>');
-
-    $node = new lmbTestTreeDirNode($this->var_dir);
-
-    ob_start();
-    $group = $node->init();
-    $str = ob_get_contents();
-    ob_end_clean();
-    $this->assertEqual($str, "hey!");
-  }
-
   function testSkipTestsDirectory()
   {
     mkdir($this->var_dir . '/a');
@@ -206,25 +193,6 @@
     $this->_runNodeAndAssertOutput($root_node, $test2->getOutput() . $test1->getOutput());
   }
 
-  function testInitDoesntHappenIfDirIsSkipped()
-  {
-    mkdir($this->var_dir . '/a');
-    mkdir($this->var_dir . '/a/b');
-
-    $test1 = new GeneratedTestClass();
-    $test2 = new GeneratedTestClass();
-
-    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/.skipif.php', '<?php return true; ?>');
-
-    $root_node = new lmbTestTreeDirNode($this->var_dir);
-
-    $this->_runNodeAndAssertOutput($root_node, $test1->getOutput());
-  }
-
   function testSkippedDirFixtureSkippedToo()
   {
     mkdir($this->var_dir . '/a');