zoe Sun May 17 12:55:15 2009 UTC
Modified files:
/phpruntests/tests/testcase/sections/outputsections
rtExpectRegexSectionTest.php
rtExpectHeadersSectionTest.php
rtExpectFSectionTest.php
rtExpectSectionTest.php
Log:
fix tests
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/sections/outputsections/rtExpectRegexSectionTest.php?r1=1.2&r2=1.3&diff_format=u
Index:
phpruntests/tests/testcase/sections/outputsections/rtExpectRegexSectionTest.php
diff -u
phpruntests/tests/testcase/sections/outputsections/rtExpectRegexSectionTest.php:1.2
phpruntests/tests/testcase/sections/outputsections/rtExpectRegexSectionTest.php:1.3
---
phpruntests/tests/testcase/sections/outputsections/rtExpectRegexSectionTest.php:1.2
Fri Apr 24 09:42:02 2009
+++
phpruntests/tests/testcase/sections/outputsections/rtExpectRegexSectionTest.php
Sun May 17 12:55:15 2009
@@ -7,7 +7,7 @@
{
public function testCreateObject()
{
- $expectRegexSection = new rtExpectRegexSection('EXPECTREGEX',
array('Hello \w{5}'));
+ $expectRegexSection = rtExpectRegexSection::getInstance('EXPECTREGEX',
array('Hello \w{5}'));
$pattern = $expectRegexSection->getPattern();
$this->assertEquals("Hello \w{5}", $pattern);
@@ -15,7 +15,7 @@
public function testCompare()
{
- $expectRegexSection = new rtExpectRegexSection('EXPECTREGEX',
array('Hello \w{5}'));
+ $expectRegexSection = rtExpectRegexSection::getInstance('EXPECTREGEX',
array('Hello \w{5}'));
$result = $expectRegexSection->compare('Hello World');
$this->assertTrue($result);
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/sections/outputsections/rtExpectHeadersSectionTest.php?r1=1.1&r2=1.2&diff_format=u
Index:
phpruntests/tests/testcase/sections/outputsections/rtExpectHeadersSectionTest.php
diff -u
phpruntests/tests/testcase/sections/outputsections/rtExpectHeadersSectionTest.php:1.1
phpruntests/tests/testcase/sections/outputsections/rtExpectHeadersSectionTest.php:1.2
---
phpruntests/tests/testcase/sections/outputsections/rtExpectHeadersSectionTest.php:1.1
Thu May 14 19:56:30 2009
+++
phpruntests/tests/testcase/sections/outputsections/rtExpectHeadersSectionTest.php
Sun May 17 12:55:15 2009
@@ -6,7 +6,7 @@
class rtExpectHeadersSectionTest extends PHPUnit_Framework_TestCase
{
public function testCreatePattern() {
- $expectSection = new rtExpectHeadersSection('EXPECTHEADERS',
array('abc:def', 'ghi:jkl'));
+ $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS',
array('abc:def', 'ghi:jkl'));
$pattern = $expectSection->getPattern();
$this->assertEquals('def', $pattern['abc']);
@@ -14,7 +14,7 @@
}
public function testCreatePattern2() {
- $expectSection = new rtExpectHeadersSection('EXPECTHEADERS',
array("abc:def\r\n", "ghi:jkl:fred"));
+ $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS',
array("abc:def\r\n", "ghi:jkl:fred"));
$pattern = $expectSection->getPattern();
$this->assertEquals('def', $pattern['abc']);
@@ -22,14 +22,14 @@
}
public function testCompare() {
- $expectSection = new rtExpectHeadersSection('EXPECTHEADERS',
array("abc:def\r\n", "ghi:jkl:fred"));
+ $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS',
array("abc:def\r\n", "ghi:jkl:fred"));
$test = $expectSection->compare("ghi:jkl:fred\nabc: def");
$this->assertTrue($test);
}
public function testCompare2() {
- $expectSection = new rtExpectHeadersSection('EXPECTHEADERS',
array("abc:def\r\n", "ghi:jkl:fred"));
+ $expectSection = rtExpectHeadersSection::getInstance('EXPECTHEADERS',
array("abc:def\r\n", "ghi:jkl:fred"));
$test = $expectSection->compare("ghi:jkl\r\nabcd: def\r\n");
$this->assertFalse($test);
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/sections/outputsections/rtExpectFSectionTest.php?r1=1.3&r2=1.4&diff_format=u
Index:
phpruntests/tests/testcase/sections/outputsections/rtExpectFSectionTest.php
diff -u
phpruntests/tests/testcase/sections/outputsections/rtExpectFSectionTest.php:1.3
phpruntests/tests/testcase/sections/outputsections/rtExpectFSectionTest.php:1.4
---
phpruntests/tests/testcase/sections/outputsections/rtExpectFSectionTest.php:1.3
Wed May 13 16:58:10 2009
+++ phpruntests/tests/testcase/sections/outputsections/rtExpectFSectionTest.php
Sun May 17 12:55:15 2009
@@ -7,7 +7,7 @@
{
public function testCreatePattern()
{
- $expectFSection = new rtExpectFSection('EXPECTF', array('Hello
World'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF',
array('Hello World'));
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello World', $pattern);
@@ -15,7 +15,7 @@
public function testPercentE()
{
- $expectFSection = new rtExpectFSection('EXPECTF', array('Hello %e'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF',
array('Hello %e'));
$pattern = $expectFSection->getPattern();
$this->assertEquals("Hello \\/", $pattern);
@@ -23,7 +23,7 @@
public function testPercentS()
{
- $expectFSection = new rtExpectFSection('EXPECTF', array('Hello %s'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF',
array('Hello %s'));
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello [^\r\n]+', $pattern);
@@ -31,7 +31,7 @@
public function testPercentA()
{
- $expectFSection = new rtExpectFSection('EXPECTF', array('Hello %a'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF',
array('Hello %a'));
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello .+', $pattern);
@@ -39,7 +39,7 @@
public function testPercentW()
{
- $expectFSection = new rtExpectFSection('EXPECTF', array('Hello %w'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF',
array('Hello %w'));
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello \s*', $pattern);
@@ -47,7 +47,7 @@
public function testPercentI()
{
- $expectFSection = new rtExpectFSection('EXPECTF', array('Hello %i'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF',
array('Hello %i'));
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello [+-]?\d+', $pattern);
@@ -55,7 +55,7 @@
public function testPercentD()
{
- $expectFSection = new rtExpectFSection('EXPECTF', array('Hello %d'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF',
array('Hello %d'));
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello \d+', $pattern);
@@ -63,7 +63,7 @@
public function testPercentX()
{
- $expectFSection = new rtExpectFSection('EXPECTF', array('Hello %x'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF',
array('Hello %x'));
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello [0-9a-fA-F]+', $pattern);
@@ -71,7 +71,7 @@
public function testPercentF()
{
- $expectFSection = new rtExpectFSection('EXPECTF', array('Hello %f'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF',
array('Hello %f'));
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello [+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?',
$pattern);
@@ -79,7 +79,7 @@
public function testPercentR()
{
- $expectFSection = new rtExpectFSection('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"'));
$pattern = $expectFSection->getPattern();
$this->assertEquals('string\(18\) "(\0)MyClass(\0)pri_value(\0)"',
$pattern);
@@ -87,7 +87,7 @@
public function testPercentC()
{
- $expectFSection = new rtExpectFSection('EXPECTF', array('Hello %c'));
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF',
array('Hello %c'));
$pattern = $expectFSection->getPattern();
$this->assertEquals('Hello .', $pattern);
@@ -95,7 +95,7 @@
public function testCompare()
{
- $expectFSection = new rtExpectFSection('EXPECTF', array('Hello %s') );
+ $expectFSection = rtExpectFSection::getInstance('EXPECTF',
array('Hello %s') );
$result = $expectFSection->compare('Hello World');
$this->assertTrue($result);
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/sections/outputsections/rtExpectSectionTest.php?r1=1.2&r2=1.3&diff_format=u
Index:
phpruntests/tests/testcase/sections/outputsections/rtExpectSectionTest.php
diff -u
phpruntests/tests/testcase/sections/outputsections/rtExpectSectionTest.php:1.2
phpruntests/tests/testcase/sections/outputsections/rtExpectSectionTest.php:1.3
---
phpruntests/tests/testcase/sections/outputsections/rtExpectSectionTest.php:1.2
Fri Apr 24 09:42:02 2009
+++ phpruntests/tests/testcase/sections/outputsections/rtExpectSectionTest.php
Sun May 17 12:55:15 2009
@@ -6,7 +6,7 @@
class rtExpectSectionTest extends PHPUnit_Framework_TestCase
{
public function testCreatePattern() {
- $expectSection = new rtExpectSection('EXPECT', array('Hello World'));
+ $expectSection = rtExpectSection::getInstance('EXPECT', array('Hello
World'));
$pattern = $expectSection->getPattern();
$this->assertEquals('Hello World', $pattern);
@@ -15,7 +15,7 @@
public function testCreateTwolinePattern()
{
- $expectSection = new rtExpectSection('EXPECT', array('Hello World',
'Hello again'));
+ $expectSection = rtExpectSection::getInstance('EXPECT', array('Hello
World', 'Hello again'));
$pattern = $expectSection->getPattern();
$this->assertEquals("Hello World\nHello again", $pattern);
@@ -23,7 +23,7 @@
public function testCreateTwolinePatternWithr()
{
- $expectSection = new rtExpectSection('EXPECT', array("Hello World\r",
'Hello again'));
+ $expectSection = rtExpectSection::getInstance('EXPECT', array("Hello
World\r", 'Hello again'));
$pattern = $expectSection->getPattern();
$this->assertEquals("Hello World\nHello again", $pattern);
@@ -31,7 +31,7 @@
public function testCompare()
{
- $expectSection = new rtExpectSection('EXPECT', array('Hello World') );
+ $expectSection = rtExpectSection::getInstance('EXPECT', array('Hello
World') );
$result = $expectSection->compare('Hello World');
$this->assertTrue($result);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
