From 04a6b1d3f20b738fac42a448c46a122911fa945d Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Tue, 8 Apr 2008 04:52:22 +0000
Subject: [PATCH] Update broken test, also update SimpleTest loading code to
 trunk.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1652 48356398-32a2-884e-a903-53898d9a118a
---
 .../ConfigSchema/Validator/directive/typeExists.vtest  |  2 +-
 tests/common.php                                       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/HTMLPurifier/ConfigSchema/Validator/directive/typeExists.vtest b/tests/HTMLPurifier/ConfigSchema/Validator/directive/typeExists.vtest
index 4ab86a6c..17e8a8e3 100644
--- a/tests/HTMLPurifier/ConfigSchema/Validator/directive/typeExists.vtest
+++ b/tests/HTMLPurifier/ConfigSchema/Validator/directive/typeExists.vtest
@@ -1,4 +1,4 @@
-ERROR: Invalid type 'foobar' in TYPE/DEFAULT in directive hash 'Ns.Dir'
+ERROR: Invalid type 'foobar' in DEFAULT in directive hash 'Ns.Dir'
 ----
 Ns
 DESCRIPTION: Namespace
diff --git a/tests/common.php b/tests/common.php
index 85f2dc70..a95a1fab 100644
--- a/tests/common.php
+++ b/tests/common.php
@@ -37,11 +37,11 @@ if (file_exists('../conf/test-settings.php')) include '../conf/test-settings.php
 if (file_exists('../test-settings.php')) include '../test-settings.php';
 
 // load SimpleTest
-require $simpletest_location . 'unit_tester.php';
-require $simpletest_location . 'reporter.php';
-require $simpletest_location . 'mock_objects.php';
-require $simpletest_location . 'xml.php';
-require $simpletest_location . 'remote.php';
+require_once $simpletest_location . 'unit_tester.php';
+require_once $simpletest_location . 'reporter.php';
+require_once $simpletest_location . 'mock_objects.php';
+require_once $simpletest_location . 'xml.php';
+require_once $simpletest_location . 'remote.php';
 
 // load CSS Tidy
 if ($csstidy_location !== false) {