com phpruntests: Fixing a bug in the differencing code: src/testcase/rtTestDifference.php
| From: | David Soria Parra | Date: | Fri, 05 Jun 2009 09:30:19 +0000 |
| Subject: | com phpruntests: Fixing a bug in the differencing code: src/testcase/rtTestDifference.php | ||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-66426@lists.php.net to get a copy of this message | ||
Commit: 4e907b7b80df3f9cc99da4ce959e5889c42f3c96
Author: Zoe Slattery <zoe@php.net> Fri, 5 Jun 2009 09:30:19 +0000
Parents: 2aa70e015456ff618297a6d495fe5ced99b650a0
Branches: master
Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=4e907b7b80df3f9cc99da4ce959e5889c42f3c96
Log:
Fixing a bug in the differencing code
Changed paths:
M src/testcase/rtTestDifference.php
Diff:
diff --git a/src/testcase/rtTestDifference.php b/src/testcase/rtTestDifference.php
index 35f6818..6570599 100644
--- a/src/testcase/rtTestDifference.php
+++ b/src/testcase/rtTestDifference.php
@@ -22,16 +22,23 @@ class rtTestDifference
public function __construct(rtOutputSection $expectedOutput, $output)
{
- $this->expectedOutput = $expectedOutput->getContents();
+
+ $this->expectedOutput = $expectedOutput->getContents();
+
+ //Expect a regular expression from EXPECTF or EXPECTREGEX but not from EXPECT sections
+ $is_reg = true;
+ if(get_class($expectedOutput) == 'rtExpectSection') {
+ $is_reg = false;
+ }
$this->expectedRegularExpression = explode(b"\n",
$expectedOutput->getPattern());
$this->output = explode(b"\n", $output);
- $this->generateDiff();
+ $this->generateDiff($is_reg);
}
- public function generateDiff()
+ public function generateDiff($is_reg)
{
- $this->difference = $this->generateArrayDiff($this->expectedRegularExpression,
$this->output, true, $this->expectedOutput);
+ $this->difference = $this->generateArrayDiff($this->expectedRegularExpression,
$this->output, $is_reg, $this->expectedOutput);
}
/**
@@ -55,6 +62,14 @@ class rtTestDifference
*/
public function generateArrayDiff($ar1, $ar2, $is_reg, $w)
{
+ var_dump($is_reg);
+
+ file_put_contents("/home/zoe/bug/ar1_my.out", $ar1);
+ file_put_contents("/home/zoe/bug/ar2_my.out", $ar2);
+ file_put_contents("/home/zoe/bug/w_my.out", $w);
+
+
+
$idx1 = 0; $ofs1 = 0; $cnt1 = @count($ar1);
$idx2 = 0; $ofs2 = 0; $cnt2 = @count($ar2);
$diff = array();
@@ -189,6 +204,8 @@ class rtTestDifference
public function compLine($l1, $l2, $is_reg)
{
if ($is_reg) {
+ /* var_dump($l1);
+ var_dump($l2);*/
return preg_match((binary) "/^$l1$/s", (binary) $l2);
} else {
return !strcmp((binary) $l1, (binary) $l2);