Changeset 19522

Timestamp:

06/24/09 21:57:30 (8 months ago)

Author:

fabien

Message:

[1.3] added --xml and --trace options to test:* tasks

Files:

• branches/1.3/WHATS_NEW (modified) (1 diff)
• branches/1.3/lib/autoload/sfCoreAutoload.class.php (modified) (1 diff)
• branches/1.3/lib/task/symfony/sfSymfonyTestTask.class.php (modified) (2 diffs)
• branches/1.3/lib/task/test/sfTestAllTask.class.php (modified) (4 diffs)
• branches/1.3/lib/task/test/sfTestBaseTask.class.php (added)
• branches/1.3/lib/task/test/sfTestFunctionalTask.class.php (modified) (5 diffs)
• branches/1.3/lib/task/test/sfTestUnitTask.class.php (modified) (5 diffs)
• branches/1.3/test/other/fixtures/test/functional/result-harness.txt (modified) (1 diff)
• branches/1.3/test/other/fixtures/test/result-harness.txt (modified) (1 diff)

branches/1.3/WHATS_NEW

@@ -211 +211 @@
-    end();
-
+### JUnit Compatible XML Output
+
+The test tasks are now able to output a JUnit compatible XML file by using the
+`--xml` option:
+
+    $ php symfony test:all --xml=log.xml
+
+### Easy Debugging
+
+To ease the debugging when a test harness reports failed tests, you can now
+pass the `--trace` option to have a detailed output about the failures:
+
+    $ php symfony test:all -t
+
-Tasks
------

branches/1.3/lib/autoload/sfCoreAutoload.class.php

@@ -410 +410 @@
-    'sfsymfonytesttask' => 'task/symfony/sfSymfonyTestTask.class.php',
-    'sftestalltask' => 'task/test/sfTestAllTask.class.php',
+    'sftestbasetask' => 'task/test/sfTestBaseTask.class.php',
-    'sftestcoveragetask' => 'task/test/sfTestCoverageTask.class.php',
-    'sftestfunctionaltask' => 'task/test/sfTestFunctionalTask.class.php',

branches/1.3/lib/task/symfony/sfSymfonyTestTask.class.php

@@ -27 +27 @@
-      new sfCommandOption('update-autoloader', 'u', sfCommandOption::PARAMETER_NONE, 'Update the sfCoreAutoload class'),
-      new sfCommandOption('only-failed', 'f', sfCommandOption::PARAMETER_NONE, 'Only run tests that failed last time'),
+      new sfCommandOption('xml', null, sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
-    ));
-
@@ -105 +106 @@
-    file_put_contents($statusFile, serialize($h->get_failed_files()));
-
+    if ($options['trace'])
+    {
+      $this->outputHarnessTrace($h);
+    }
+
+    if ($options['xml'])
+    {
+      file_put_contents($options['xml'], $h->to_xml());
+    }
+
-    return $ret;
-  }
+
+  // master is at sfTestBaseTask
+  /**
+   * @see sfTestBaseTask::outputHarnessTrace()
+   */
+  protected function outputHarnessTrace(lime_harness $h)
+  {
+    $xml = new SimpleXMLElement($h->to_xml());
+    foreach ($xml as $testsuite)
+    {
+      if ($testsuite['failures'])
+      {
+        $new = true;
+
+        foreach ($testsuite->testcase as $testcase)
+        {
+          foreach ($testcase->failure as $failure)
+          {
+            if ($new)
+            {
+              $this->log('');
+              $this->log($this->formatter->format($testsuite['file'], 'ERROR'));
+              $new = false;
+            }
+
+            $this->log($this->formatter->format(sprintf('  at %s line %s', $testcase['file'], $testcase['line']), 'COMMENT'));
+            $this->log($this->formatter->format('  '.$testcase['name'], 'INFO'));
+            $this->log($failure);
+          }
+        }
+      }
+    }
+  }
-}

branches/1.3/lib/task/test/sfTestAllTask.class.php

@@ -17 +17 @@
- * @version    SVN: $Id$
- */
-
+Test
-{
-  /**
@@ -26 +26 @@
-    $this->addOptions(array(
-      new sfCommandOption('only-failed', 'f', sfCommandOption::PARAMETER_NONE, 'Only run tests that failed last time'),
+    ));
+
+    $this->addOptions(array(
+      new sfCommandOption('xml', null, sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
-    ));
-
@@ -40 +44 @@
-The task launches all tests found in [test/|COMMENT].
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-EOF;
-  }
@@ -83 +108 @@
-    file_put_contents($statusFile, serialize($h->get_failed_files()));
-
+    if ($options['trace'])
+    {
+      $this->outputHarnessTrace($h);
+    }
+
+    if ($options['xml'])
+    {
+      file_put_contents($options['xml'], $h->to_xml());
+    }
+
-    return $ret;
-  }

branches/1.3/lib/task/test/sfTestFunctionalTask.class.php

@@ -17 +17 @@
- * @version    SVN: $Id$
- */
-
+Test
-{
-  /**
@@ -27 +27 @@
-      new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-      new sfCommandArgument('controller', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'The controller name'),
+    ));
+
+    $this->addOptions(array(
+      new sfCommandOption('xml', null, sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
-    ));
-
@@ -42 +46 @@
-The task launches all tests found in [test/functional/%application%|COMMENT].
-
+If some tests fail, you can use the [--trace|COMMENT] option to have more
+information about the failures:
+
+    [./symfony test:functional frontend -t|INFO]
+
-You can launch all functional tests for a specific controller by
-giving a controller name:
@@ -50 +59 @@
-
-  [./symfony test:functional frontend article comment|INFO]
+
+The task can output a JUnit compatible XML log file with the [--xml|COMMENT]
+options:
+
+  [./symfony test:functional --xml=log.xml|INFO]
-EOF;
-  }
@@ -82 +96 @@
-      $h->register($finder->in($h->base_dir));
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }

branches/1.3/lib/task/test/sfTestUnitTask.class.php

@@ -17 +17 @@
- * @version    SVN: $Id$
- */
-
+Test
-{
-  /**
@@ -26 +26 @@
-    $this->addArguments(array(
-      new sfCommandArgument('name', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'The test name'),
+    ));
+
+    $this->addOptions(array(
+      new sfCommandOption('xml', null, sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
-    ));
-
@@ -40 +44 @@
-The task launches all tests found in [test/unit|COMMENT].
-
+If some tests fail, you can use the [--trace|COMMENT] option to have more
+information about the failures:
+
+    [./symfony test:unit -t|INFO]
+
-You can launch unit tests for a specific name:
-
@@ -47 +56 @@
-
-  [./symfony test:unit strtolower strtoupper|INFO]
+
+The task can output a JUnit compatible XML log file with the [--xml|COMMENT]
+options:
+
+  [./symfony test:unit --xml=log.xml|INFO]
-EOF;
-  }
@@ -77 +91 @@
-      $h->register($finder->in($h->base_dir));
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }

branches/1.3/test/other/fixtures/test/functional/result-harness.txt

@@ -4 +4 @@
-Failed Test                     Stat  Total   Fail  List of Failed
-------------------------------------------------------------------
-1
+4
-Failed 1/2 test scripts, 50.00% okay. 1/8 subtests failed, 87.50% okay.

branches/1.3/test/other/fixtures/test/result-harness.txt

@@ -5 +5 @@
-Failed Test                     Stat  Total   Fail  List of Failed
-------------------------------------------------------------------
-1
+4
-Failed 1/3 test scripts, 66.67% okay. 1/9 subtests failed, 88.89% okay.