logo       
Google Custom Search
    AddThis Social Bookmark Button
<prev   next>
-->

r556 - in /phpunit/branches: 3.1/PHPUnit/Util/Log/PDO.php 3.2/PHPUnit/Util/: msg#00112

Subject: r556 - in /phpunit/branches: 3.1/PHPUnit/Util/Log/PDO.php 3.2/PHPUnit/Util/Log/PDO.php 
Author: sb
Date: Mon Feb 26 09:45:01 2007
New Revision: 556

URL: http://www.phpunit.de/changeset/556
Log:
- Store test result code.
- Define default values for the test.test_result, test.test_message,
  and test.test_execution_time columns.

Modified:
    phpunit/branches/3.1/PHPUnit/Util/Log/PDO.php
    phpunit/branches/3.2/PHPUnit/Util/Log/PDO.php

Modified: phpunit/branches/3.1/PHPUnit/Util/Log/PDO.php
URL: 
http://www.phpunit.de/file/phpunit/branches/3.1/PHPUnit/Util/Log/PDO.php?rev=556
==============================================================================
--- phpunit/branches/3.1/PHPUnit/Util/Log/PDO.php (original)
+++ phpunit/branches/3.1/PHPUnit/Util/Log/PDO.php Mon Feb 26 09:45:01 2007
@@ -45,6 +45,7 @@
  */
 
 require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/Runner/BaseTestRunner.php';
 require_once 'PHPUnit/Util/Class.php';
 require_once 'PHPUnit/Util/CodeCoverage.php';
 require_once 'PHPUnit/Util/Filesystem.php';
@@ -78,13 +79,15 @@
   run_id              INTEGER UNSIGNED NOT NULL REFERENCES run.run_id,
   test_id             INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
   test_name           CHAR(128)        NOT NULL,
-  test_result         TEXT             NOT NULL,
-  test_execution_time FLOAT   UNSIGNED NOT NULL,
+  test_result         TINYINT UNSIGNED NOT NULL DEFAULT 0,
+  test_message        TEXT             NOT NULL DEFAULT "",
+  test_execution_time FLOAT   UNSIGNED NOT NULL DEFAULT 0,
   node_root           INTEGER UNSIGNED NOT NULL,
   node_left           INTEGER UNSIGNED NOT NULL,
   node_right          INTEGER UNSIGNED NOT NULL,
 
   INDEX (run_id),
+  INDEX (test_result),
   INDEX (node_root),
   INDEX (node_left),
   INDEX (node_right)
@@ -149,14 +152,16 @@
   run_id              INTEGER,
   test_id             INTEGER PRIMARY KEY AUTOINCREMENT,
   test_name           TEXT,
-  test_result         TEXT,
-  test_execution_time REAL,
+  test_result         INTEGER DEFAULT 0,
+  test_message        TEXT    DEFAULT "",
+  test_execution_time REAL    DEFAULT 0,
   node_root           INTEGER,
   node_left           INTEGER,
   node_right          INTEGER
 );
 
 CREATE INDEX IF NOT EXISTS test_run_id     ON test (run_id);
+CREATE INDEX IF NOT EXISTS test_result     ON test (test_result);
 CREATE INDEX IF NOT EXISTS test_node_root  ON test (node_root);
 CREATE INDEX IF NOT EXISTS test_node_left  ON test (node_left);
 CREATE INDEX IF NOT EXISTS test_node_right ON test (node_right);
@@ -289,8 +294,9 @@
     {
         $this->insertNode(
           $test,
-          'Error: ' . $e->getMessage(),
-          $time
+          PHPUnit_Runner_BaseTestRunner::STATUS_ERROR,
+          $time,
+          $e->getMessage()
         );
 
         $this->currentTestSuccess = FALSE;
@@ -308,8 +314,9 @@
     {
         $this->insertNode(
           $test,
-          'Failure: ' . $e->getMessage(),
-          $time
+          PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE,
+          $time,
+          $e->getMessage()
         );
 
         $this->currentTestSuccess = FALSE;
@@ -327,8 +334,9 @@
     {
         $this->insertNode(
           $test,
-          'Incomplete: ' . $e->getMessage(),
-          $time
+          PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE,
+          $time,
+          $e->getMessage()
         );
 
         $this->currentTestSuccess = FALSE;
@@ -346,8 +354,9 @@
     {
         $this->insertNode(
           $test,
-          'Skipped: ' . $e->getMessage(),
-          $time
+          PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED,
+          $time,
+          $e->getMessage()
         );
 
         $this->currentTestSuccess = FALSE;
@@ -404,7 +413,9 @@
     public function endTest(PHPUnit_Framework_Test $test, $time)
     {
         if ($this->currentTestSuccess) {
-            $this->insertNode($test, 'OK', $time);
+            $this->insertNode(
+              $test, PHPUnit_Runner_BaseTestRunner::STATUS_PASSED, $time
+            );
         }
     }
 
@@ -579,13 +590,14 @@
      * Inserts a node into the tree.
      *
      * @param  PHPUnit_Framework_Test $test
-     * @param  string                 $result
+     * @param  integer                $result
      * @param  float                  $time
+     * @param  string                 $message
      * @return integer
      * @throws PDOException
      * @access protected
      */
-    protected function insertNode(PHPUnit_Framework_Test $test, $result = '', 
$time = 0)
+    protected function insertNode(PHPUnit_Framework_Test $test, $result = 
PHPUnit_Runner_BaseTestRunner::STATUS_PASSED, $time = 0, $message = '')
     {
         $right = $this->right[count($this->right)-1];
 
@@ -618,13 +630,14 @@
         $this->dbh->query(
           sprintf(
             'INSERT INTO test
-                         (run_id, test_name, test_result, test_execution_time,
-                          node_root, node_left, node_right)
-                   VALUES(%d, "%s", "%s", %f, %d, %d, %d);',
+                         (run_id, test_name, test_result, test_message,
+                          test_execution_time, node_root, node_left, 
node_right)
+                   VALUES(%d, "%s", %d, "%s", %f, %d, %d, %d);',
 
             $this->runId,
             $test->getName(),
             $result,
+            $message,
             $time,
             $this->rootId,
             $right,

Modified: phpunit/branches/3.2/PHPUnit/Util/Log/PDO.php
URL: 
http://www.phpunit.de/file/phpunit/branches/3.2/PHPUnit/Util/Log/PDO.php?rev=556
==============================================================================
--- phpunit/branches/3.2/PHPUnit/Util/Log/PDO.php (original)
+++ phpunit/branches/3.2/PHPUnit/Util/Log/PDO.php Mon Feb 26 09:45:01 2007
@@ -45,6 +45,7 @@
  */
 
 require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/Runner/BaseTestRunner.php';
 require_once 'PHPUnit/Util/Class.php';
 require_once 'PHPUnit/Util/CodeCoverage.php';
 require_once 'PHPUnit/Util/Filesystem.php';
@@ -78,13 +79,15 @@
   run_id              INTEGER UNSIGNED NOT NULL REFERENCES run.run_id,
   test_id             INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
   test_name           CHAR(128)        NOT NULL,
-  test_result         TEXT             NOT NULL,
-  test_execution_time FLOAT   UNSIGNED NOT NULL,
+  test_result         TINYINT UNSIGNED NOT NULL DEFAULT 0,
+  test_message        TEXT             NOT NULL DEFAULT "",
+  test_execution_time FLOAT   UNSIGNED NOT NULL DEFAULT 0,
   node_root           INTEGER UNSIGNED NOT NULL,
   node_left           INTEGER UNSIGNED NOT NULL,
   node_right          INTEGER UNSIGNED NOT NULL,
 
   INDEX (run_id),
+  INDEX (test_result),
   INDEX (node_root),
   INDEX (node_left),
   INDEX (node_right)
@@ -149,14 +152,16 @@
   run_id              INTEGER,
   test_id             INTEGER PRIMARY KEY AUTOINCREMENT,
   test_name           TEXT,
-  test_result         TEXT,
-  test_execution_time REAL,
+  test_result         INTEGER DEFAULT 0,
+  test_message        TEXT    DEFAULT "",
+  test_execution_time REAL    DEFAULT 0,
   node_root           INTEGER,
   node_left           INTEGER,
   node_right          INTEGER
 );
 
 CREATE INDEX IF NOT EXISTS test_run_id     ON test (run_id);
+CREATE INDEX IF NOT EXISTS test_result     ON test (test_result);
 CREATE INDEX IF NOT EXISTS test_node_root  ON test (node_root);
 CREATE INDEX IF NOT EXISTS test_node_left  ON test (node_left);
 CREATE INDEX IF NOT EXISTS test_node_right ON test (node_right);
@@ -289,8 +294,9 @@
     {
         $this->insertNode(
           $test,
-          'Error: ' . $e->getMessage(),
-          $time
+          PHPUnit_Runner_BaseTestRunner::STATUS_ERROR,
+          $time,
+          $e->getMessage()
         );
 
         $this->currentTestSuccess = FALSE;
@@ -308,8 +314,9 @@
     {
         $this->insertNode(
           $test,
-          'Failure: ' . $e->getMessage(),
-          $time
+          PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE,
+          $time,
+          $e->getMessage()
         );
 
         $this->currentTestSuccess = FALSE;
@@ -327,8 +334,9 @@
     {
         $this->insertNode(
           $test,
-          'Incomplete: ' . $e->getMessage(),
-          $time
+          PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE,
+          $time,
+          $e->getMessage()
         );
 
         $this->currentTestSuccess = FALSE;
@@ -346,8 +354,9 @@
     {
         $this->insertNode(
           $test,
-          'Skipped: ' . $e->getMessage(),
-          $time
+          PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED,
+          $time,
+          $e->getMessage()
         );
 
         $this->currentTestSuccess = FALSE;
@@ -404,7 +413,9 @@
     public function endTest(PHPUnit_Framework_Test $test, $time)
     {
         if ($this->currentTestSuccess) {
-            $this->insertNode($test, 'OK', $time);
+            $this->insertNode(
+              $test, PHPUnit_Runner_BaseTestRunner::STATUS_PASSED, $time
+            );
         }
     }
 
@@ -579,13 +590,14 @@
      * Inserts a node into the tree.
      *
      * @param  PHPUnit_Framework_Test $test
-     * @param  string                 $result
+     * @param  integer                $result
      * @param  float                  $time
+     * @param  string                 $message
      * @return integer
      * @throws PDOException
      * @access protected
      */
-    protected function insertNode(PHPUnit_Framework_Test $test, $result = '', 
$time = 0)
+    protected function insertNode(PHPUnit_Framework_Test $test, $result = 
PHPUnit_Runner_BaseTestRunner::STATUS_PASSED, $time = 0, $message = '')
     {
         $right = $this->right[count($this->right)-1];
 
@@ -618,13 +630,14 @@
         $this->dbh->query(
           sprintf(
             'INSERT INTO test
-                         (run_id, test_name, test_result, test_execution_time,
-                          node_root, node_left, node_right)
-                   VALUES(%d, "%s", "%s", %f, %d, %d, %d);',
+                         (run_id, test_name, test_result, test_message,
+                          test_execution_time, node_root, node_left, 
node_right)
+                   VALUES(%d, "%s", %d, "%s", %f, %d, %d, %d);',
 
             $this->runId,
             $test->getName(),
             $result,
+            $message,
             $time,
             $this->rootId,
             $right,
<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  r555 - in /phpunit/branches: 3.1/PHPUnit/Util/Log/PDO.php 3.2/PHPUnit/Util/Log/PDO.php, sb
Next by Date:  r557 - in /phpunit/branches/3.2/PHPUnit/GtkUI: Listener/ Listener/Simple.php Runner/Simple.php TestListener.php, dotxp
Previous by Thread:  r555 - in /phpunit/branches: 3.1/PHPUnit/Util/Log/PDO.php 3.2/PHPUnit/Util/Log/PDO.php, sb
Next by Thread:  r557 - in /phpunit/branches/3.2/PHPUnit/GtkUI: Listener/ Listener/Simple.php Runner/Simple.php TestListener.php, dotxp
Indexes:  [Date] [Thread] [Top] [All Lists]

    ^^^ ADDITIONAL NAVIGATION ^^^

  
Google Custom Search

Recently Viewed:
mail.spam.rbl.s...    php.seagull.gen...    culture.religio...    qnx.openqnx.dev...    gnome.love/2006...    bug-tracking.re...    user-groups.lin...    yellowdog.gener...    handhelds.ipaq....    kde.announce/20...    java.mx4j.devel...    xfree86.expert/...    recreation.cars...    text.xml.expat....    web.zope.zope3/...    version-control...    db.carob.cvs/20...    freebsd.perform...    ecos.cvs/2003-0...    linux.hotplug.d...    systemtap/2006-...    os.freebsd.secu...   
Home | blog view | USPTO Patent Archive (NEW!) | advertise | OSDir is an inevitable website. super tiny logo