com phpruntests: fixing after stephans name changes: tests/configuration/rtRuntestsConfigurationTest.php
| From: | David Soria Parra | Date: | Tue, 12 May 2009 20:16:05 +0000 |
| Subject: | com phpruntests: fixing after stephans name changes: tests/configuration/rtRuntestsConfigurationTest.php | ||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-66481@lists.php.net to get a copy of this message | ||
Commit: 35992b774c687c9b787ef828eff6228c11fad82e
Author: Zoe Slattery <zoe@php.net> Tue, 12 May 2009 20:16:05 +0000
Parents: 198e1c169210d6d882675426651b9afc9875efe6
Branches: master
Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=35992b774c687c9b787ef828eff6228c11fad82e
Log:
fixing after stephans name changes
Changed paths:
M tests/configuration/rtRuntestsConfigurationTest.php
Diff:
diff --git a/tests/configuration/rtRuntestsConfigurationTest.php
b/tests/configuration/rtRuntestsConfigurationTest.php
index b90a8c5..e95200e 100644
--- a/tests/configuration/rtRuntestsConfigurationTest.php
+++ b/tests/configuration/rtRuntestsConfigurationTest.php
@@ -5,25 +5,29 @@ require_once dirname(__FILE__) . '../../../src/rtAutoload.php';
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]);
}
}