1
0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-12 00:54:48 +02:00

Classname() constructors to __construct() constructors, as per SimpleTest. Also normalized ppp declarations; no public declaration for test methods, public/protected for the rest

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1663 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2008-04-21 15:24:18 +00:00
parent 5dbd455afb
commit 59605d592b
38 changed files with 101 additions and 101 deletions

View File

@@ -6,8 +6,8 @@
class HTMLPurifier_Harness extends UnitTestCase
{
function HTMLPurifier_Harness() {
parent::UnitTestCase();
public function __construct() {
parent::__construct();
}
protected $config, $context;
@@ -15,7 +15,7 @@ class HTMLPurifier_Harness extends UnitTestCase
/**
* Generates easily accessible default config/context
*/
function setUp() {
public function setUp() {
list($this->config, $this->context) = $this->createCommon();
}
@@ -24,7 +24,7 @@ class HTMLPurifier_Harness extends UnitTestCase
* @param &$config Reference to config variable
* @param &$context Reference to context variable
*/
function prepareCommon(&$config, &$context) {
protected function prepareCommon(&$config, &$context) {
$config = HTMLPurifier_Config::create($config);
if (!$context) $context = new HTMLPurifier_Context();
}
@@ -33,14 +33,14 @@ class HTMLPurifier_Harness extends UnitTestCase
* Generates default configuration and context objects
* @return Defaults in form of array($config, $context)
*/
function createCommon() {
protected function createCommon() {
return array(HTMLPurifier_Config::createDefault(), new HTMLPurifier_Context);
}
/**
* Normalizes a string to Unix (\n) endings
*/
function normalize(&$string) {
protected function normalize(&$string) {
$string = str_replace(array("\r\n", "\r"), "\n", $string);
}
@@ -51,7 +51,7 @@ class HTMLPurifier_Harness extends UnitTestCase
* @param $result Mixed result from processing
* @param $expect Mixed expectation for result
*/
function assertEitherFailOrIdentical($status, $result, $expect) {
protected function assertEitherFailOrIdentical($status, $result, $expect) {
if ($expect === false) {
$this->assertFalse($status, 'Expected false result, got true');
} else {
@@ -60,7 +60,7 @@ class HTMLPurifier_Harness extends UnitTestCase
}
}
function getTests() {
public function getTests() {
// __onlytest makes only one test get triggered
foreach (get_class_methods(get_class($this)) as $method) {
if (strtolower(substr($method, 0, 10)) == '__onlytest') {