cvs: phpruntests /src/testcase rtTestConfiguration.php

zoe Mon Apr 27 21:04:33 2009 UTC Modified files: /phpruntests/src/testcase rtTestConfiguration.php Log: Start of POST implementation http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.6&r2=1.7&diff_format=u Index: phpruntests/src/testcase/rtTestConfiguration.php diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.6 phpruntests/src/testcase/rtTestConfiguration.php:1.7 --- phpruntests/src/testcase/rtTestConfiguration.php:1.6 Sun Apr 26 22:43:36 2009 +++ phpruntests/src/testcase/rtTestConfiguration.php Mon Apr 27 21:04:32 2009 @@ -21,6 +21,7 @@ private $phpCommandLineArguments; private $testCommandLineArguments; private $phpExecutable; + private $inputFileString; private $isCgiTest = false; private $cgiSections = array( 'GET', @@ -45,7 +46,8 @@ $this->setPhpCommandLineArguments($runConfiguration, $sections); $this->setTestCommandLineArguments($sections); $this->setPhpExecutable($runConfiguration, $sectionHeadings); - + $this->setInputFileString($runConfiguration, $sections, $sectionHeadings); + if($this->isCgiTest) { $this->environmentVariables['SCRIPT_FILENAME'] = $fileSection->getFileName(); $this->environmentVariables['PATH_TRANSLATED'] = $fileSection->getFileName(); @@ -57,6 +59,7 @@ private function setEnvironmentVariables(rtRuntestsConfiguration $runConfiguration, $sections, $fileSection) { $this->environmentVariables = $runConfiguration->getEnvironmentVariables(); + if (array_key_exists('ENV', $sections)) { $this->environmentVariables = array_merge($this->environmentVariables, $sections['ENV']->getTestEnvironmentVariables()); } @@ -94,6 +97,14 @@ } } + private function setInputFileString($runConfiguration, $sections, $sectionHeadings) + { + $this->inputFileString = ''; + if(in_array('POST', $sectionHeadings)) { + $this->inputFileString = '< '.$sections['POST']->getPostFileName(); + } + } + private function queryCgiTest($sectionHeadings) { $tempArray = array_diff($this->cgiSections, $sectionHeadings);