[PHP-CVS] cvs: phpruntests /tests/testcase rtTestConfigurationTest.php

[Zoe Slattery]

zoe             Sun Apr 26 22:45:10 2009 UTC

  Modified files:              
    /phpruntests/tests/testcase rtTestConfigurationTest.php 
  Log:
  Changes to enable GET
  
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtTestConfigurationTest.php?r1=1.4&r2=1.5&diff_format=u
Index: phpruntests/tests/testcase/rtTestConfigurationTest.php
diff -u phpruntests/tests/testcase/rtTestConfigurationTest.php:1.4 
phpruntests/tests/testcase/rtTestConfigurationTest.php:1.5
--- phpruntests/tests/testcase/rtTestConfigurationTest.php:1.4  Sat Apr 25 
15:05:45 2009
+++ phpruntests/tests/testcase/rtTestConfigurationTest.php      Sun Apr 26 
22:45:10 2009
@@ -12,6 +12,8 @@
         $this->sections['ARGS'] = new rtArgsSection('ARGS', array('-vvv -a 
value -1111 -2 -v'));
         $this->sections['ENV'] = new rtEnvSection('ENV', array('env1 = ENV1', 
'env2=ENV2'));
         $this->sections['INI'] = new rtIniSection('INI', 
array('error_reporting=E_ALL | E_STRICT | E_DEPRECATED', 'assert.active = 1'));
+        $this->sections['FILE'] = new rtFileSection('FILE', array('blah'));
+        
     }
 
     public function testCreateInstance()
@@ -19,7 +21,7 @@
         $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
         $config->configure();
 
-        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array());
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array(),$this->sections['FILE']);
 
         $this->assertEquals('rtTestConfiguration', 
get_class($testConfiguration));
     }
@@ -29,7 +31,7 @@
         $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
         $config->configure();
 
-        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array());
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array(), $this->sections['FILE']);
 
         $envVars = $testConfiguration->getEnvironmentVariables();
 
@@ -41,7 +43,7 @@
         $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
         $config->configure();
 
-        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array());
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array(),$this->sections['FILE']);
 
         $args = $testConfiguration->getTestCommandLineArguments();
 
@@ -53,7 +55,7 @@
         $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
         $config->configure();
 
-        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array());
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array(),$this->sections['FILE']);
         $phpargs = $testConfiguration->getPhpCommandLineArguments();
         $match = preg_match("/-d \"error_reporting=E_ALL | E_STRICT | 
E_DEPRECATED\" -d \"assert.active=1\"/", $phpargs);
 
@@ -65,7 +67,7 @@
         $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
         $config->configure();
  
-        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array());
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array(),$this->sections['FILE']);
         $phpExe = $testConfiguration->getPhpExecutable();
 
         $this->assertEquals('a-php-exe', $phpExe);
@@ -78,10 +80,10 @@
         $config->configure();
   
 
-        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array('GET'));
+        $testConfiguration = new rtTestConfiguration($config, $this->sections, 
array('GET'),$this->sections['FILE']);
         $phpExe = $testConfiguration->getPhpExecutable();
 
-        $this->assertEquals('a-php-cgi-exe', $phpExe);
+        $this->assertEquals('a-php-cgi-exe -C', $phpExe);
     }
 }
 ?>



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php