Changeset 657

Timestamp:

01/29/08 14:50:52 (11 months ago)

Author:

tswicegood

Message:

rename getDiff to getReason

other files affected are changed from the sed commands

Location:

Core/trunk

Files:

• src/PHPT/Case/FailureException.php (modified) (1 diff)
• src/PHPT/Reporter/Text.php (modified) (1 diff)
• src/PHPT/Section/EXPECTREGEX/InvalidRegexException.php (modified) (1 diff)
• src/PHPT/Section/ExpectationAbstract/UnexpectedOutputException.php (modified) (2 diffs)
• tests/Case/FailureException/declares-abstract-getDiff.phpt (modified) (2 diffs)
• tests/CodeRunner/Driver/WScriptShell/_skipif.inc (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/basic-usage.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/can-handle-code-exit.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/casts-stdin-to-string.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/executes-in-own-process.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/extends-CodeRunner_Abstract.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/injects-ini-settings.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/passes-environment-variables.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/passes-in-args.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/passes-in-stdin.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/result-stores-exitcode.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/throws-exception-on-bad-executable.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/timeout.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/uses-path-to-locate-executables-if-relative.phpt (modified) (1 prop)
• tests/CodeRunner/Driver/WScriptShell/validate-throws-exception-on-bad-executable.phpt (modified) (1 prop)
• tests/Reporter/Null/outputs-nothing.phpt (modified) (1 diff)
• tests/Reporter/_reporter-mocks.inc (modified) (1 diff)
• tests/Section/Expect/UnexpectedOutputException/getDiff-outputs-diff.phpt (modified) (2 diffs)
• tests/Section/Expectf/UnexpectedOutputException/getDiff-outputs-diff.phpt (modified) (2 diffs)
• tests/Section/Expectregex/UnexpectedOutputException/getDiff-outputs-diff.phpt (modified) (2 diffs)

Core/trunk/src/PHPT/Case/FailureException.php

@@ -8 +8 @@
     }
     
-    abstract public function getDiff();
+    abstract public function getReason();
 }

Core/trunk/src/PHPT/Reporter/Text.php

@@ -94 +94 @@
         $this->_failures[$case->filename] = array(
             'message' => $failure->getMessage(),
-            'diff' => $failure->getDiff(),
+            'diff' => $failure->getReason(),
         );
         $this->_output('F');

Core/trunk/src/PHPT/Section/EXPECTREGEX/InvalidRegexException.php

@@ -12 +12 @@
     }
     
-    public function getDiff()
+    public function getReason()
     {
         return '';

Core/trunk/src/PHPT/Section/ExpectationAbstract/UnexpectedOutputException.php

@@ -24 +24 @@
     public function __toString()
     {
-        return $this->getDiff();
+        return $this->getReason();
     }
     
-    public function getDiff()
+    public function getReason()
     {
         return (string)new PHPT_Util_Diff($this->_wanted, $this->_actual);
@@ -53 +53 @@
         file_put_contents(
             $this->_case->filename . '.diff',
-            $this->getDiff()
+            $this->getReason()
         );
     }

Core/trunk/tests/Case/FailureException/declares-abstract-getDiff.phpt

@@ -1 +1 @@
 --TEST--
-PHPT_Case_FailureException declares a getDiff() method as an abstract
+PHPT_Case_FailureException declares a getReason() method as an abstract
 --FILE--
 <?php
@@ -7 +7 @@
 
 $reflection = new ReflectionClass('PHPT_Case_FailureException');
-assert('$reflection->hasMethod("getDiff")');
-assert('$reflection->getMethod("getDiff")->isAbstract()');
+assert('$reflection->hasMethod("getReason")');
+assert('$reflection->getMethod("getReason")->isAbstract()');
 
 ?>

Core/trunk/tests/Reporter/Null/outputs-nothing.phpt

@@ -15 +15 @@
 {
     public function __construct() { }
-    public function getDiff() { }
+    public function getReason() { }
 }
 

Core/trunk/tests/Reporter/_reporter-mocks.inc

@@ -12 +12 @@
         parent::__construct(new PHPT_SimpleTestCase(), $msg);
     }
-    public function getDiff() {
+    public function getReason() {
         return (string)new PHPT_Util_Diff('one', 'two');
     }

Core/trunk/tests/Section/Expect/UnexpectedOutputException/getDiff-outputs-diff.phpt

@@ -1 +1 @@
 --TEST--
-When a PHPT_Section_EXPECT_UnexpectedOutputException::getDiff() is called, the
+When a PHPT_Section_EXPECT_UnexpectedOutputException::getReason() is called, the
 diff is returned
 --FILE--
@@ -10 +10 @@
 $case->filename = dirname(__FILE__) . '/foobar.phpt';
 $exception = new PHPT_Section_EXPECT_UnexpectedOutputException($case, "one");
-echo $exception->getDiff(), "\n";
+echo $exception->getReason(), "\n";
 
 ?>

Core/trunk/tests/Section/Expectf/UnexpectedOutputException/getDiff-outputs-diff.phpt

@@ -1 +1 @@
 --TEST--
-When a PHPT_Section_EXPECTF_UnexpectedOutputException::getDiff() is called, the
+When a PHPT_Section_EXPECTF_UnexpectedOutputException::getReason() is called, the
 diff is returned
 --FILE--
@@ -10 +10 @@
 $case->filename = dirname(__FILE__) . '/foobar.phpt';
 $exception = new PHPT_Section_EXPECTF_UnexpectedOutputException($case, "one");
-echo $exception->getDiff(), "\n";
+echo $exception->getReason(), "\n";
 
 ?>

Core/trunk/tests/Section/Expectregex/UnexpectedOutputException/getDiff-outputs-diff.phpt

@@ -1 +1 @@
 --TEST--
-When a PHPT_Section_EXPECTREGEX_UnexpectedOutputException::getDiff() is called, the
+When a PHPT_Section_EXPECTREGEX_UnexpectedOutputException::getReason() is called, the
 diff is returned
 --FILE--
@@ -10 +10 @@
 $case->filename = dirname(__FILE__) . '/foobar.phpt';
 $exception = new PHPT_Section_EXPECTREGEX_UnexpectedOutputException($case, "one");
-echo $exception->getDiff(), "\n";
+echo $exception->getReason(), "\n";
 
 ?>