[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php /src/testcase/sections rtSection.php
zoe Mon May 4 16:27:13 2009 UTC Modified files: /phpruntests/src/testcase rtTestConfiguration.php /phpruntests/src/testcase/sections rtSection.php Log: post raw changes http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.11r2=1.12diff_format=u Index: phpruntests/src/testcase/rtTestConfiguration.php diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.11 phpruntests/src/testcase/rtTestConfiguration.php:1.12 --- phpruntests/src/testcase/rtTestConfiguration.php:1.11 Thu Apr 30 20:22:22 2009 +++ phpruntests/src/testcase/rtTestConfiguration.phpMon May 4 16:27:12 2009 @@ -75,6 +75,9 @@ if (array_key_exists('DEFLATE_POST', $sections)) { $this-environmentVariables = array_merge($this-environmentVariables, $sections['DEFLATE_POST']-getPostVariables()); } +if (array_key_exists('POST_RAW', $sections)) { +$this-environmentVariables = array_merge($this-environmentVariables, $sections['POST_RAW']-getPostVariables()); +} } @@ -118,6 +121,9 @@ if(in_array('DEFLATE_POST', $sectionHeadings)) { $this-inputFileString = ' '.$sections['DEFLATE_POST']-getPostFileName(); } +if(in_array('POST_RAW', $sectionHeadings)) { +$this-inputFileString = ' '.$sections['POST_RAW']-getPostFileName(); +} } private function isCgiTest($sectionHeadings) http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/rtSection.php?r1=1.6r2=1.7diff_format=u Index: phpruntests/src/testcase/sections/rtSection.php diff -u phpruntests/src/testcase/sections/rtSection.php:1.6 phpruntests/src/testcase/sections/rtSection.php:1.7 --- phpruntests/src/testcase/sections/rtSection.php:1.6 Thu Apr 30 20:22:22 2009 +++ phpruntests/src/testcase/sections/rtSection.php Mon May 4 16:27:12 2009 @@ -22,6 +22,7 @@ 'POST'= 'rtPostSection', 'GZIP_POST' = 'rtGzipPostSection', 'DEFLATE_POST' = 'rtDeflatePostSection', +'POST_RAW' = 'rtPostRawSection', ); protected $sectionName; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php /src/testcase/preconditions rtIsSectionImplemented.php /src/testcase/sections rtSection.php /src/testcase/sections/configurationsect
zoe Mon May 4 17:02:37 2009 UTC Added files: /phpruntests/tests/testcase/sections/configurationsections rtCookieSectionTest.php /phpruntests/tests/testcase rtCookieExecutionTest.php /phpruntests/src/testcase/sections/configurationsections rtCookieSection.php Modified files: /phpruntests/src/testcase/preconditions rtIsSectionImplemented.php /phpruntests/src/testcase rtTestConfiguration.php /phpruntests/src/testcase/sections rtSection.php Log: cookie section http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php?r1=1.6r2=1.7diff_format=u Index: phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php diff -u phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.6 phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.7 --- phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.6 Mon May 4 16:28:17 2009 +++ phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php Mon May 4 17:02:37 2009 @@ -22,6 +22,7 @@ 'GZIP_POST' = 'rtGzipPostSection', 'DEFLATE_POST' = 'rtDeflatePostSection', 'POST_RAW'= 'rtPostRawSection', +'COOKIE'= 'rtCookieSection', ); /** Return the message associated with an unimplemented test section http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.12r2=1.13diff_format=u Index: phpruntests/src/testcase/rtTestConfiguration.php diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.12 phpruntests/src/testcase/rtTestConfiguration.php:1.13 --- phpruntests/src/testcase/rtTestConfiguration.php:1.12 Mon May 4 16:27:12 2009 +++ phpruntests/src/testcase/rtTestConfiguration.phpMon May 4 17:02:37 2009 @@ -48,12 +48,6 @@ $this-setPhpExecutable($runConfiguration, $sectionHeadings); $this-setInputFileString($runConfiguration, $sections, $sectionHeadings); -if($this-cgiTest) { -$this-environmentVariables['SCRIPT_FILENAME'] = $fileSection-getFileName(); -$this-environmentVariables['PATH_TRANSLATED'] = $fileSection-getFileName(); -//Required by when the cgi has been compiled with force-cgi-redirect. -$this-environmentVariables['REDIRECT_STATUS'] = '1'; -} } private function setEnvironmentVariables(rtRuntestsConfiguration $runConfiguration, $sections, $fileSection) @@ -63,20 +57,33 @@ if (array_key_exists('ENV', $sections)) { $this-environmentVariables = array_merge($this-environmentVariables, $sections['ENV']-getTestEnvironmentVariables()); } -if (array_key_exists('GET', $sections)) { -$this-environmentVariables = array_merge($this-environmentVariables, $sections['GET']-getGetVariables()); -} -if (array_key_exists('POST', $sections)) { -$this-environmentVariables = array_merge($this-environmentVariables, $sections['POST']-getPostVariables()); -} -if (array_key_exists('GZIP_POST', $sections)) { -$this-environmentVariables = array_merge($this-environmentVariables, $sections['GZIP_POST']-getPostVariables()); -} -if (array_key_exists('DEFLATE_POST', $sections)) { -$this-environmentVariables = array_merge($this-environmentVariables, $sections['DEFLATE_POST']-getPostVariables()); -} -if (array_key_exists('POST_RAW', $sections)) { -$this-environmentVariables = array_merge($this-environmentVariables, $sections['POST_RAW']-getPostVariables()); + +if($this-cgiTest) { +$this-environmentVariables['SCRIPT_FILENAME'] = $fileSection-getFileName(); +$this-environmentVariables['PATH_TRANSLATED'] = $fileSection-getFileName(); +//Required by when the cgi has been compiled with force-cgi-redirect. +$this-environmentVariables['REDIRECT_STATUS'] = '1'; +//Default is GET +$this-environmentVariables['REQUEST_METHOD'] = 'GET'; + +if (array_key_exists('GET', $sections)) { +$this-environmentVariables = array_merge($this-environmentVariables, $sections['GET']-getGetVariables()); +} +if (array_key_exists('POST', $sections)) { +$this-environmentVariables = array_merge($this-environmentVariables, $sections['POST']-getPostVariables()); +} +if (array_key_exists('GZIP_POST', $sections)) { +$this-environmentVariables = array_merge($this-environmentVariables, $sections['GZIP_POST']-getPostVariables()); +} +if (array_key_exists('DEFLATE_POST', $sections)) { +$this-environmentVariables =
[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php
zoe Thu Apr 30 19:06:51 2009 UTC Modified files: /phpruntests/src/testcase rtTestConfiguration.php Log: gzip_post modifications http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.9r2=1.10diff_format=u Index: phpruntests/src/testcase/rtTestConfiguration.php diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.9 phpruntests/src/testcase/rtTestConfiguration.php:1.10 --- phpruntests/src/testcase/rtTestConfiguration.php:1.9Tue Apr 28 20:57:35 2009 +++ phpruntests/src/testcase/rtTestConfiguration.phpThu Apr 30 19:06:50 2009 @@ -69,6 +69,9 @@ if (array_key_exists('POST', $sections)) { $this-environmentVariables = array_merge($this-environmentVariables, $sections['POST']-getPostVariables()); } + if (array_key_exists('GZIP_POST', $sections)) { +$this-environmentVariables = array_merge($this-environmentVariables, $sections['GZIP_POST']-getPostVariables()); +} } @@ -106,6 +109,9 @@ if(in_array('POST', $sectionHeadings)) { $this-inputFileString = ' '.$sections['POST']-getPostFileName(); } +if(in_array('GZIP_POST', $sectionHeadings)) { +$this-inputFileString = ' '.$sections['GZIP_POST']-getPostFileName(); +} } private function isCgiTest($sectionHeadings) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php /src/testcase/preconditions rtIsSectionImplemented.php /src/testcase/sections rtSection.php /tests/testcase rtDeflatePostExecutionTe
zoe Thu Apr 30 20:22:22 2009 UTC Added files: /phpruntests/tests/testcase rtDeflatePostExecutionTest.php Modified files: /phpruntests/src/testcase/preconditions rtIsSectionImplemented.php /phpruntests/src/testcase rtTestConfiguration.php /phpruntests/src/testcase/sections rtSection.php Log: Deflate post section done http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php?r1=1.4r2=1.5diff_format=u Index: phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php diff -u phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.4 phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.5 --- phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.4 Tue Apr 28 20:57:48 2009 +++ phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php Thu Apr 30 20:22:22 2009 @@ -18,7 +18,9 @@ 'CLEAN' = 'rtCleanSection', 'XFAIL' = 'rtXfailSection', 'GET' = 'rtGetSection', -'POST' = 'rtPostSection' +'POST'= 'rtPostSection', +'GZIP_POST' = 'rtGzipPostSection', +'DEFLATE_POST' = 'rtDeflatePostSection', ); /** Return the message associated with an unimplemented test section http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.10r2=1.11diff_format=u Index: phpruntests/src/testcase/rtTestConfiguration.php diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.10 phpruntests/src/testcase/rtTestConfiguration.php:1.11 --- phpruntests/src/testcase/rtTestConfiguration.php:1.10 Thu Apr 30 19:06:50 2009 +++ phpruntests/src/testcase/rtTestConfiguration.phpThu Apr 30 20:22:22 2009 @@ -66,12 +66,15 @@ if (array_key_exists('GET', $sections)) { $this-environmentVariables = array_merge($this-environmentVariables, $sections['GET']-getGetVariables()); } - if (array_key_exists('POST', $sections)) { +if (array_key_exists('POST', $sections)) { $this-environmentVariables = array_merge($this-environmentVariables, $sections['POST']-getPostVariables()); } - if (array_key_exists('GZIP_POST', $sections)) { +if (array_key_exists('GZIP_POST', $sections)) { $this-environmentVariables = array_merge($this-environmentVariables, $sections['GZIP_POST']-getPostVariables()); } +if (array_key_exists('DEFLATE_POST', $sections)) { +$this-environmentVariables = array_merge($this-environmentVariables, $sections['DEFLATE_POST']-getPostVariables()); +} } @@ -112,6 +115,9 @@ if(in_array('GZIP_POST', $sectionHeadings)) { $this-inputFileString = ' '.$sections['GZIP_POST']-getPostFileName(); } +if(in_array('DEFLATE_POST', $sectionHeadings)) { +$this-inputFileString = ' '.$sections['DEFLATE_POST']-getPostFileName(); +} } private function isCgiTest($sectionHeadings) http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/rtSection.php?r1=1.5r2=1.6diff_format=u Index: phpruntests/src/testcase/sections/rtSection.php diff -u phpruntests/src/testcase/sections/rtSection.php:1.5 phpruntests/src/testcase/sections/rtSection.php:1.6 --- phpruntests/src/testcase/sections/rtSection.php:1.5 Thu Apr 30 19:07:22 2009 +++ phpruntests/src/testcase/sections/rtSection.php Thu Apr 30 20:22:22 2009 @@ -21,6 +21,7 @@ 'GET' = 'rtGetSection', 'POST'= 'rtPostSection', 'GZIP_POST' = 'rtGzipPostSection', +'DEFLATE_POST' = 'rtDeflatePostSection', ); protected $sectionName; http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtDeflatePostExecutionTest.php?view=markuprev=1.1 Index: phpruntests/tests/testcase/rtDeflatePostExecutionTest.php +++ phpruntests/tests/testcase/rtDeflatePostExecutionTest.php ?php require_once 'PHPUnit/Framework.php'; require_once dirname(__FILE__) . '../../../src/rtAutoload.php'; class rtDeflatePostExecutionTest extends PHPUnit_Framework_TestCase { private $sample_test; public function setUp() { $this-php = trim(shell_exec(which php)); $this-php_cgi = trim(shell_exec(which php-cgi)); $this-path_to_tests = realpath(dirname(__FILE__) . '/../../phpt-tests'); $this-sample_test = $this-path_to_tests . '/sample_deflatepost.phpt'; } public function tearDown() { @unlink($this-path-to_tests . '/sample_deflatepost.php'); } public function testFileRun() { //Create a new test configuration $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', $this-php, $this-sample_test)); $config-setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE',$this-php_cgi); $config-configure(); //Retrieve the array of test file names
[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php
zoe Tue Apr 28 20:23:15 2009 UTC Modified files: /phpruntests/src/testcase rtTestConfiguration.php Log: change names http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.7r2=1.8diff_format=u Index: phpruntests/src/testcase/rtTestConfiguration.php diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.7 phpruntests/src/testcase/rtTestConfiguration.php:1.8 --- phpruntests/src/testcase/rtTestConfiguration.php:1.7Mon Apr 27 21:04:32 2009 +++ phpruntests/src/testcase/rtTestConfiguration.phpTue Apr 28 20:23:14 2009 @@ -22,7 +22,7 @@ private $testCommandLineArguments; private $phpExecutable; private $inputFileString; -private $isCgiTest = false; +private $cgiTest = false; private $cgiSections = array( 'GET', 'POST', @@ -40,15 +40,15 @@ private function init(rtRuntestsConfiguration $runConfiguration, $sections, $sectionHeadings, $fileSection) { -$this-queryCgiTest($sectionHeadings); +$this-isCgiTest($sectionHeadings); $this-setEnvironmentVariables($runConfiguration, $sections, $fileSection); $this-setPhpCommandLineArguments($runConfiguration, $sections); $this-setTestCommandLineArguments($sections); $this-setPhpExecutable($runConfiguration, $sectionHeadings); $this-setInputFileString($runConfiguration, $sections, $sectionHeadings); - -if($this-isCgiTest) { + +if($this-cgiTest) { $this-environmentVariables['SCRIPT_FILENAME'] = $fileSection-getFileName(); $this-environmentVariables['PATH_TRANSLATED'] = $fileSection-getFileName(); //Required by when the cgi has been compiled with force-cgi-redirect. @@ -90,7 +90,7 @@ private function setPhpExecutable($runConfiguration, $sectionHeadings) { -if ($this-isCgiTest) { +if ($this-cgiTest) { $this-phpExecutable = $runConfiguration-getSetting('PhpCgiExecutable'). -C; } else { $this-phpExecutable = $runConfiguration-getSetting('PhpExecutable'); @@ -105,11 +105,11 @@ } } -private function queryCgiTest($sectionHeadings) +private function isCgiTest($sectionHeadings) { $tempArray = array_diff($this-cgiSections, $sectionHeadings); if (count($tempArray) count($this-cgiSections)) { -$this-isCgiTest = true; +$this-cgiTest = true; } } @@ -133,5 +133,10 @@ { return $this-testCommandLineArguments; } + +public function getInputFileString() +{ +return $this-inputFileString; +} } ? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php
zoe Tue Apr 28 20:57:35 2009 UTC Modified files: /phpruntests/src/testcase rtTestConfiguration.php Log: POST implemented http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.8r2=1.9diff_format=u Index: phpruntests/src/testcase/rtTestConfiguration.php diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.8 phpruntests/src/testcase/rtTestConfiguration.php:1.9 --- phpruntests/src/testcase/rtTestConfiguration.php:1.8Tue Apr 28 20:23:14 2009 +++ phpruntests/src/testcase/rtTestConfiguration.phpTue Apr 28 20:57:35 2009 @@ -66,6 +66,9 @@ if (array_key_exists('GET', $sections)) { $this-environmentVariables = array_merge($this-environmentVariables, $sections['GET']-getGetVariables()); } + if (array_key_exists('POST', $sections)) { +$this-environmentVariables = array_merge($this-environmentVariables, $sections['POST']-getPostVariables()); +} } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] 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.6r2=1.7diff_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.6Sun Apr 26 22:43:36 2009 +++ phpruntests/src/testcase/rtTestConfiguration.phpMon 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); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php
zoe Sun Apr 26 07:40:57 2009 UTC Modified files: /phpruntests/src/testcase rtTestConfiguration.php Log: Add code to get Get env variables http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.4r2=1.5diff_format=u Index: phpruntests/src/testcase/rtTestConfiguration.php diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.4 phpruntests/src/testcase/rtTestConfiguration.php:1.5 --- phpruntests/src/testcase/rtTestConfiguration.php:1.4Sat Apr 25 17:27:48 2009 +++ phpruntests/src/testcase/rtTestConfiguration.phpSun Apr 26 07:40:57 2009 @@ -50,6 +50,10 @@ if (array_key_exists('ENV', $sections)) { $this-environmentVariables = array_merge($this-environmentVariables, $sections['ENV']-getTestEnvironmentVariables()); } +if (array_key_exists('GET', $sections)) { +$this-environmentVariables = array_merge($this-environmentVariables, $sections['GET']-getGetVariables()); +} + } private function setPhpCommandLineArguments(rtRuntestsConfiguration $runConfiguration, $sections) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php
zoe Sat Apr 25 17:27:48 2009 UTC Modified files: /phpruntests/src/testcase rtTestConfiguration.php Log: updating doc block http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.3r2=1.4diff_format=u Index: phpruntests/src/testcase/rtTestConfiguration.php diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.3 phpruntests/src/testcase/rtTestConfiguration.php:1.4 --- phpruntests/src/testcase/rtTestConfiguration.php:1.3Sat Apr 25 15:04:23 2009 +++ phpruntests/src/testcase/rtTestConfiguration.phpSat Apr 25 17:27:48 2009 @@ -1,16 +1,17 @@ ?php /** + * rtTestConfiguration * - * This class holds confiurtaion settings that are specific to a single test. + * This class holds configuration settings that are specific to a single test. * Test sections which adjust the confiuration for single test include ARGS, ENV, INI * - * @category Quality Assurance - * @packagerun-tests + * @category Testing + * @packageRUNTESTS * @author Zoe Slattery z...@php.net * @author Stefan Priebsch sprieb...@php.net * @copyright 2009 The PHP Group * @licensehttp://www.php.net/license/3_01.txt PHP License 3.01 - * + * @link http://qa.php.net/ */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php