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

2009-05-17 Thread Zoe Slattery 
zoe Sun May 17 12:53:51 2009 UTC

  Modified files:  
/phpruntests/tests/testcase rtTestDifferenceTest.php 
rtTestConfigurationTest.php 
  Log:
  fix tests
  
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtTestDifferenceTest.php?r1=1.3r2=1.4diff_format=u
Index: phpruntests/tests/testcase/rtTestDifferenceTest.php
diff -u phpruntests/tests/testcase/rtTestDifferenceTest.php:1.3 
phpruntests/tests/testcase/rtTestDifferenceTest.php:1.4
--- phpruntests/tests/testcase/rtTestDifferenceTest.php:1.3 Fri Apr 24 
09:42:01 2009
+++ phpruntests/tests/testcase/rtTestDifferenceTest.php Sun May 17 12:53:51 2009
@@ -7,7 +7,7 @@
 {
 public function testTestDifference()
 {
-$expectSection = new rtExpectSection('EXPECT', array('Hello World'));  
 
+$expectSection = rtExpectSection::getInstance('EXPECT', array('Hello 
World'));   
 $testDifference = new rtTestDifference($expectSection, 'Hello Dolly');
 
 $difference = $testDifference-getDifference();
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtTestConfigurationTest.php?r1=1.7r2=1.8diff_format=u
Index: phpruntests/tests/testcase/rtTestConfigurationTest.php
diff -u phpruntests/tests/testcase/rtTestConfigurationTest.php:1.7 
phpruntests/tests/testcase/rtTestConfigurationTest.php:1.8
--- phpruntests/tests/testcase/rtTestConfigurationTest.php:1.7  Wed May 13 
10:04:42 2009
+++ phpruntests/tests/testcase/rtTestConfigurationTest.php  Sun May 17 
12:53:51 2009
@@ -11,10 +11,10 @@
 {
 $this-php = $this-php = trim(shell_exec(which php));
 
-$this-sections['ARGS'] = new rtArgsSection('ARGS', array('-vvv -a 
value - -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'));
+$this-sections['ARGS'] = rtArgsSection::getInstance('ARGS', 
array('-vvv -a value - -2 -v'));
+$this-sections['ENV'] = rtEnvSection::getInstance('ENV', array('env1 
= ENV1', 'env2=ENV2'));
+$this-sections['INI'] = rtIniSection::getInstance('INI', 
array('error_reporting=E_ALL | E_STRICT | E_DEPRECATED', 'assert.active = 1'));
+$this-sections['FILE'] = rtFileSection::getInstance('FILE', 
array('blah'));
 
 }
 



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

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

2009-05-13 Thread Zoe Slattery 
zoe Wed May 13 10:04:43 2009 UTC

  Modified files:  
/phpruntests/tests/testcase rtTestConfigurationTest.php 
  Log:
  fixing stupidity in check
  
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtTestConfigurationTest.php?r1=1.6r2=1.7diff_format=u
Index: phpruntests/tests/testcase/rtTestConfigurationTest.php
diff -u phpruntests/tests/testcase/rtTestConfigurationTest.php:1.6 
phpruntests/tests/testcase/rtTestConfigurationTest.php:1.7
--- phpruntests/tests/testcase/rtTestConfigurationTest.php:1.6  Wed May 13 
01:48:53 2009
+++ phpruntests/tests/testcase/rtTestConfigurationTest.php  Wed May 13 
10:04:42 2009
@@ -72,7 +72,7 @@
 $testConfiguration = new rtTestConfiguration($config, $this-sections, 
array(),$this-sections['FILE']);
 $phpExe = $testConfiguration-getPhpExecutable();
 
-$this-assertEquals('/usr/local/bin/php', $phpExe);
+$this-assertEquals($this-php, $phpExe);
 }
 
 public function testPHPCgiExecutable()



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

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

2009-05-12 Thread Zoe Slattery 
zoe Wed May 13 01:48:53 2009 UTC

  Modified files:  
/phpruntests/tests/testcase rtTestConfigurationTest.php 
  Log:
  fixing test
  
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtTestConfigurationTest.php?r1=1.5r2=1.6diff_format=u
Index: phpruntests/tests/testcase/rtTestConfigurationTest.php
diff -u phpruntests/tests/testcase/rtTestConfigurationTest.php:1.5 
phpruntests/tests/testcase/rtTestConfigurationTest.php:1.6
--- phpruntests/tests/testcase/rtTestConfigurationTest.php:1.5  Sun Apr 26 
22:45:10 2009
+++ phpruntests/tests/testcase/rtTestConfigurationTest.php  Wed May 13 
01:48:53 2009
@@ -9,6 +9,8 @@
 
 public function setUp()
 {
+$this-php = $this-php = trim(shell_exec(which php));
+
 $this-sections['ARGS'] = new rtArgsSection('ARGS', array('-vvv -a 
value - -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'));
@@ -18,7 +20,7 @@
 
 public function testCreateInstance()
 {
-$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();
 
 $testConfiguration = new rtTestConfiguration($config, $this-sections, 
array(),$this-sections['FILE']);
@@ -28,7 +30,7 @@
 
 public function testEnv()
 {
-$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();
 
 $testConfiguration = new rtTestConfiguration($config, $this-sections, 
array(), $this-sections['FILE']);
@@ -40,7 +42,7 @@
 
 public function testArgs()
 {
-$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();
 
 $testConfiguration = new rtTestConfiguration($config, $this-sections, 
array(),$this-sections['FILE']);
@@ -52,7 +54,7 @@
 
 public function testIni()
 {
-$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();
 
 $testConfiguration = new rtTestConfiguration($config, $this-sections, 
array(),$this-sections['FILE']);
@@ -64,18 +66,18 @@
 
 public function testPHPExecutable()
 {
-$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();
  
 $testConfiguration = new rtTestConfiguration($config, $this-sections, 
array(),$this-sections['FILE']);
 $phpExe = $testConfiguration-getPhpExecutable();
 
-$this-assertEquals('a-php-exe', $phpExe);
+$this-assertEquals('/usr/local/bin/php', $phpExe);
 }
 
 public function testPHPCgiExecutable()
 {
-$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-setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE', 
'a-php-cgi-exe');
 $config-configure();
   



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

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

2009-04-26 Thread 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.4r2=1.5diff_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 - -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

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

2009-04-25 Thread Zoe Slattery 
zoe Sat Apr 25 15:05:45 2009 UTC

  Modified files:  
/phpruntests/tests/testcase rtTestConfigurationTest.php 
  Log:
  Adding check for CGI executable
  
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtTestConfigurationTest.php?r1=1.3r2=1.4diff_format=u
Index: phpruntests/tests/testcase/rtTestConfigurationTest.php
diff -u phpruntests/tests/testcase/rtTestConfigurationTest.php:1.3 
phpruntests/tests/testcase/rtTestConfigurationTest.php:1.4
--- phpruntests/tests/testcase/rtTestConfigurationTest.php:1.3  Fri Apr 24 
09:42:01 2009
+++ phpruntests/tests/testcase/rtTestConfigurationTest.php  Sat Apr 25 
15:05:45 2009
@@ -19,7 +19,7 @@
 $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
 $config-configure();
 
-$testConfiguration = new rtTestConfiguration($config, $this-sections);
+$testConfiguration = new rtTestConfiguration($config, $this-sections, 
array());
 
 $this-assertEquals('rtTestConfiguration', 
get_class($testConfiguration));
 }
@@ -29,7 +29,7 @@
 $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
 $config-configure();
 
-$testConfiguration = new rtTestConfiguration($config, $this-sections);
+$testConfiguration = new rtTestConfiguration($config, $this-sections, 
array());
 
 $envVars = $testConfiguration-getEnvironmentVariables();
 
@@ -41,7 +41,7 @@
 $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
 $config-configure();
 
-$testConfiguration = new rtTestConfiguration($config, $this-sections);
+$testConfiguration = new rtTestConfiguration($config, $this-sections, 
array());
 
 $args = $testConfiguration-getTestCommandLineArguments();
 
@@ -53,11 +53,35 @@
 $config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
 $config-configure();
 
-$testConfiguration = new rtTestConfiguration($config, $this-sections);
+$testConfiguration = new rtTestConfiguration($config, $this-sections, 
array());
 $phpargs = $testConfiguration-getPhpCommandLineArguments();
 $match = preg_match(/-d \error_reporting=E_ALL | E_STRICT | 
E_DEPRECATED\ -d \assert.active=1\/, $phpargs);
 
 $this-assertEquals(1, $match);
 }
+
+public function testPHPExecutable()
+{
+$config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
+$config-configure();
+ 
+$testConfiguration = new rtTestConfiguration($config, $this-sections, 
array());
+$phpExe = $testConfiguration-getPhpExecutable();
+
+$this-assertEquals('a-php-exe', $phpExe);
+}
+
+public function testPHPCgiExecutable()
+{
+$config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', 'a-php-exe', 'test.phpt'));
+$config-setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE', 
'a-php-cgi-exe');
+$config-configure();
+  
+
+$testConfiguration = new rtTestConfiguration($config, $this-sections, 
array('GET'));
+$phpExe = $testConfiguration-getPhpExecutable();
+
+$this-assertEquals('a-php-cgi-exe', $phpExe);
+}
 }
 ?



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