[pLog-svn] r5405 - in plog/branches/lifetype-1.2/class/test: . PHPUnit PHPUnit/GUI helpers

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Sun May 13 08:18:19 EDT 2007


Author: jondaley
Date: 2007-05-13 08:18:19 -0400 (Sun, 13 May 2007)
New Revision: 5405

Modified:
   plog/branches/lifetype-1.2/class/test/PHPUnit.php
   plog/branches/lifetype-1.2/class/test/PHPUnit/GUI/Gtk.php
   plog/branches/lifetype-1.2/class/test/PHPUnit/RepeatedTest.php
   plog/branches/lifetype-1.2/class/test/PHPUnit/Skeleton.php
   plog/branches/lifetype-1.2/class/test/PHPUnit/TestCase.php
   plog/branches/lifetype-1.2/class/test/PHPUnit/TestDecorator.php
   plog/branches/lifetype-1.2/class/test/PHPUnit/TestResult.php
   plog/branches/lifetype-1.2/class/test/PHPUnit/TestSuite.php
   plog/branches/lifetype-1.2/class/test/helpers/consolereporter.class.php
   plog/branches/lifetype-1.2/class/test/helpers/htmlreporter.class.php
   plog/branches/lifetype-1.2/class/test/helpers/lifetypetestcase.class.php
Log:
replaced everything in phpunit with lt_include - there were some cases that I didn't totally understand when I first did this, so I mostly ignored this directory.  Also reverted 5402 since it isn't needed any more.  Sorry that I forgot to check this earlier

Modified: plog/branches/lifetype-1.2/class/test/PHPUnit/GUI/Gtk.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/PHPUnit/GUI/Gtk.php	2007-05-13 12:17:23 UTC (rev 5404)
+++ plog/branches/lifetype-1.2/class/test/PHPUnit/GUI/Gtk.php	2007-05-13 12:18:19 UTC (rev 5405)
@@ -47,7 +47,7 @@
  */
 
 if (!function_exists('is_a')) {
-    require_once 'PHP/Compat/Function/is_a.php';
+    lt_include('PHP/Compat/Function/is_a.php');
 }
 
 /**
@@ -522,7 +522,7 @@
         if (is_a($file, 'PHPUnit_TestSuite')) {
             return $file;
         } elseif (class_exists($file)) {
-            require_once 'PHPUnit/TestSuite.php';
+            lt_include('PHPUnit/TestSuite.php');
             return new PHPUnit_TestSuite($file);
         }
 
@@ -537,11 +537,11 @@
         // Instantiate the class.
         // If the path is /path/to/test/TestClass.php
         // the class name should be test_TestClass
-        require_once $file;
+        lt_include($file);
         $className = str_replace(DIRECTORY_SEPARATOR, '_', $file);
         $className = substr($className, 0, strpos($className, '.'));
 
-        require_once 'PHPUnit/TestSuite.php';
+        lt_include('PHPUnit/TestSuite.php');
         return new PHPUnit_TestSuite($className);
     }
 

Modified: plog/branches/lifetype-1.2/class/test/PHPUnit/RepeatedTest.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/PHPUnit/RepeatedTest.php	2007-05-13 12:17:23 UTC (rev 5404)
+++ plog/branches/lifetype-1.2/class/test/PHPUnit/RepeatedTest.php	2007-05-13 12:18:19 UTC (rev 5405)
@@ -46,7 +46,7 @@
  * @since      File available since Release 1.0.0
  */
 
-require_once PHPUNIT_CLASS_PATH.'PHPUnit/TestDecorator.php';
+lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestDecorator.php');
 
 /**
  * A Decorator that runs a test repeatedly.

Modified: plog/branches/lifetype-1.2/class/test/PHPUnit/Skeleton.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/PHPUnit/Skeleton.php	2007-05-13 12:17:23 UTC (rev 5404)
+++ plog/branches/lifetype-1.2/class/test/PHPUnit/Skeleton.php	2007-05-13 12:18:19 UTC (rev 5405)
@@ -178,10 +178,10 @@
     function createTestClass() {
         // Instantiate the object.
         if (isset($this->configFile)) {
-            require_once $this->configFile;
+            lt_include($this->configFile);
         }
 
-        require_once $this->classPath;
+        lt_include($this->classPath);
 
         // Get the methods.
         $classMethods = get_class_methods($this->className);
@@ -247,7 +247,7 @@
           " */\n";
 
         // Add the require statements.
-        $this->testClass .= "require_once 'PHPUnit.php';\n";
+        $this->testClass .= "lt_include('PHPUnit.php');\n";
 
         // Add the class definition and variable definition.
         $this->testClass .=
@@ -299,11 +299,11 @@
 
         if (isset($this->configFile)) {
             $this->testClass .=
-            "        require_once '" . $this->configFile . "';\n";
+            "        lt_include('" . $this->configFile . ")';\n";
         }
 
         $this->testClass .=
-          "        require_once '" . $this->classPath . "';\n" .
+          "        lt_include('" . $this->classPath . ")';\n" .
           "        \$this->" . $this->className . " =& new " . $this->className . "(PARAM);\n" .
           "    }\n\n";
 

Modified: plog/branches/lifetype-1.2/class/test/PHPUnit/TestCase.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/PHPUnit/TestCase.php	2007-05-13 12:17:23 UTC (rev 5404)
+++ plog/branches/lifetype-1.2/class/test/PHPUnit/TestCase.php	2007-05-13 12:18:19 UTC (rev 5405)
@@ -46,8 +46,8 @@
  * @since      File available since Release 1.0.0
  */
 
-require_once PHPUNIT_CLASS_PATH.'PHPUnit/Assert.php';
-require_once PHPUNIT_CLASS_PATH.'PHPUnit/TestResult.php';
+lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/Assert.php');
+lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestResult.php');
 //lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypeassert.class.php" );
 
 /**

Modified: plog/branches/lifetype-1.2/class/test/PHPUnit/TestDecorator.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/PHPUnit/TestDecorator.php	2007-05-13 12:17:23 UTC (rev 5404)
+++ plog/branches/lifetype-1.2/class/test/PHPUnit/TestDecorator.php	2007-05-13 12:18:19 UTC (rev 5405)
@@ -46,11 +46,11 @@
  * @since      File available since Release 1.0.0
  */
 
-require_once PHPUNIT_CLASS_PATH.'PHPUnit/TestCase.php';
-require_once PHPUNIT_CLASS_PATH.'PHPUnit/TestSuite.php';
+lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestCase.php');
+lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestSuite.php');
 
 if (!function_exists('is_a')) {
-    require_once 'PHP/Compat/Function/is_a.php';
+    lt_include('PHP/Compat/Function/is_a.php');
 }
 
 /**

Modified: plog/branches/lifetype-1.2/class/test/PHPUnit/TestResult.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/PHPUnit/TestResult.php	2007-05-13 12:17:23 UTC (rev 5404)
+++ plog/branches/lifetype-1.2/class/test/PHPUnit/TestResult.php	2007-05-13 12:18:19 UTC (rev 5405)
@@ -46,11 +46,11 @@
  * @since      File available since Release 1.0.0
  */
 
-require_once PHPUNIT_CLASS_PATH.'PHPUnit/TestFailure.php';
-require_once PHPUNIT_CLASS_PATH.'PHPUnit/TestListener.php';
+lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestFailure.php');
+lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestListener.php');
 
 if (!function_exists('is_a')) {
-    require_once 'PHP/Compat/Function/is_a.php';
+    lt_include('PHP/Compat/Function/is_a.php');
 }
 
 /**

Modified: plog/branches/lifetype-1.2/class/test/PHPUnit/TestSuite.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/PHPUnit/TestSuite.php	2007-05-13 12:17:23 UTC (rev 5404)
+++ plog/branches/lifetype-1.2/class/test/PHPUnit/TestSuite.php	2007-05-13 12:18:19 UTC (rev 5405)
@@ -46,7 +46,7 @@
  * @since      File available since Release 1.0.0
  */
 
-require_once PHPUNIT_CLASS_PATH.'PHPUnit/TestCase.php';
+lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestCase.php');
 
 /**
  * A TestSuite is a Composite of Tests. It runs a collection of test cases.

Modified: plog/branches/lifetype-1.2/class/test/PHPUnit.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/PHPUnit.php	2007-05-13 12:17:23 UTC (rev 5404)
+++ plog/branches/lifetype-1.2/class/test/PHPUnit.php	2007-05-13 12:18:19 UTC (rev 5405)
@@ -48,9 +48,9 @@
 
 define( "PHPUNIT_CLASS_PATH", PLOG_CLASS_PATH."class/test/" );
 
-require_once PHPUNIT_CLASS_PATH.'PHPUnit/TestCase.php';
-require_once PHPUNIT_CLASS_PATH.'PHPUnit/TestResult.php';
-require_once PHPUNIT_CLASS_PATH.'PHPUnit/TestSuite.php';
+lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestCase.php');
+lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestResult.php');
+lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestSuite.php');
 
 /**
  * PHPUnit runs a TestSuite and returns a TestResult object.

Modified: plog/branches/lifetype-1.2/class/test/helpers/consolereporter.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/helpers/consolereporter.class.php	2007-05-13 12:17:23 UTC (rev 5404)
+++ plog/branches/lifetype-1.2/class/test/helpers/consolereporter.class.php	2007-05-13 12:18:19 UTC (rev 5405)
@@ -1,7 +1,7 @@
 <?php
 
-	include_once( PLOG_CLASS_PATH."class/test/PHPUnit/TestResult.php" );
-	include_once( PLOG_CLASS_PATH."class/test/PHPUnit/TestListener.php" );	
+	lt_include( PLOG_CLASS_PATH."class/test/PHPUnit/TestResult.php" );
+	lt_include( PLOG_CLASS_PATH."class/test/PHPUnit/TestListener.php" );	
 
 	/**
 	 * \ingroup Test

Modified: plog/branches/lifetype-1.2/class/test/helpers/htmlreporter.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/helpers/htmlreporter.class.php	2007-05-13 12:17:23 UTC (rev 5404)
+++ plog/branches/lifetype-1.2/class/test/helpers/htmlreporter.class.php	2007-05-13 12:18:19 UTC (rev 5405)
@@ -1,6 +1,6 @@
 <?php
 
-	include_once( PLOG_CLASS_PATH."class/test/PHPUnit/TestResult.php" );
+	lt_include( PLOG_CLASS_PATH."class/test/PHPUnit/TestResult.php" );
 
 	/**
 	 * \ingroup Test

Modified: plog/branches/lifetype-1.2/class/test/helpers/lifetypetestcase.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/helpers/lifetypetestcase.class.php	2007-05-13 12:17:23 UTC (rev 5404)
+++ plog/branches/lifetype-1.2/class/test/helpers/lifetypetestcase.class.php	2007-05-13 12:18:19 UTC (rev 5405)
@@ -1,6 +1,6 @@
 <?php
 
-	include_once( PLOG_CLASS_PATH."class/test/PHPUnit/TestCase.php");
+	lt_include( PLOG_CLASS_PATH."class/test/PHPUnit/TestCase.php");
 	lt_include( PLOG_CLASS_PATH."class/test/helpers/uiscriptrunner.class.php");	
 	lt_include( PLOG_CLASS_PATH."class/net/http/httpclient.class.php" );
 	



More information about the pLog-svn mailing list