From 56a26cab1432dcf9d730fca5bcae04b6760dc9b4 Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <ezyang@mit.edu>
Date: Wed, 18 Jan 2012 18:10:16 -0500
Subject: [PATCH] Modernize some of the testing facilities.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
---
 tests/CliTestCase.php | 8 ++++----
 tests/index.php       | 8 ++++++++
 tests/multitest.php   | 4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/tests/CliTestCase.php b/tests/CliTestCase.php
index 1f096c34..36b728e1 100644
--- a/tests/CliTestCase.php
+++ b/tests/CliTestCase.php
@@ -23,11 +23,11 @@ class CliTestCase
     public function getLabel() {
         return $this->_command;
     }
-    public function run(&$reporter) {
+    public function run($reporter) {
         if (!$this->_quiet) $reporter->paintFormattedMessage('Running ['.$this->_command.']');
         return $this->_invokeCommand($this->_command, $reporter);
     }
-    public function _invokeCommand($command, &$reporter) {
+    public function _invokeCommand($command, $reporter) {
        $xml = shell_exec($command);
         if (! $xml) {
             if (!$this->_quiet) {
@@ -35,7 +35,7 @@ class CliTestCase
             }
             return false;
         }
-        $parser = &$this->_createParser($reporter);
+        $parser = $this->_createParser($reporter);
 
         set_error_handler(array($this, '_errorHandler'));
         $status = $parser->parse($xml);
@@ -59,7 +59,7 @@ class CliTestCase
         }
         return true;
     }
-    public function &_createParser(&$reporter) {
+    public function _createParser($reporter) {
         $parser = new SimpleTestXmlParser($reporter);
         return $parser;
     }
diff --git a/tests/index.php b/tests/index.php
index 48cddcd2..808b2ce1 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -107,6 +107,14 @@ if ($AC['standalone']) {
 require '../library/HTMLPurifier.autoload.php';
 require 'HTMLPurifier/Harness.php';
 
+// immediately load external libraries, so we can bail out early if
+// they're bad
+if ($GLOBALS['HTMLPurifierTest']['PEAR']) {
+    if ($GLOBALS['HTMLPurifierTest']['Net_IDNA2']) {
+        require_once 'Net/IDNA2.php';
+    }
+}
+
 // Shell-script code is executed
 
 if ($AC['xml']) {
diff --git a/tests/multitest.php b/tests/multitest.php
index 518d4b62..ef296cdd 100644
--- a/tests/multitest.php
+++ b/tests/multitest.php
@@ -51,9 +51,11 @@ $AC['standalone'] = false; // convenience for --distro=standalone
 $AC['only-phpt'] = false; // --type=phpt
 $AC['exclude-normal'] = false; // --distro=standalone
 $AC['exclude-standalone'] = false; // --distro=normal
+$AC['verbose'] = false;
 $aliases = array(
     'f' => 'file',
     'q' => 'quiet',
+    'v' => 'verbose',
 );
 htmlpurifier_parse_args($AC, $aliases);
 
@@ -68,7 +70,7 @@ elseif ($AC['standalone']) $AC['distro'] = 'standalone';
 if ($AC['xml']) {
     $reporter = new XmlReporter();
 } else {
-    $reporter = new TextReporter();
+    $reporter = new HTMLPurifier_SimpleTest_TextReporter($AC);
 }
 
 // Regenerate any necessary files