Menu
▾
▴
[Simpletest-devel] SF.net SVN: simpletest: [1788] simpletest/trunk
|
From: <pp...@us...> - 2008-04-27 11:02:02
|
Revision: 1788
http://simpletest.svn.sourceforge.net/simpletest/?rev=1788&view=rev
Author: pp11
Date: 2008-04-27 04:01:59 -0700 (Sun, 27 Apr 2008)
Log Message:
-----------
Last batch of underscores removed from protected & private properties in core files related to PHP5+
Modified Paths:
--------------
simpletest/trunk/expectation.php
simpletest/trunk/mock_objects.php
simpletest/trunk/reporter.php
simpletest/trunk/scorer.php
simpletest/trunk/socket.php
simpletest/trunk/tag.php
simpletest/trunk/test/encoding_test.php
simpletest/trunk/test/errors_test.php
simpletest/trunk/test/expectation_test.php
simpletest/trunk/test/mock_objects_test.php
simpletest/trunk/test/user_agent_test.php
simpletest/trunk/url.php
Modified: simpletest/trunk/expectation.php
===================================================================
--- simpletest/trunk/expectation.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/expectation.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -325,8 +325,8 @@
* @subpackage UnitTester
*/
class WithinMarginExpectation extends SimpleExpectation {
- private $_upper;
- private $_lower;
+ private $upper;
+ private $lower;
/**
* Sets the value to compare against and the fuzziness of
@@ -338,8 +338,8 @@
*/
function __construct($value, $margin, $message = '%s') {
parent::__construct($message);
- $this->_upper = $value + $margin;
- $this->_lower = $value - $margin;
+ $this->upper = $value + $margin;
+ $this->lower = $value - $margin;
}
/**
@@ -350,7 +350,7 @@
* @access public
*/
function test($compare) {
- return (($compare <= $this->_upper) && ($compare >= $this->_lower));
+ return (($compare <= $this->upper) && ($compare >= $this->lower));
}
/**
@@ -374,8 +374,8 @@
* @access private
*/
protected function withinMessage($compare) {
- return "Within expectation [" . $this->dumper->describeValue($this->_lower) . "] and [" .
- $this->dumper->describeValue($this->_upper) . "]";
+ return "Within expectation [" . $this->dumper->describeValue($this->lower) . "] and [" .
+ $this->dumper->describeValue($this->upper) . "]";
}
/**
@@ -384,12 +384,12 @@
* @access private
*/
protected function outsideMessage($compare) {
- if ($compare > $this->_upper) {
+ if ($compare > $this->upper) {
return "Outside expectation " .
- $this->dumper->describeDifference($compare, $this->_upper);
+ $this->dumper->describeDifference($compare, $this->upper);
} else {
return "Outside expectation " .
- $this->dumper->describeDifference($compare, $this->_lower);
+ $this->dumper->describeDifference($compare, $this->lower);
}
}
}
@@ -614,7 +614,7 @@
* @subpackage UnitTester
*/
class PatternExpectation extends SimpleExpectation {
- private $_pattern;
+ private $pattern;
/**
* Sets the value to compare against.
@@ -624,7 +624,7 @@
*/
function __construct($pattern, $message = '%s') {
parent::__construct($message);
- $this->_pattern = $pattern;
+ $this->pattern = $pattern;
}
/**
@@ -633,7 +633,7 @@
* @access protected
*/
protected function getPattern() {
- return $this->_pattern;
+ return $this->pattern;
}
/**
@@ -737,7 +737,7 @@
* @subpackage UnitTester
*/
class IsAExpectation extends SimpleExpectation {
- private $_type;
+ private $type;
/**
* Sets the type to compare with.
@@ -747,7 +747,7 @@
*/
function __construct($type, $message = '%s') {
parent::__construct($message);
- $this->_type = $type;
+ $this->type = $type;
}
/**
@@ -756,7 +756,7 @@
* @access protected
*/
protected function getType() {
- return $this->_type;
+ return $this->type;
}
/**
@@ -768,9 +768,9 @@
*/
function test($compare) {
if (is_object($compare)) {
- return SimpleTestCompatibility::isA($compare, $this->_type);
+ return SimpleTestCompatibility::isA($compare, $this->type);
} else {
- return (strtolower(gettype($compare)) == $this->canonicalType($this->_type));
+ return (strtolower(gettype($compare)) == $this->canonicalType($this->type));
}
}
@@ -803,7 +803,7 @@
function testMessage($compare) {
$dumper = $this->getDumper();
return "Value [" . $dumper->describeValue($compare) .
- "] should be type [" . $this->_type . "]";
+ "] should be type [" . $this->type . "]";
}
}
@@ -814,7 +814,7 @@
* @subpackage UnitTester
*/
class NotAExpectation extends IsAExpectation {
- private $_type;
+ private $type;
/**
* Sets the type to compare with.
@@ -857,7 +857,7 @@
* @subpackage UnitTester
*/
class MethodExistsExpectation extends SimpleExpectation {
- private $_method;
+ private $method;
/**
* Sets the value to compare against.
@@ -868,7 +868,7 @@
*/
function __construct($method, $message = '%s') {
parent::__construct($message);
- $this->_method = &$method;
+ $this->method = &$method;
}
/**
@@ -878,7 +878,7 @@
* @access public
*/
function test($compare) {
- return (boolean)(is_object($compare) && method_exists($compare, $this->_method));
+ return (boolean)(is_object($compare) && method_exists($compare, $this->method));
}
/**
@@ -893,7 +893,7 @@
if (! is_object($compare)) {
return 'No method on non-object [' . $dumper->describeValue($compare) . ']';
}
- $method = $this->_method;
+ $method = $this->method;
return "Object [" . $dumper->describeValue($compare) .
"] should contain method [$method]";
}
Modified: simpletest/trunk/mock_objects.php
===================================================================
--- simpletest/trunk/mock_objects.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/mock_objects.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -517,7 +517,7 @@
* @subpackage MockObjects
*/
class SimpleReturn {
- private $_value;
+ private $value;
/**
* Stashes it for later.
@@ -527,7 +527,7 @@
* @access public
*/
function __construct($value) {
- $this->_value = $value;
+ $this->value = $value;
}
/**
@@ -536,7 +536,7 @@
* @access public
*/
function act() {
- return $this->_value;
+ return $this->value;
}
}
@@ -547,7 +547,7 @@
* @subpackage MockObjects
*/
class SimpleByReference {
- private $_reference;
+ private $reference;
/**
* Stashes it for later.
@@ -555,7 +555,7 @@
* @access public
*/
function __construct(&$reference) {
- $this->_reference = &$reference;
+ $this->reference = &$reference;
}
/**
@@ -564,7 +564,7 @@
* @access public
*/
function &act() {
- return $this->_reference;
+ return $this->reference;
}
}
@@ -575,7 +575,7 @@
* @subpackage MockObjects
*/
class SimpleByValue {
- private $_value;
+ private $value;
/**
* Stashes it for later.
@@ -585,7 +585,7 @@
* @access public
*/
function __construct($value) {
- $this->_value = $value;
+ $this->value = $value;
}
/**
@@ -594,7 +594,7 @@
* @access public
*/
function &act() {
- $dummy = $this->_value;
+ $dummy = $this->value;
return $dummy;
}
}
@@ -606,7 +606,7 @@
* @subpackage MockObjects
*/
class SimpleThrower {
- private $_exception;
+ private $exception;
/**
* Stashes it for later.
@@ -614,7 +614,7 @@
* @access public
*/
function __construct($exception) {
- $this->_exception = $exception;
+ $this->exception = $exception;
}
/**
@@ -622,7 +622,7 @@
* @access public
*/
function act() {
- throw $this->_exception;
+ throw $this->exception;
}
}
@@ -671,6 +671,7 @@
*/
class SimpleMock {
private $actions;
+ private $expectations;
private $wildcard = MOCK_ANYTHING;
private $is_strict = true;
private $call_counts;
@@ -686,7 +687,7 @@
*/
function SimpleMock() {
$this->actions = new SimpleCallSchedule();
- $this->_expectations = new SimpleCallSchedule();
+ $this->expectations = new SimpleCallSchedule();
$this->call_counts = array();
$this->expected_counts = array();
$this->max_counts = array();
@@ -904,7 +905,7 @@
function expect($method, $args, $message = '%s') {
$this->dieOnNoMethod($method, 'set expected arguments');
$this->checkArgumentsIsArray($args, 'set expected arguments');
- $this->_expectations->expectArguments($method, $args, $message);
+ $this->expectations->expectArguments($method, $args, $message);
$args = $this->replaceWildcards($args);
$message .= Mock::getExpectationLine();
$this->expected_args[strtolower($method)] =
@@ -1366,12 +1367,12 @@
*/
protected function createSubclassCode($methods) {
$code = "class " . $this->mock_class . " extends " . $this->class . " {\n";
- $code .= " public \$_mock;\n";
+ $code .= " public \$mock;\n";
$code .= $this->addMethodList(array_merge($methods, $this->reflection->getMethods()));
$code .= "\n";
$code .= " function " . $this->mock_class . "() {\n";
- $code .= " \$this->_mock = new " . $this->mock_base . "();\n";
- $code .= " \$this->_mock->disableExpectationNameChecks();\n";
+ $code .= " \$this->mock = new " . $this->mock_base . "();\n";
+ $code .= " \$this->mock->disableExpectationNameChecks();\n";
$code .= " }\n";
$code .= $this->chainMockReturns();
$code .= $this->chainMockExpectations();
@@ -1392,12 +1393,12 @@
*/
protected function extendClassCode($methods) {
$code = "class " . $this->mock_class . " extends " . $this->class . " {\n";
- $code .= " protected \$_mock;\n";
+ $code .= " protected \$mock;\n";
$code .= $this->addMethodList($methods);
$code .= "\n";
$code .= " function " . $this->mock_class . "() {\n";
- $code .= " \$this->_mock = new " . $this->mock_base . "();\n";
- $code .= " \$this->_mock->disableExpectationNameChecks();\n";
+ $code .= " \$this->mock = new " . $this->mock_base . "();\n";
+ $code .= " \$this->mock->disableExpectationNameChecks();\n";
$code .= " }\n";
$code .= $this->chainMockReturns();
$code .= $this->chainMockExpectations();
@@ -1455,7 +1456,7 @@
}
$code .= " " . $this->reflection->getSignature($method) . " {\n";
$code .= " \$args = func_get_args();\n";
- $code .= " \$result = &\$this->_mock->invoke(\"$method\", \$args);\n";
+ $code .= " \$result = &\$this->mock->invoke(\"$method\", \$args);\n";
$code .= " return \$result;\n";
$code .= " }\n";
}
@@ -1482,7 +1483,7 @@
* @access private
*/
protected function addMethodList($methods) {
- return " protected \$_mocked_methods = array('" .
+ return " protected \$mocked_methods = array('" .
implode("', '", array_map('strtolower', $methods)) .
"');\n";
}
@@ -1494,7 +1495,7 @@
* @access private
*/
protected function bailOutIfNotMocked($alias) {
- $code = " if (! in_array(strtolower($alias), \$this->_mocked_methods)) {\n";
+ $code = " if (! in_array(strtolower($alias), \$this->mocked_methods)) {\n";
$code .= " trigger_error(\"Method [$alias] is not mocked\");\n";
$code .= " \$null = null;\n";
$code .= " return \$null;\n";
@@ -1511,27 +1512,27 @@
protected function chainMockReturns() {
$code = " function returns(\$method, \$value, \$args = false) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->returns(\$method, \$value, \$args);\n";
+ $code .= " \$this->mock->returns(\$method, \$value, \$args);\n";
$code .= " }\n";
$code .= " function returnsAt(\$timing, \$method, \$value, \$args = false) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->returnsAt(\$timing, \$method, \$value, \$args);\n";
+ $code .= " \$this->mock->returnsAt(\$timing, \$method, \$value, \$args);\n";
$code .= " }\n";
$code .= " function setReturnValue(\$method, \$value, \$args = false) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->setReturnValue(\$method, \$value, \$args);\n";
+ $code .= " \$this->mock->setReturnValue(\$method, \$value, \$args);\n";
$code .= " }\n";
$code .= " function setReturnValueAt(\$timing, \$method, \$value, \$args = false) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
+ $code .= " \$this->mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
$code .= " }\n";
$code .= " function setReturnReference(\$method, &\$ref, \$args = false) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->setReturnReference(\$method, \$ref, \$args);\n";
+ $code .= " \$this->mock->setReturnReference(\$method, \$ref, \$args);\n";
$code .= " }\n";
$code .= " function setReturnReferenceAt(\$timing, \$method, &\$ref, \$args = false) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
+ $code .= " \$this->mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
$code .= " }\n";
return $code;
}
@@ -1545,35 +1546,35 @@
protected function chainMockExpectations() {
$code = " function expect(\$method, \$args = false, \$msg = '%s') {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->expect(\$method, \$args, \$msg);\n";
+ $code .= " \$this->mock->expect(\$method, \$args, \$msg);\n";
$code .= " }\n";
$code .= " function expectAt(\$timing, \$method, \$args = false, \$msg = '%s') {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->expectAt(\$timing, \$method, \$args, \$msg);\n";
+ $code .= " \$this->mock->expectAt(\$timing, \$method, \$args, \$msg);\n";
$code .= " }\n";
$code .= " function expectCallCount(\$method, \$count) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->expectCallCount(\$method, \$count, \$msg = '%s');\n";
+ $code .= " \$this->mock->expectCallCount(\$method, \$count, \$msg = '%s');\n";
$code .= " }\n";
$code .= " function expectMaximumCallCount(\$method, \$count, \$msg = '%s') {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->expectMaximumCallCount(\$method, \$count, \$msg = '%s');\n";
+ $code .= " \$this->mock->expectMaximumCallCount(\$method, \$count, \$msg = '%s');\n";
$code .= " }\n";
$code .= " function expectMinimumCallCount(\$method, \$count, \$msg = '%s') {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->expectMinimumCallCount(\$method, \$count, \$msg = '%s');\n";
+ $code .= " \$this->mock->expectMinimumCallCount(\$method, \$count, \$msg = '%s');\n";
$code .= " }\n";
$code .= " function expectNever(\$method) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->expectNever(\$method);\n";
+ $code .= " \$this->mock->expectNever(\$method);\n";
$code .= " }\n";
$code .= " function expectOnce(\$method, \$args = false, \$msg = '%s') {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->expectOnce(\$method, \$args, \$msg);\n";
+ $code .= " \$this->mock->expectOnce(\$method, \$args, \$msg);\n";
$code .= " }\n";
$code .= " function expectAtLeastOnce(\$method, \$args = false, \$msg = '%s') {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->expectAtLeastOnce(\$method, \$args, \$msg);\n";
+ $code .= " \$this->mock->expectAtLeastOnce(\$method, \$args, \$msg);\n";
$code .= " }\n";
return $code;
}
@@ -1586,19 +1587,19 @@
protected function chainThrowMethods() {
$code = " function throwOn(\$method, \$exception = false, \$args = false) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->throwOn(\$method, \$exception, \$args);\n";
+ $code .= " \$this->mock->throwOn(\$method, \$exception, \$args);\n";
$code .= " }\n";
$code .= " function throwAt(\$timing, \$method, \$exception = false, \$args = false) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->throwAt(\$timing, \$method, \$exception, \$args);\n";
+ $code .= " \$this->mock->throwAt(\$timing, \$method, \$exception, \$args);\n";
$code .= " }\n";
$code .= " function errorOn(\$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->errorOn(\$method, \$error, \$args, \$severity);\n";
+ $code .= " \$this->mock->errorOn(\$method, \$error, \$args, \$severity);\n";
$code .= " }\n";
$code .= " function errorAt(\$timing, \$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
$code .= $this->bailOutIfNotMocked("\$method");
- $code .= " \$this->_mock->errorAt(\$timing, \$method, \$error, \$args, \$severity);\n";
+ $code .= " \$this->mock->errorAt(\$timing, \$method, \$error, \$args, \$severity);\n";
$code .= " }\n";
return $code;
}
@@ -1619,7 +1620,7 @@
}
$code .= " " . $this->reflection->getSignature($method) . " {\n";
$code .= " \$args = func_get_args();\n";
- $code .= " \$result = &\$this->_mock->invoke(\"$method\", \$args);\n";
+ $code .= " \$result = &\$this->mock->invoke(\"$method\", \$args);\n";
$code .= " return \$result;\n";
$code .= " }\n";
}
Modified: simpletest/trunk/reporter.php
===================================================================
--- simpletest/trunk/reporter.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/reporter.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -398,7 +398,7 @@
*/
function shouldInvoke($test_case, $method) {
if ($this->shouldRunTest($test_case, $method)) {
- return $this->_reporter->shouldInvoke($test_case, $method);
+ return $this->reporter->shouldInvoke($test_case, $method);
}
return false;
}
@@ -413,7 +413,7 @@
if ($this->just_this_case && $this->matchesTestCase($test_case)) {
$this->on();
}
- $this->_reporter->paintGroupStart($test_case, $size);
+ $this->reporter->paintGroupStart($test_case, $size);
}
/**
@@ -422,7 +422,7 @@
* @access public
*/
function paintGroupEnd($test_case) {
- $this->_reporter->paintGroupEnd($test_case);
+ $this->reporter->paintGroupEnd($test_case);
if ($this->just_this_case && $this->matchesTestCase($test_case)) {
$this->off();
}
Modified: simpletest/trunk/scorer.php
===================================================================
--- simpletest/trunk/scorer.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/scorer.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -239,9 +239,9 @@
* @subpackage UnitTester
*/
class SimpleReporter extends SimpleScorer {
- private $_test_stack;
- private $_size;
- private $_progress;
+ private $test_stack;
+ private $size;
+ private $progress;
/**
* Starts the display with no results in.
@@ -249,9 +249,9 @@
*/
function __construct() {
parent::__construct();
- $this->_test_stack = array();
- $this->_size = null;
- $this->_progress = 0;
+ $this->test_stack = array();
+ $this->size = null;
+ $this->progress = 0;
}
/**
@@ -274,13 +274,13 @@
* @access public
*/
function paintGroupStart($test_name, $size) {
- if (! isset($this->_size)) {
- $this->_size = $size;
+ if (! isset($this->size)) {
+ $this->size = $size;
}
- if (count($this->_test_stack) == 0) {
+ if (count($this->test_stack) == 0) {
$this->paintHeader($test_name);
}
- $this->_test_stack[] = $test_name;
+ $this->test_stack[] = $test_name;
}
/**
@@ -291,8 +291,8 @@
* @access public
*/
function paintGroupEnd($test_name) {
- array_pop($this->_test_stack);
- if (count($this->_test_stack) == 0) {
+ array_pop($this->test_stack);
+ if (count($this->test_stack) == 0) {
$this->paintFooter($test_name);
}
}
@@ -306,13 +306,13 @@
* @access public
*/
function paintCaseStart($test_name) {
- if (! isset($this->_size)) {
- $this->_size = 1;
+ if (! isset($this->size)) {
+ $this->size = 1;
}
- if (count($this->_test_stack) == 0) {
+ if (count($this->test_stack) == 0) {
$this->paintHeader($test_name);
}
- $this->_test_stack[] = $test_name;
+ $this->test_stack[] = $test_name;
}
/**
@@ -322,9 +322,9 @@
* @access public
*/
function paintCaseEnd($test_name) {
- $this->_progress++;
- array_pop($this->_test_stack);
- if (count($this->_test_stack) == 0) {
+ $this->progress++;
+ array_pop($this->test_stack);
+ if (count($this->test_stack) == 0) {
$this->paintFooter($test_name);
}
}
@@ -335,7 +335,7 @@
* @access public
*/
function paintMethodStart($test_name) {
- $this->_test_stack[] = $test_name;
+ $this->test_stack[] = $test_name;
}
/**
@@ -345,7 +345,7 @@
* @access public
*/
function paintMethodEnd($test_name) {
- array_pop($this->_test_stack);
+ array_pop($this->test_stack);
}
/**
@@ -375,7 +375,7 @@
* @access public
*/
function getTestList() {
- return $this->_test_stack;
+ return $this->test_stack;
}
/**
@@ -386,7 +386,7 @@
* @access public
*/
function getTestCaseCount() {
- return $this->_size;
+ return $this->size;
}
/**
@@ -396,7 +396,7 @@
* @access public
*/
function getTestCaseProgress() {
- return $this->_progress;
+ return $this->progress;
}
/**
@@ -415,14 +415,14 @@
* @subpackage UnitTester
*/
class SimpleReporterDecorator {
- protected $_reporter;
+ protected $reporter;
/**
* Mediates between the reporter and the test case.
* @param SimpleScorer $reporter Reporter to receive events.
*/
function __construct($reporter) {
- $this->_reporter = $reporter;
+ $this->reporter = $reporter;
}
/**
@@ -433,7 +433,7 @@
* @access public
*/
function makeDry($is_dry = true) {
- $this->_reporter->makeDry($is_dry);
+ $this->reporter->makeDry($is_dry);
}
/**
@@ -444,7 +444,7 @@
* @access public
*/
function getStatus() {
- return $this->_reporter->getStatus();
+ return $this->reporter->getStatus();
}
/**
@@ -455,7 +455,7 @@
* @access public
*/
function shouldInvoke($test_case_name, $method) {
- return $this->_reporter->shouldInvoke($test_case_name, $method);
+ return $this->reporter->shouldInvoke($test_case_name, $method);
}
/**
@@ -466,7 +466,7 @@
* @access public
*/
function createInvoker($invoker) {
- return $this->_reporter->createInvoker($invoker);
+ return $this->reporter->createInvoker($invoker);
}
/**
@@ -476,7 +476,7 @@
* @access public
*/
function getDumper() {
- return $this->_reporter->getDumper();
+ return $this->reporter->getDumper();
}
/**
@@ -486,7 +486,7 @@
* @access public
*/
function paintGroupStart($test_name, $size) {
- $this->_reporter->paintGroupStart($test_name, $size);
+ $this->reporter->paintGroupStart($test_name, $size);
}
/**
@@ -495,7 +495,7 @@
* @access public
*/
function paintGroupEnd($test_name) {
- $this->_reporter->paintGroupEnd($test_name);
+ $this->reporter->paintGroupEnd($test_name);
}
/**
@@ -504,7 +504,7 @@
* @access public
*/
function paintCaseStart($test_name) {
- $this->_reporter->paintCaseStart($test_name);
+ $this->reporter->paintCaseStart($test_name);
}
/**
@@ -513,7 +513,7 @@
* @access public
*/
function paintCaseEnd($test_name) {
- $this->_reporter->paintCaseEnd($test_name);
+ $this->reporter->paintCaseEnd($test_name);
}
/**
@@ -522,7 +522,7 @@
* @access public
*/
function paintMethodStart($test_name) {
- $this->_reporter->paintMethodStart($test_name);
+ $this->reporter->paintMethodStart($test_name);
}
/**
@@ -531,7 +531,7 @@
* @access public
*/
function paintMethodEnd($test_name) {
- $this->_reporter->paintMethodEnd($test_name);
+ $this->reporter->paintMethodEnd($test_name);
}
/**
@@ -540,7 +540,7 @@
* @access public
*/
function paintPass($message) {
- $this->_reporter->paintPass($message);
+ $this->reporter->paintPass($message);
}
/**
@@ -549,7 +549,7 @@
* @access public
*/
function paintFail($message) {
- $this->_reporter->paintFail($message);
+ $this->reporter->paintFail($message);
}
/**
@@ -559,7 +559,7 @@
* @access public
*/
function paintError($message) {
- $this->_reporter->paintError($message);
+ $this->reporter->paintError($message);
}
/**
@@ -568,7 +568,7 @@
* @access public
*/
function paintException($exception) {
- $this->_reporter->paintException($exception);
+ $this->reporter->paintException($exception);
}
/**
@@ -577,7 +577,7 @@
* @access public
*/
function paintSkip($message) {
- $this->_reporter->paintSkip($message);
+ $this->reporter->paintSkip($message);
}
/**
@@ -586,7 +586,7 @@
* @access public
*/
function paintMessage($message) {
- $this->_reporter->paintMessage($message);
+ $this->reporter->paintMessage($message);
}
/**
@@ -595,7 +595,7 @@
* @access public
*/
function paintFormattedMessage($message) {
- $this->_reporter->paintFormattedMessage($message);
+ $this->reporter->paintFormattedMessage($message);
}
/**
@@ -608,7 +608,7 @@
* @access public
*/
function paintSignal($type, $payload) {
- $this->_reporter->paintSignal($type, $payload);
+ $this->reporter->paintSignal($type, $payload);
}
}
@@ -619,7 +619,7 @@
* @subpackage UnitTester
*/
class MultipleReporter {
- private $_reporters = array();
+ private $reporters = array();
/**
* Adds a reporter to the subscriber list.
@@ -627,7 +627,7 @@
* @access public
*/
function attachReporter($reporter) {
- $this->_reporters[] = $reporter;
+ $this->reporters[] = $reporter;
}
/**
@@ -638,8 +638,8 @@
* @access public
*/
function makeDry($is_dry = true) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->makeDry($is_dry);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->makeDry($is_dry);
}
}
@@ -652,8 +652,8 @@
* @access public
*/
function getStatus() {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- if (! $this->_reporters[$i]->getStatus()) {
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ if (! $this->reporters[$i]->getStatus()) {
return false;
}
}
@@ -668,8 +668,8 @@
* @access public
*/
function shouldInvoke($test_case_name, $method) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- if (! $this->_reporters[$i]->shouldInvoke($test_case_name, $method)) {
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ if (! $this->reporters[$i]->shouldInvoke($test_case_name, $method)) {
return false;
}
}
@@ -683,8 +683,8 @@
* @access public
*/
function createInvoker($invoker) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $invoker = $this->_reporters[$i]->createInvoker($invoker);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $invoker = $this->reporters[$i]->createInvoker($invoker);
}
return $invoker;
}
@@ -706,8 +706,8 @@
* @access public
*/
function paintGroupStart($test_name, $size) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintGroupStart($test_name, $size);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintGroupStart($test_name, $size);
}
}
@@ -717,8 +717,8 @@
* @access public
*/
function paintGroupEnd($test_name) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintGroupEnd($test_name);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintGroupEnd($test_name);
}
}
@@ -728,8 +728,8 @@
* @access public
*/
function paintCaseStart($test_name) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintCaseStart($test_name);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintCaseStart($test_name);
}
}
@@ -739,8 +739,8 @@
* @access public
*/
function paintCaseEnd($test_name) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintCaseEnd($test_name);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintCaseEnd($test_name);
}
}
@@ -750,8 +750,8 @@
* @access public
*/
function paintMethodStart($test_name) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintMethodStart($test_name);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintMethodStart($test_name);
}
}
@@ -761,8 +761,8 @@
* @access public
*/
function paintMethodEnd($test_name) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintMethodEnd($test_name);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintMethodEnd($test_name);
}
}
@@ -772,8 +772,8 @@
* @access public
*/
function paintPass($message) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintPass($message);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintPass($message);
}
}
@@ -783,8 +783,8 @@
* @access public
*/
function paintFail($message) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintFail($message);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintFail($message);
}
}
@@ -795,8 +795,8 @@
* @access public
*/
function paintError($message) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintError($message);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintError($message);
}
}
@@ -806,8 +806,8 @@
* @access public
*/
function paintException($exception) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintException($exception);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintException($exception);
}
}
@@ -817,8 +817,8 @@
* @access public
*/
function paintSkip($message) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintSkip($message);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintSkip($message);
}
}
@@ -828,8 +828,8 @@
* @access public
*/
function paintMessage($message) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintMessage($message);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintMessage($message);
}
}
@@ -839,8 +839,8 @@
* @access public
*/
function paintFormattedMessage($message) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintFormattedMessage($message);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintFormattedMessage($message);
}
}
@@ -854,8 +854,8 @@
* @access public
*/
function paintSignal($type, $payload) {
- for ($i = 0; $i < count($this->_reporters); $i++) {
- $this->_reporters[$i]->paintSignal($type, $payload);
+ for ($i = 0; $i < count($this->reporters); $i++) {
+ $this->reporters[$i]->paintSignal($type, $payload);
}
}
}
Modified: simpletest/trunk/socket.php
===================================================================
--- simpletest/trunk/socket.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/socket.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -70,7 +70,7 @@
private $handle;
private $is_open = false;
private $sent = '';
- private $lock_size;
+ private $block_size;
/**
* Opens a socket for reading and writing.
@@ -86,7 +86,7 @@
return;
}
$this->is_open = true;
- $this->_block_size = $block_size;
+ $this->block_size = $block_size;
}
/**
@@ -108,7 +108,7 @@
* @access public
*/
function read() {
- $raw = @fread($this->handle, $this->_block_size);
+ $raw = @fread($this->handle, $this->block_size);
if ($raw === false) {
$this->setError('Cannot read from socket');
$this->close();
@@ -184,7 +184,7 @@
return;
}
$this->is_open = true;
- $this->_block_size = $block_size;
+ $this->block_size = $block_size;
SimpleTestCompatibility::setTimeout($this->handle, $timeout);
}
@@ -223,7 +223,7 @@
if ($this->isError() || ! $this->isOpen()) {
return false;
}
- $raw = @fread($this->handle, $this->_block_size);
+ $raw = @fread($this->handle, $this->block_size);
if ($raw === false) {
$this->setError('Cannot read from socket');
$this->close();
Modified: simpletest/trunk/tag.php
===================================================================
--- simpletest/trunk/tag.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/tag.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -230,8 +230,8 @@
*/
class SimpleWidget extends SimpleTag {
private $value;
- private $_label;
- private $_is_set;
+ private $label;
+ private $is_set;
/**
* Starts with a named tag with attributes only.
@@ -242,8 +242,8 @@
function __construct($name, $attributes) {
parent::__construct($name, $attributes);
$this->value = false;
- $this->_label = false;
- $this->_is_set = false;
+ $this->label = false;
+ $this->is_set = false;
}
/**
@@ -273,7 +273,7 @@
* @access public
*/
function getValue() {
- if (! $this->_is_set) {
+ if (! $this->is_set) {
return $this->getDefault();
}
return $this->value;
@@ -287,7 +287,7 @@
*/
function setValue($value) {
$this->value = $value;
- $this->_is_set = true;
+ $this->is_set = true;
return true;
}
@@ -297,7 +297,7 @@
* @access public
*/
function resetValue() {
- $this->_is_set = false;
+ $this->is_set = false;
}
/**
@@ -307,7 +307,7 @@
* @access public
*/
function setLabel($label) {
- $this->_label = trim($label);
+ $this->label = trim($label);
}
/**
@@ -317,7 +317,7 @@
* @access public
*/
function isLabel($label) {
- return $this->_label == trim($label);
+ return $this->label == trim($label);
}
/**
Modified: simpletest/trunk/test/encoding_test.php
===================================================================
--- simpletest/trunk/test/encoding_test.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/test/encoding_test.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -30,20 +30,20 @@
}
class TestOfEncoding extends UnitTestCase {
- private $_content_so_far;
+ private $content_so_far;
function write($content) {
- $this->_content_so_far .= $content;
+ $this->content_so_far .= $content;
}
function clear() {
- $this->_content_so_far = '';
+ $this->content_so_far = '';
}
function assertWritten($encoding, $content, $message = '%s') {
$this->clear();
$encoding->writeTo($this);
- $this->assertIdentical($this->_content_so_far, $content, $message);
+ $this->assertIdentical($this->content_so_far, $content, $message);
}
function testGetEmpty() {
Modified: simpletest/trunk/test/errors_test.php
===================================================================
--- simpletest/trunk/test/errors_test.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/test/errors_test.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -37,16 +37,16 @@
}
class TestOfErrorTrap extends UnitTestCase {
- private $_old;
+ private $old;
function setUp() {
- $this->_old = error_reporting(E_ALL);
+ $this->old = error_reporting(E_ALL);
set_error_handler('SimpleTestErrorHandler');
}
function tearDown() {
restore_error_handler();
- error_reporting($this->_old);
+ error_reporting($this->old);
}
function testQueueStartsEmpty() {
@@ -84,14 +84,14 @@
}
class TestOfErrors extends UnitTestCase {
- private $_old;
+ private $old;
function setUp() {
- $this->_old = error_reporting(E_ALL);
+ $this->old = error_reporting(E_ALL);
}
function tearDown() {
- error_reporting($this->_old);
+ error_reporting($this->old);
}
function testDefaultWhenAllReported() {
Modified: simpletest/trunk/test/expectation_test.php
===================================================================
--- simpletest/trunk/test/expectation_test.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/test/expectation_test.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -78,10 +78,10 @@
}
class RecursiveNasty {
- private $_me;
+ private $me;
function RecursiveNasty() {
- $this->_me = $this;
+ $this->me = $this;
}
}
Modified: simpletest/trunk/test/mock_objects_test.php
===================================================================
--- simpletest/trunk/test/mock_objects_test.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/test/mock_objects_test.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -453,17 +453,17 @@
class LikeExpectation extends IdenticalExpectation {
function __construct($expectation) {
- $expectation->_message = '';
+ $expectation->message = '';
parent::__construct($expectation);
}
function test($compare) {
- $compare->_message = '';
+ $compare->message = '';
return parent::test($compare);
}
function testMessage($compare) {
- $compare->_message = '';
+ $compare->message = '';
return parent::testMessage($compare);
}
}
@@ -494,7 +494,7 @@
$mock->aMethod();
$mock->aMethod();
$mock->aMethod();
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testTallyOnMaxCallsSendsPassOnUnderrun() {
@@ -505,7 +505,7 @@
$mock->expectMaximumCallCount("aMethod", 2);
$mock->aMethod();
$mock->aMethod();
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testExpectNeverDetectsOverrun() {
@@ -515,7 +515,7 @@
$mock = new MockDummyWithInjectedTestCase();
$mock->expectNever('aMethod');
$mock->aMethod();
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testTallyOnExpectNeverStillSendsPassOnUnderrun() {
@@ -524,7 +524,7 @@
0));
$mock = new MockDummyWithInjectedTestCase();
$mock->expectNever('aMethod');
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testMinCalls() {
@@ -535,7 +535,7 @@
$mock->expectMinimumCallCount('aMethod', 2);
$mock->aMethod();
$mock->aMethod();
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testFailedNever() {
@@ -545,7 +545,7 @@
$mock = new MockDummyWithInjectedTestCase();
$mock->expectNever('aMethod');
$mock->aMethod();
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testUnderOnce() {
@@ -554,7 +554,7 @@
0));
$mock = new MockDummyWithInjectedTestCase();
$mock->expectOnce('aMethod');
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testOverOnce() {
@@ -565,7 +565,7 @@
$mock->expectOnce('aMethod');
$mock->aMethod();
$mock->aMethod();
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testUnderAtLeastOnce() {
@@ -574,7 +574,7 @@
0));
$mock = new MockDummyWithInjectedTestCase();
$mock->expectAtLeastOnce("aMethod");
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testZeroArguments() {
@@ -585,7 +585,7 @@
$mock = new MockDummyWithInjectedTestCase();
$mock->expect("aMethod", array());
$mock->aMethod();
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testExpectedArguments() {
@@ -596,7 +596,7 @@
$mock = new MockDummyWithInjectedTestCase();
$mock->expect('aMethod', array(1, 2, 3));
$mock->aMethod(1, 2, 3);
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testFailedArguments() {
@@ -607,7 +607,7 @@
$mock = new MockDummyWithInjectedTestCase();
$mock->expect('aMethod', array('this'));
$mock->aMethod('that');
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testWildcardsAreTranslatedToAnythingExpectations() {
@@ -619,7 +619,7 @@
$mock = new MockDummyWithInjectedTestCase($this);
$mock->expect("aMethod", array('*', 123, '*'));
$mock->aMethod(100, 123, 101);
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testSpecificPassingSequence() {
@@ -638,7 +638,7 @@
$mock->aMethod(1, 2, 3);
$mock->aMethod('Hello');
$mock->aMethod();
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
function testNonArrayForExpectedParametersGivesError() {
@@ -646,7 +646,7 @@
$this->expectError(new PatternExpectation('/\$args.*not an array/i'));
$mock->expect("aMethod", "foo");
$mock->aMethod();
- $mock->_mock->atTestEnd('testSomething', $this->test);
+ $mock->mock->atTestEnd('testSomething', $this->test);
}
}
Modified: simpletest/trunk/test/user_agent_test.php
===================================================================
--- simpletest/trunk/test/user_agent_test.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/test/user_agent_test.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -13,12 +13,12 @@
class TestOfFetchingUrlParameters extends UnitTestCase {
function setUp() {
- $this->_headers = new MockSimpleHttpHeaders();
- $this->_response = new MockSimpleHttpResponse();
- $this->_response->setReturnValue('isError', false);
- $this->_response->returns('getHeaders', new MockSimpleHttpHeaders());
- $this->_request = new MockSimpleHttpRequest();
- $this->_request->returns('fetch', $this->_response);
+ $this->headers = new MockSimpleHttpHeaders();
+ $this->response = new MockSimpleHttpResponse();
+ $this->response->setReturnValue('isError', false);
+ $this->response->returns('getHeaders', new MockSimpleHttpHeaders());
+ $this->request = new MockSimpleHttpRequest();
+ $this->request->returns('fetch', $this->response);
}
function testGetRequestWithoutIncidentGivesNoErrors() {
@@ -26,7 +26,7 @@
$url->addRequestParameters(array('a' => 'A', 'b' => 'B'));
$agent = new MockRequestUserAgent();
- $agent->returns('createHttpRequest', $this->_request);
+ $agent->returns('createHttpRequest', $this->request);
$agent->__construct();
$response = $agent->fetchResponse(
Modified: simpletest/trunk/url.php
===================================================================
--- simpletest/trunk/url.php 2008-04-26 20:35:39 UTC (rev 1787)
+++ simpletest/trunk/url.php 2008-04-27 11:01:59 UTC (rev 1788)
@@ -413,7 +413,7 @@
* @access public
*/
function setTarget($frame) {
- $this->_raw = false;
+ $this->raw = false;
$this->target = $frame;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|