com phpruntests: fixed problem with additional = signs in ENV settings: src/testcase/sections/configurationsecti ons/rtEnvSection.php
tests/testcase/sections/configurations ections/rtEnvSectionTest.php
| From: | David Soria Parra | Date: | Mon, 18 May 2009 20:06:11 +0000 |
| Subject: | com phpruntests: fixed problem with additional = signs in ENV settings: src/testcase/sections/configurationsecti ons/rtEnvSection.php tests/testcase/sections/configurations ections/rtEnvSectionTest.php |
||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-66441@lists.php.net to get a copy of this message | ||
Commit: fda51e9aea0fe863046a4f02a104c335d8b2783f
Author: Zoe Slattery <zoe@php.net> Mon, 18 May 2009 20:06:11 +0000
Parents: 159f1a31e11c47b0c6de2f7a619b6a8cc061cd5e
Branches: master
Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=fda51e9aea0fe863046a4f02a104c335d8b2783f
Log:
fixed problem with additional = signs in ENV settings
Changed paths:
M src/testcase/sections/configurationsections/rtEnvSection.php
M tests/testcase/sections/configurationsections/rtEnvSectionTest.php
Diff:
diff --git a/src/testcase/sections/configurationsections/rtEnvSection.php
b/src/testcase/sections/configurationsections/rtEnvSection.php
index 602893b..c537974 100644
--- a/src/testcase/sections/configurationsections/rtEnvSection.php
+++ b/src/testcase/sections/configurationsections/rtEnvSection.php
@@ -9,8 +9,11 @@ class rtEnvSection extends rtConfigurationSection
protected function init()
{
foreach ($this->sectionContents as $line) {
- $tempArray = explode('=', $line);
- $this->testEnvironmentVariables[trim($tempArray[0])] = trim($tempArray[1]);
+ $firstEqualsPosition = strpos($line, "=");
+ $variableName = substr($line, 0, -(strlen($line) - $firstEqualsPosition));
+ $variableValue = substr($line, -(strlen($line) - $firstEqualsPosition - 1));
+
+ $this->testEnvironmentVariables[trim($variableName)] = trim($variableValue);
}
}
diff --git a/tests/testcase/sections/configurationsections/rtEnvSectionTest.php
b/tests/testcase/sections/configurationsections/rtEnvSectionTest.php
index 607bcfb..d21452c 100644
--- a/tests/testcase/sections/configurationsections/rtEnvSectionTest.php
+++ b/tests/testcase/sections/configurationsections/rtEnvSectionTest.php
@@ -5,13 +5,22 @@ require_once dirname(__FILE__) .. '../../../../../src/rtAutoload.php';
class rtEnvSectionTest extends PHPUnit_Framework_TestCase
{
- public function testCreateInstance()
+ public function testCreateInstance()
{
- $envSection = rtEnvSection::getInstance('ENV', array('env1 = ENV1',
'env2=ENV2'));
+ $envSection = rtEnvSection::getInstance('ENV', array('env1 = ENV1',
'env2=ENV2'));
$envlist = $envSection->getTestEnvironmentVariables();
$this->assertEquals('ENV1', $envlist['env1']);
$this->assertEquals('ENV2', $envlist['env2']);
}
+
+ public function testCreateInstance2()
+ {
+ $envSection = rtEnvSection::getInstance('ENV', array('env1 =
ENV1=env'));
+ $envlist = $envSection->getTestEnvironmentVariables();
+
+ $this->assertEquals('ENV1=env', $envlist['env1']);
+
+ }
}
?>