com phpruntests: fixing test: tests/testcase/rtPhpTestTest.php tests/testcase/rtTestConfigurationTest.php

Commit: 1d0e080999b4676fe811c370774de726d92da0db Author: Zoe Slattery <zoe@php.net> Wed, 13 May 2009 01:48:53 +0000 Parents: a2fa42c2b354a7e19f1af16a5a4582df95e59e3d Branches: master Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=1d0e080999b4676fe811c370774de726d92da0db Log: fixing test Changed paths: M tests/testcase/rtPhpTestTest.php M tests/testcase/rtTestConfigurationTest.php Diff: diff --git a/tests/testcase/rtPhpTestTest.php b/tests/testcase/rtPhpTestTest.php index 0dd36a4..315d8a1 100644 --- a/tests/testcase/rtPhpTestTest.php +++ b/tests/testcase/rtPhpTestTest.php @@ -7,6 +7,7 @@ class rtPhpTestTest extends PHPUnit_Framework_TestCase { public function setUp() { + $this->php = trim(shell_exec("which php")); $this->testCase = array ( 'TEST', 'This is a test', @@ -21,7 +22,7 @@ class rtPhpTestTest extends PHPUnit_Framework_TestCase public function testCreateInstance() { - $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', 'a-php-exe', 'test.phpt')); + $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', $this->php, 'test.phpt')); $config->configure(); $test = new rtPhpTest($this->testCase, 'nameOfTest', array('TEST', 'FILE', 'EXPECTF'), $config); @@ -31,7 +32,7 @@ class rtPhpTestTest extends PHPUnit_Framework_TestCase public function testSections() { - $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', 'a-php-exe', 'test.phpt')); + $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', $this->php, 'test.phpt')); $config->configure(); $test = new rtPhpTest($this->testCase, 'nameOfTest', array('TEST', 'FILE', 'EXPECTF'), $config); diff --git a/tests/testcase/rtTestConfigurationTest.php b/tests/testcase/rtTestConfigurationTest.php index 974c24d..f8048e5 100644 --- a/tests/testcase/rtTestConfigurationTest.php +++ b/tests/testcase/rtTestConfigurationTest.php @@ -9,6 +9,8 @@ class rtTestConfigurationTest extends PHPUnit_Framework_TestCase public function setUp() { + $this->php = $this->php = trim(shell_exec("which php")); + $this->sections['ARGS'] = new rtArgsSection('ARGS', array('-vvv -a value -1111 -2 -v')); $this->sections['ENV'] = new rtEnvSection('ENV', array('env1 = ENV1', 'env2=ENV2')); $this->sections['INI'] = new rtIniSection('INI', array('error_reporting=E_ALL | E_STRICT | E_DEPRECATED', 'assert.active = 1')); @@ -18,7 +20,7 @@ class rtTestConfigurationTest extends PHPUnit_Framework_TestCase public function testCreateInstance() { - $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', 'a-php-exe', 'test.phpt')); + $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', $this->php, 'test.phpt')); $config->configure(); $testConfiguration = new rtTestConfiguration($config, $this->sections, array(),$this->sections['FILE']); @@ -28,7 +30,7 @@ class rtTestConfigurationTest extends PHPUnit_Framework_TestCase public function testEnv() { - $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', 'a-php-exe', 'test.phpt')); + $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', $this->php, 'test.phpt')); $config->configure(); $testConfiguration = new rtTestConfiguration($config, $this->sections, array(), $this->sections['FILE']); @@ -40,7 +42,7 @@ class rtTestConfigurationTest extends PHPUnit_Framework_TestCase public function testArgs() { - $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', 'a-php-exe', 'test.phpt')); + $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', $this->php, 'test.phpt')); $config->configure(); $testConfiguration = new rtTestConfiguration($config, $this->sections, array(),$this->sections['FILE']); @@ -52,7 +54,7 @@ class rtTestConfigurationTest extends PHPUnit_Framework_TestCase public function testIni() { - $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', 'a-php-exe', 'test.phpt')); + $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', $this->php, 'test.phpt')); $config->configure(); $testConfiguration = new rtTestConfiguration($config, $this->sections, array(),$this->sections['FILE']); @@ -64,18 +66,18 @@ class rtTestConfigurationTest extends PHPUnit_Framework_TestCase public function testPHPExecutable() { - $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', 'a-php-exe', 'test.phpt')); + $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', $this->php, 'test.phpt')); $config->configure(); $testConfiguration = new rtTestConfiguration($config, $this->sections, array(),$this->sections['FILE']); $phpExe = $testConfiguration->getPhpExecutable(); - $this->assertEquals('a-php-exe', $phpExe); + $this->assertEquals('/usr/local/bin/php', $phpExe); } public function testPHPCgiExecutable() { - $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', 'a-php-exe', 'test.phpt')); + $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', $this->php, 'test.phpt')); $config->setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE', 'a-php-cgi-exe'); $config->configure();