zoe Tue, 04 Aug 2009 21:47:03 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286821
Log:
Change to the way POST section files are created
Changed paths:
U php/phpruntests/trunk/tests/testcase/rtTestConfigurationTest.php
U php/phpruntests/trunk/tests/testcase/rtTestDifferenceTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtArgsSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtCookieSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtDeflatePostSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtEnvSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtGetSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtGzipPostSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtIniSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/executablesections/rtCleanSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/executablesections/rtFileExternalSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/executablesections/rtFileSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/executablesections/rtSkipIfSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/informationsections/rtCreditsSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/informationsections/rtTestHeaderSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/informationsections/rtXfailSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectFSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectHeadersSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectRegexSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectSectionTest.php
U php/phpruntests/trunk/tests/testcase/sections/rtSectionTest.php
Modified: php/phpruntests/trunk/tests/testcase/rtTestConfigurationTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/rtTestConfigurationTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/rtTestConfigurationTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -11,10 +11,10 @@
{
$this->php = $this->php = trim(shell_exec("which php"));
- $this->sections['ARGS'] = rtArgsSection::getInstance('ARGS', array('-vvv -a value -1111 -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'));
+ $this->sections['ARGS'] = rtArgsSection::getInstance('ARGS', array('-vvv -a value -1111 -2 -v'), 'testname');
+ $this->sections['ENV'] = rtEnvSection::getInstance('ENV', array('env1 = ENV1', 'env2=ENV2'), 'testname');
+ $this->sections['INI'] = rtIniSection::getInstance('INI', array('error_reporting=E_ALL | E_STRICT | E_DEPRECATED', 'assert.active = 1'), 'testname');
+ $this->sections['FILE'] = rtFileSection::getInstance('FILE', array('blah'), 'testname');
}
Modified: php/phpruntests/trunk/tests/testcase/rtTestDifferenceTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/rtTestDifferenceTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/rtTestDifferenceTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testTestDifference()
{
- $expectSection = rtExpectSection::getInstance('EXPECT', array('Hello World'));
+ $expectSection = rtExpectSection::getInstance('EXPECT', array('Hello World'), 'testname');
$testDifference = new rtTestDifference($expectSection, 'Hello Dolly');
$difference = $testDifference->getDifference();
Modified: php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtArgsSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtArgsSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtArgsSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreateInstance()
{
- $argsSection = rtArgsSection::getInstance('ARGS', array('-vvv -a value -1111 -2 -v'));
+ $argsSection = rtArgsSection::getInstance('ARGS', array('-vvv -a value -1111 -2 -v'), 'testname');
$arglist = $argsSection->getTestCommandLineArguments();
$this->assertEquals('-- -vvv -a value -1111 -2 -v', $arglist);
Modified: php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtCookieSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtCookieSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtCookieSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -6,7 +6,7 @@
{
public function testCreateInstance()
{
- $cookieSection = rtCookieSection::getInstance('COOKIE', array('hello=World&goodbye=MrChips'));
+ $cookieSection = rtCookieSection::getInstance('COOKIE', array('hello=World&goodbye=MrChips'), 'testname');
$envlist = $cookieSection->getCookieVariables();
$this->assertEquals('hello=World&goodbye=MrChips', $envlist['HTTP_COOKIE']);
Modified: php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtDeflatePostSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtDeflatePostSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtDeflatePostSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -6,7 +6,7 @@
{
public function testCreateInstance()
{
- $postSection = rtDeflatePostSection::getInstance('DEFLATE_POST', array('hello=World&goodbye=MrChips'));
+ $postSection = rtDeflatePostSection::getInstance('DEFLATE_POST', array('hello=World&goodbye=MrChips'), 'testname');
$envVars = $postSection->getPostVariables();
$this->assertEquals('POST', $envVars['REQUEST_METHOD']);
Modified: php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtEnvSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtEnvSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtEnvSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreateInstance()
{
- $envSection = rtEnvSection::getInstance('ENV', array('env1 = ENV1', 'env2=ENV2'));
+ $envSection = rtEnvSection::getInstance('ENV', array('env1 = ENV1', 'env2=ENV2'), 'testname');
$envlist = $envSection->getTestEnvironmentVariables();
$this->assertEquals('ENV1', $envlist['env1']);
@@ -16,7 +16,7 @@
public function testCreateInstance2()
{
- $envSection = rtEnvSection::getInstance('ENV', array('env1 = ENV1=env'));
+ $envSection = rtEnvSection::getInstance('ENV', array('env1 = ENV1=env'), 'testname');
$envlist = $envSection->getTestEnvironmentVariables();
$this->assertEquals('ENV1=env', $envlist['env1']);
Modified: php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtGetSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtGetSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtGetSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -6,7 +6,7 @@
{
public function testCreateInstance()
{
- $getSection = rtGetSection::getInstance('GET', array('hello=World&goodbye=MrChips'));
+ $getSection = rtGetSection::getInstance('GET', array('hello=World&goodbye=MrChips'), 'testname');
$envlist = $getSection->getGetVariables();
$this->assertEquals('hello=World&goodbye=MrChips', $envlist['QUERY_STRING']);
Modified: php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtGzipPostSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtGzipPostSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtGzipPostSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -6,7 +6,7 @@
{
public function testCreateInstance()
{
- $postSection = rtGzipPostSection::getInstance('GZIP_POST', array('hello=World&goodbye=MrChips'));
+ $postSection = rtGzipPostSection::getInstance('GZIP_POST', array('hello=World&goodbye=MrChips'), 'testname');
$envVars = $postSection->getPostVariables();
$this->assertEquals('POST', $envVars['REQUEST_METHOD']);
Modified: php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtIniSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtIniSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtIniSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreateInstance()
{
- $iniSection = rtIniSection::getInstance('INI', array('error_reporting=E_ALL | E_STRICT | E_DEPRECATED', 'assert.active = 1'));
+ $iniSection = rtIniSection::getInstance('INI', array('error_reporting=E_ALL | E_STRICT | E_DEPRECATED', 'assert.active = 1'), 'testname');
$iniSection->substitutePWD('a-file-name');
$inilist = $iniSection->getCommandLineArguments();
@@ -16,7 +16,7 @@
}
public function testSubtitutePWD()
{
- $iniSection = rtIniSection::getInstance('INI', array('include_path={PWD}'));
+ $iniSection = rtIniSection::getInstance('INI', array('include_path={PWD}'), 'testname');
$afile = __FILE__;
$iniSection->substitutePWD($afile);
$inilist = $iniSection->getCommandLineArguments();
Modified: php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -12,7 +12,7 @@
'Content-Type:the second',
'mary',
);
- $postSection = rtPostRawSection::getInstance('POST_RAW', $post_array);
+ $postSection = rtPostRawSection::getInstance('POST_RAW', $post_array, 'testname');
$envVars = $postSection->getPostVariables();
$this->assertEquals('POST', $envVars['REQUEST_METHOD']);
Modified: php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -6,7 +6,7 @@
{
public function testCreateInstance()
{
- $postSection = rtPostSection::getInstance('POST', array('hello=World&goodbye=MrChips'));
+ $postSection = rtPostSection::getInstance('POST', array('hello=World&goodbye=MrChips'), 'testname');
$envVars = $postSection->getPostVariables();
$this->assertEquals('POST', $envVars['REQUEST_METHOD']);
Modified: php/phpruntests/trunk/tests/testcase/sections/executablesections/rtCleanSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/executablesections/rtCleanSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/executablesections/rtCleanSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreateInstance()
{
- $cleanSection = rtCleanSection::getInstance('CLEAN', array('<?php', 'echo "hello world";', '?>'));
+ $cleanSection = rtCleanSection::getInstance('CLEAN', array('<?php', 'echo "hello world";', '?>'), 'testname');
$code = $cleanSection->getContents();
$this->assertEquals('<?php', $code[0]);
Modified: php/phpruntests/trunk/tests/testcase/sections/executablesections/rtFileExternalSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/executablesections/rtFileExternalSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/executablesections/rtFileExternalSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreateInstance()
{
- $fileSection = rtFileExternalSection::getInstance('FILE_EXTERNAL', array('<?php', 'echo "hello world";', '?>'));
+ $fileSection = rtFileExternalSection::getInstance('FILE_EXTERNAL', array('<?php', 'echo "hello world";', '?>'), 'testname');
$code = $fileSection->getContents();
$this->assertEquals('<?php', $code[0]);
Modified: php/phpruntests/trunk/tests/testcase/sections/executablesections/rtFileSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/executablesections/rtFileSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/executablesections/rtFileSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreateInstance()
{
- $fileSection = rtFileSection::getInstance('FILE', array('<?php', 'echo "hello world";', '?>'));
+ $fileSection = rtFileSection::getInstance('FILE', array('<?php', 'echo "hello world";', '?>'), 'testname');
$code = $fileSection->getContents();
$this->assertEquals('<?php', $code[0]);
Modified: php/phpruntests/trunk/tests/testcase/sections/executablesections/rtSkipIfSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/executablesections/rtSkipIfSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/executablesections/rtSkipIfSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreateInstance()
{
- $skipifSection = rtSkipIfSection::getInstance('SKIPIF', array('<?php', 'echo "hello world";', '?>'));
+ $skipifSection = rtSkipIfSection::getInstance('SKIPIF', array('<?php', 'echo "hello world";', '?>'), 'testname');
$code = $skipifSection->getContents();
$this->assertEquals('<?php', $code[0]);
Modified: php/phpruntests/trunk/tests/testcase/sections/informationsections/rtCreditsSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/informationsections/rtCreditsSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/informationsections/rtCreditsSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreateInstance()
{
- $creditsSection = rtCreditsSection::getInstance('CREDITS', array('Test from Fred', 'PHP London test fest'));
+ $creditsSection = rtCreditsSection::getInstance('CREDITS', array('Test from Fred', 'PHP London test fest'), 'testname');
$creditslist = $creditsSection->getContents();
$this->assertEquals('Test from Fred', $creditslist[0]);
Modified: php/phpruntests/trunk/tests/testcase/sections/informationsections/rtTestHeaderSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/informationsections/rtTestHeaderSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/informationsections/rtTestHeaderSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreateInstance()
{
- $headerSection = rtTestHeaderSection::getInstance('TEST', array('a test to test something'));
+ $headerSection = rtTestHeaderSection::getInstance('TEST', array('a test to test something'), 'testname');
$header = $headerSection->getHeader();
$this->assertEquals('a test to test something', $header);
Modified: php/phpruntests/trunk/tests/testcase/sections/informationsections/rtXfailSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/informationsections/rtXfailSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/informationsections/rtXfailSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreateInstance()
{
- $xfailSection = rtXfailSection::getInstance('XFAIL', array('Bug number 12345'));
+ $xfailSection = rtXfailSection::getInstance('XFAIL', array('Bug number 12345'), 'testname');
$xfail = $xfailSection->getReason();
$this->assertEquals('Bug number 12345', $xfail);
Modified: php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectFSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectFSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectFSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreatePattern()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello World'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello World'), 'testname');
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello World', $pattern);
@@ -15,7 +15,7 @@
public function testPercentE()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %e'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %e'), 'testname');
$pattern = $expectFSection->getPattern();
$this->assertEquals("Hello \\/", $pattern);
@@ -23,7 +23,7 @@
public function testPercentS()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %s'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %s'), 'testname');
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello [^\r\n]+', $pattern);
@@ -31,7 +31,7 @@
public function testPercentA()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %a'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %a'), 'testname');
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello .+', $pattern);
@@ -39,7 +39,7 @@
public function testPercentW()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %w'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %w'), 'testname');
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello \s*', $pattern);
@@ -47,7 +47,7 @@
public function testPercentI()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %i'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %i'), 'testname');
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello [+-]?\d+', $pattern);
@@ -55,7 +55,7 @@
public function testPercentD()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %d'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %d'), 'testname');
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello \d+', $pattern);
@@ -63,7 +63,7 @@
public function testPercentX()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %x'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %x'), 'testname');
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello [0-9a-fA-F]+', $pattern);
@@ -71,7 +71,7 @@
public function testPercentF()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %f'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %f'), 'testname');
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello [+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', $pattern);
@@ -79,7 +79,7 @@
public function testPercentR()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('%unicode|string%(18) "%r\0%rMyClass%r\0%rpri_value%r\0%r"'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('%unicode|string%(18) "%r\0%rMyClass%r\0%rpri_value%r\0%r"'), 'testname');
$pattern = $expectFSection->getPattern();
$this->assertEquals('string\(18\) "(\0)MyClass(\0)pri_value(\0)"', $pattern);
@@ -87,7 +87,7 @@
public function testPercentC()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %c'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %c'), 'testname');
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello .', $pattern);
@@ -95,7 +95,7 @@
public function testCompare()
{
- $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %s') );
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF', array('Hello %s'), 'testname' );
$result = $expectFSection->compare('Hello World');
$this->assertTrue($result);
Modified: php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectHeadersSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectHeadersSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectHeadersSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -6,7 +6,7 @@
class rtExpectHeadersSectionTest extends PHPUnit_Framework_TestCase
{
public function testCreatePattern() {
- $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS', array('abc:def', 'ghi:jkl'));
+ $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS', array('abc:def', 'ghi:jkl'), 'testname');
$pattern = $expectSection->getPattern();
$this->assertEquals('def', $pattern['abc']);
@@ -14,7 +14,7 @@
}
public function testCreatePattern2() {
- $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS', array("abc:def\r\n", "ghi:jkl:fred"));
+ $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS', array("abc:def\r\n", "ghi:jkl:fred"), 'testname');
$pattern = $expectSection->getPattern();
$this->assertEquals('def', $pattern['abc']);
@@ -22,14 +22,14 @@
}
public function testCompare() {
- $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS', array("abc:def\r\n", "ghi:jkl:fred"));
+ $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS', array("abc:def\r\n", "ghi:jkl:fred"), 'testname');
$test = $expectSection->compare("ghi:jkl:fred\nabc: def");
$this->assertTrue($test);
}
public function testCompare2() {
- $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS', array("abc:def\r\n", "ghi:jkl:fred"));
+ $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS', array("abc:def\r\n", "ghi:jkl:fred"), 'testname');
$test = $expectSection->compare("ghi:jkl\r\nabcd: def\r\n");
$this->assertFalse($test);
Modified: php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectRegexSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectRegexSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectRegexSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testCreateObject()
{
- $expectRegexSection = rtExpectRegexSection::getInstance('EXPECTREGEX', array('Hello \w{5}'));
+ $expectRegexSection = rtExpectRegexSection::getInstance('EXPECTREGEX', array('Hello \w{5}'), 'testname');
$pattern = $expectRegexSection->getPattern();
$this->assertEquals("Hello \w{5}", $pattern);
@@ -15,7 +15,7 @@
public function testCompare()
{
- $expectRegexSection = rtExpectRegexSection::getInstance('EXPECTREGEX', array('Hello \w{5}'));
+ $expectRegexSection = rtExpectRegexSection::getInstance('EXPECTREGEX', array('Hello \w{5}'), 'testname');
$result = $expectRegexSection->compare('Hello World');
$this->assertTrue($result);
Modified: php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -6,7 +6,7 @@
class rtExpectSectionTest extends PHPUnit_Framework_TestCase
{
public function testCreatePattern() {
- $expectSection = rtExpectSection::getInstance('EXPECT', array('Hello World'));
+ $expectSection = rtExpectSection::getInstance('EXPECT', array('Hello World'), 'testname');
$pattern = $expectSection->getPattern();
$this->assertEquals('Hello World', $pattern);
@@ -15,7 +15,7 @@
public function testCreateTwolinePattern()
{
- $expectSection = rtExpectSection::getInstance('EXPECT', array('Hello World', 'Hello again'));
+ $expectSection = rtExpectSection::getInstance('EXPECT', array('Hello World', 'Hello again'), 'testname');
$pattern = $expectSection->getPattern();
$this->assertEquals("Hello World\nHello again", $pattern);
@@ -23,7 +23,7 @@
public function testCreateTwolinePatternWithr()
{
- $expectSection = rtExpectSection::getInstance('EXPECT', array("Hello World\r", 'Hello again'));
+ $expectSection = rtExpectSection::getInstance('EXPECT', array("Hello World\r", 'Hello again'), 'testname');
$pattern = $expectSection->getPattern();
$this->assertEquals("Hello World\nHello again", $pattern);
@@ -31,7 +31,7 @@
public function testCompare()
{
- $expectSection = rtExpectSection::getInstance('EXPECT', array('Hello World') );
+ $expectSection = rtExpectSection::getInstance('EXPECT', array('Hello World'), 'testname' );
$result = $expectSection->compare('Hello World');
$this->assertTrue($result);
Modified: php/phpruntests/trunk/tests/testcase/sections/rtSectionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/sections/rtSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/rtSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testGetInstance()
{
- $expectFSection = rtSection::getInstance('EXPECTF', array('Hello World'));
+ $expectFSection = rtSection::getInstance('EXPECTF', array('Hello World'), 'testname');
$this->assertEquals('rtExpectFSection', get_class($expectFSection));
}
@@ -16,7 +16,7 @@
*/
public function testGetInstanceThrowsExceptionOnUnknownSection()
{
- rtSection::getInstance('NONSENSE', array());
+ rtSection::getInstance('NONSENSE', array(), 'testname');
}
}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
