[PHP-CVS] cvs: phpruntests /tests/testcase rtTestConfigurationTest.php

[Zoe Slattery]

zoe             Sat Apr 25 15:05:45 2009 UTC

  Modified files:              
    /phpruntests/tests/testcase rtTestConfigurationTest.php 
  Log:
  Adding check for CGI executable
  
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtTestConfigurationTest.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/tests/testcase/rtTestConfigurationTest.php
diff -u phpruntests/tests/testcase/rtTestConfigurationTest.php:1.3 
phpruntests/tests/testcase/rtTestConfigurationTest.php:1.4
--- phpruntests/tests/testcase/rtTestConfigurationTest.php:1.3  Fri Apr 24 
09:42:01 2009
+++ phpruntests/tests/testcase/rtTestConfigurationTest.php      Sat Apr 25 
15:05:45 2009
@@ -19,7 +19,7 @@
         $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
         $config->configure();
 
-        $testConfiguration = new rtTestConfiguration($config, $this->sections);
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array());
 
         $this->assertEquals('rtTestConfiguration', 
get_class($testConfiguration));
     }
@@ -29,7 +29,7 @@
         $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
         $config->configure();
 
-        $testConfiguration = new rtTestConfiguration($config, $this->sections);
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array());
 
         $envVars = $testConfiguration->getEnvironmentVariables();
 
@@ -41,7 +41,7 @@
         $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
         $config->configure();
 
-        $testConfiguration = new rtTestConfiguration($config, $this->sections);
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array());
 
         $args = $testConfiguration->getTestCommandLineArguments();
 
@@ -53,11 +53,35 @@
         $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
         $config->configure();
 
-        $testConfiguration = new rtTestConfiguration($config, $this->sections);
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array());
         $phpargs = $testConfiguration->getPhpCommandLineArguments();
         $match = preg_match("/-d \"error_reporting=E_ALL | E_STRICT | 
E_DEPRECATED\" -d \"assert.active=1\"/", $phpargs);
 
         $this->assertEquals(1, $match);
     }
+
+    public function testPHPExecutable()
+    {
+        $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
+        $config->configure();
+ 
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array());
+        $phpExe = $testConfiguration->getPhpExecutable();
+
+        $this->assertEquals('a-php-exe', $phpExe);
+    }
+
+    public function testPHPCgiExecutable()
+    {
+        $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
+        $config->setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE', 
'a-php-cgi-exe');
+        $config->configure();
+  
+
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array('GET'));
+        $phpExe = $testConfiguration->getPhpExecutable();
+
+        $this->assertEquals('a-php-cgi-exe', $phpExe);
+    }
 }
 ?>



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php