zoe Tue May 12 20:16:05 2009 UTC
Modified files:
/phpruntests/tests/configuration rtRuntestsConfigurationTest.php
Log:
fixing after stephans name changes
http://cvs.php.net/viewvc.cgi/phpruntests/tests/configuration/rtRuntestsConfigurationTest.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/tests/configuration/rtRuntestsConfigurationTest.php
diff -u phpruntests/tests/configuration/rtRuntestsConfigurationTest.php:1.3
phpruntests/tests/configuration/rtRuntestsConfigurationTest.php:1.4
--- phpruntests/tests/configuration/rtRuntestsConfigurationTest.php:1.3 Fri Apr
24 09:42:01 2009
+++ phpruntests/tests/configuration/rtRuntestsConfigurationTest.php Tue May
12 20:16:05 2009
@@ -5,25 +5,29 @@
class rtRuntestsConfigurationTest extends PHPUnit_Framework_TestCase
{
+
+ public function setUp() {
+ $this->php = trim(shell_exec("which php"));
+ }
public function testCreateUnix()
{
- $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();
- $testFiles = $config->getSetting('TestFiles');
+ $testFiles = $config->getSetting('rtTestFileSetting');
- $this->assertEquals('a-php-exe', $config->getSetting('PhpExecutable'));
+ $this->assertEquals('/usr/local/bin/php',
$config->getSetting('rtPhpExecutableSetting'));
$this->assertEquals('test.phpt', $testFiles[0]);
}
public function testCreateWin()
{
- $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'), 'Windows');
+ $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', $this->php, 'test.phpt'), 'Windows');
$config->configure();
- $testFiles = $config->getSetting('TestFiles');
+ $testFiles = $config->getSetting('rtTestFileSetting');
- $this->assertEquals('a-php-exe', $config->getSetting('PhpExecutable'));
+ $this->assertEquals('/usr/local/bin/php',
$config->getSetting('rtPhpExecutableSetting'));
$this->assertEquals('test.phpt', $testFiles[0]);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
