phpunit-compare - Add support for CSV output

diff --git a/Civi/CiUtil/Command/CompareCommand.php b/Civi/CiUtil/Command/CompareCommand.php
index 44ee0dac2ad8466a21ec50450e0d031c97758859..4e22e6788a16e94e4db32791145598453af9fec8 100644 (file)
--- a/Civi/CiUtil/Command/CompareCommand.php
+++ b/Civi/CiUtil/Command/CompareCommand.php
@@ -5,11 +5,12 @@ class CompareCommand {
   static function main($argv) {
     if (empty($argv[1])) {
       echo "summary: Compares the output of different test runs\n";
-      echo "usage: phpunit-compare [--phpunit-json|--jenkins-xml] <file1> <file2>...\n";
+      echo "usage: phpunit-compare [--out=txt|csv] [--phpunit-json|--jenkins-xml] <file1> <file2>...\n";
       exit(1);
     }
 
     $parser = array('\Civi\CiUtil\PHPUnitParser', 'parseJsonResults');
+    $printerType = 'txt';
     $suites = array(); // array('file' => string, 'results' => array)
     for ($i = 1; $i < count($argv); $i++) {
       switch ($argv[$i]) {
@@ -19,6 +20,12 @@ class CompareCommand {
         case '--jenkins-xml':
           $parser = array('\Civi\CiUtil\JenkinsParser', 'parseXmlResults');
           break;
+        case '--out=txt':
+          $printerType = 'txt';
+          break;
+        case '--out=csv':
+          $printerType = 'csv';
+          break;
         default:
           $suites[] = array(
             'file' => $argv[$i],
@@ -36,7 +43,11 @@ class CompareCommand {
     }
     sort($tests);
 
-    $printer = new \Civi\CiUtil\ComparisonPrinter(\Civi\CiUtil\Arrays::collect($suites, 'file'));
+    if ($printerType == 'csv') {
+      $printer = new \Civi\CiUtil\CsvPrinter('php://stdout', \Civi\CiUtil\Arrays::collect($suites, 'file'));
+    } else {
+      $printer = new \Civi\CiUtil\ComparisonPrinter(\Civi\CiUtil\Arrays::collect($suites, 'file'));
+    }
     foreach ($tests as $test) {
       $values = array();
       foreach ($suites as $suite) {

diff --git a/Civi/CiUtil/CsvPrinter.php b/Civi/CiUtil/CsvPrinter.php
new file mode 100644 (file)
index 0000000..9cab44a
--- /dev/null
+++ b/Civi/CiUtil/CsvPrinter.php
@@ -0,0 +1,32 @@
+<?php
+namespace Civi\CiUtil;
+
+class CsvPrinter {
+  var $file;
+  var $headers;
+  var $hasHeader = FALSE;
+
+  function __construct($file, $headers) {
+    $this->file = fopen($file, "w");
+    $this->headers = $headers;
+  }
+
+  function printHeader() {
+    if ($this->hasHeader) {
+      return;
+    }
+
+    $headers = array_values($this->headers);
+    array_unshift($headers, 'TEST NAME');
+    fputcsv($this->file, $headers);
+
+    $this->hasHeader = TRUE;
+  }
+
+  function printRow($test, $values) {
+    $this->printHeader();
+    $row = $values;
+    array_unshift($row, $test);
+    fputcsv($this->file, $row);
+  }
+}
\ No newline at end of file