Remove includes from unit tests.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1569 48356398-32a2-884e-a903-53898d9a118a

TODO

@@ -45,9 +45,7 @@ CONFIGDOC
    which files use what configuration
 
 IF IT AIN'T BROKE...
- - Rename merge-library.php script
  - Create "super" script which performs all regeneration actions
- - Remove all includes from unit tests, and remove blanks/ folder and generation
  - Simplify merge library script by removing recursion? (or other things)
  - Perhaps replace types with integer identifiers in ConfigSchema? (would be
    smaller, but not by much).

maintenance/generate-standalone.php

@@ -58,21 +58,6 @@ function remove_php_tags($text) {
     return substr($text, 5);
 }
 
-/**
- * Creates an appropriate blank file, recursively generating directories
- * if necessary
- * @param string $file Filename to create blank for
- */
-function create_blank($file) {
-    global $FS;
-    $dir = dirname($file);
-    $base = realpath('../tests/blanks/') . DIRECTORY_SEPARATOR ;
-    if ($dir != '.') {
-        $FS->mkdirr($base . $dir);
-    }
-    file_put_contents($base . $file, '');
-}
-
 /**
  * Copies the contents of a directory to the standalone directory
  * @param string $dir Directory to copy
@@ -120,7 +105,6 @@ function replace_includes_callback($matches) {
     }
     if (isset($GLOBALS['loaded'][$file])) return '';
     $GLOBALS['loaded'][$file] = true;
-    create_blank($file);
     return replace_includes(remove_php_tags(file_get_contents($file)));
 }
 

maintenance/remove-require-once.php

@@ -5,8 +5,8 @@ chdir(dirname(__FILE__));
 require_once 'common.php';
 assertCli();
 
-echo "Please do not run this script. It is here for historical purposes only.";
+//echo "Please do not run this script. It is here for historical purposes only.";
-exit;
+//exit;
 
 /**
  * @file
@@ -16,7 +16,7 @@ exit;
  *      This does not remove inline includes; those must be handled manually.
  */
 
-chdir(dirname(__FILE__) . '/../library/');
+chdir(dirname(__FILE__) . '/../tests/HTMLPurifier');
 $FS = new FSTools();
 
 $files = $FS->globr('.', '*.php');

tests/HTMLPurifier/AttrCollectionsTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrCollections.php';
-
 Mock::generatePartial(
     'HTMLPurifier_AttrCollections',
     'HTMLPurifier_AttrCollections_TestForConstruct',

tests/HTMLPurifier/AttrDef/CSS/AlphaValueTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/AlphaValue.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_AlphaValueTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/BackgroundPositionTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
-
 class HTMLPurifier_AttrDef_CSS_BackgroundPositionTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/BackgroundTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/Background.php';
-
 class HTMLPurifier_AttrDef_CSS_BackgroundTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/BorderTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Border.php';
-
 class HTMLPurifier_AttrDef_CSS_BorderTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/ColorTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Color.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_ColorTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/CompositeTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Composite.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_Composite_Testable extends
       HTMLPurifier_AttrDef_CSS_Composite
 {

tests/HTMLPurifier/AttrDef/CSS/FilterTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Filter.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_FilterTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/FontFamilyTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/FontFamily.php';
-
 class HTMLPurifier_AttrDef_CSS_FontFamilyTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/FontTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/Font.php';
-
 class HTMLPurifier_AttrDef_CSS_FontTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/LengthTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Length.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_LengthTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/ListStyleTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/ListStyle.php';
-
 class HTMLPurifier_AttrDef_CSS_ListStyleTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/MultipleTest.php

@@ -1,11 +1,6 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Multiple.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 // borrowed for the sakes of this test
-require_once 'HTMLPurifier/AttrDef/Integer.php';
-
 class HTMLPurifier_AttrDef_CSS_MultipleTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/NumberTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Number.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_NumberTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/PercentageTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Percentage.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_PercentageTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/TextDecorationTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/TextDecoration.php';
-
 class HTMLPurifier_AttrDef_CSS_TextDecorationTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSS/URITest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/URI.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_URITest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/CSSTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSSTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/EnumTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/Enum.php';
-
 class HTMLPurifier_AttrDef_EnumTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/HTML/BoolTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/Bool.php';
-
 class HTMLPurifier_AttrDef_HTML_BoolTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/HTML/ColorTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/Color.php';
-
 class HTMLPurifier_AttrDef_HTML_ColorTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/HTML/FrameTargetTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/FrameTarget.php';
-
 class HTMLPurifier_AttrDef_HTML_FrameTargetTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/HTML/IDTest.php

@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/ID.php';
-require_once 'HTMLPurifier/IDAccumulator.php';
-
 class HTMLPurifier_AttrDef_HTML_IDTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/HTML/LengthTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/HTML/PixelsTest.php';
-require_once 'HTMLPurifier/AttrDef/HTML/Length.php';
-
 class HTMLPurifier_AttrDef_HTML_LengthTest extends HTMLPurifier_AttrDef_HTML_PixelsTest
 {
     

tests/HTMLPurifier/AttrDef/HTML/LinkTypesTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/LinkTypes.php';
-
 class HTMLPurifier_AttrDef_HTML_LinkTypesTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/HTML/MultiLengthTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/HTML/LengthTest.php';
-require_once 'HTMLPurifier/AttrDef/HTML/MultiLength.php';
-
 class HTMLPurifier_AttrDef_HTML_MultiLengthTest extends HTMLPurifier_AttrDef_HTML_LengthTest
 {
     

tests/HTMLPurifier/AttrDef/HTML/NmtokensTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/Nmtokens.php';
-
 class HTMLPurifier_AttrDef_HTML_NmtokensTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/HTML/PixelsTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/Pixels.php';
-
 class HTMLPurifier_AttrDef_HTML_PixelsTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/IntegerTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/Integer.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_IntegerTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/LangTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/Lang.php';
-
 class HTMLPurifier_AttrDef_LangTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/TextTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/Text.php';
-
 class HTMLPurifier_AttrDef_TextTest extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/URI/Email/SimpleCheckTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
-require_once 'HTMLPurifier/AttrDef/URI/EmailHarness.php';
-
 class HTMLPurifier_AttrDef_URI_Email_SimpleCheckTest
     extends HTMLPurifier_AttrDef_URI_EmailHarness
 {

tests/HTMLPurifier/AttrDef/URI/EmailHarness.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/URI/Email.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_URI_EmailHarness extends HTMLPurifier_AttrDefHarness
 {
     

tests/HTMLPurifier/AttrDef/URI/HostTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/URI/Host.php';
-
 // takes a URI formatted host and validates it
 
 

tests/HTMLPurifier/AttrDef/URI/IPv4Test.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/URI/IPv4.php';
-
 // IPv4 test case is spliced from Feyd's IPv6 implementation
 // we ought to disallow non-routable addresses
 

tests/HTMLPurifier/AttrDef/URI/IPv6Test.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/URI/IPv6.php';
-
 // test case is from Feyd's IPv6 implementation
 // we ought to disallow non-routable addresses
 

tests/HTMLPurifier/AttrDef/URITest.php

@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/URI.php';
-require_once 'HTMLPurifier/URIParser.php';
-
 /**
  * @todo Aim for complete code coverage with mocks
  */

tests/HTMLPurifier/AttrDefTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef.php';
-
 Mock::generatePartial(
         'HTMLPurifier_AttrDef',
         'HTMLPurifier_AttrDefTestable',

tests/HTMLPurifier/AttrTransform/BdoDirTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/BdoDir.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_BdoDirTest extends HTMLPurifier_AttrTransformHarness
 {
     

tests/HTMLPurifier/AttrTransform/BgColorTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/BgColor.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 // we currently rely on the CSS validator to fix any problems.
 // This means that this transform, strictly speaking, supports
 // a superset of the functionality.

tests/HTMLPurifier/AttrTransform/BoolToCSSTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/BoolToCSS.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_BoolToCSSTest extends HTMLPurifier_AttrTransformHarness
 {
     

tests/HTMLPurifier/AttrTransform/BorderTest.php

@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/Border.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
-
 class HTMLPurifier_AttrTransform_BorderTest extends HTMLPurifier_AttrTransformHarness
 {
     

tests/HTMLPurifier/AttrTransform/EnumToCSSTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/EnumToCSS.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_EnumToCSSTest extends HTMLPurifier_AttrTransformHarness
 {
     

tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/ImgRequired.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_ImgRequiredTest extends HTMLPurifier_AttrTransformHarness
 {
     

tests/HTMLPurifier/AttrTransform/ImgSpaceTest.php

@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/ImgSpace.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
-
 class HTMLPurifier_AttrTransform_ImgSpaceTest extends HTMLPurifier_AttrTransformHarness
 {
     

tests/HTMLPurifier/AttrTransform/LangTest.php

@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Token.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-require_once 'HTMLPurifier/AttrTransform/Lang.php';
-
 class HTMLPurifier_AttrTransform_LangTest
     extends HTMLPurifier_AttrTransformHarness
 {

tests/HTMLPurifier/AttrTransform/LengthTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/Length.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_LengthTest extends HTMLPurifier_AttrTransformHarness
 {
     

tests/HTMLPurifier/AttrTransform/NameTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/Name.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_NameTest extends HTMLPurifier_AttrTransformHarness
 {
     

tests/HTMLPurifier/AttrTransformHarness.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ComplexHarness.php';
-
 class HTMLPurifier_AttrTransformHarness extends HTMLPurifier_ComplexHarness
 {
     

tests/HTMLPurifier/AttrTransformTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform.php';
-
 Mock::generatePartial(
         'HTMLPurifier_AttrTransform',
         'HTMLPurifier_AttrTransformTestable',

tests/HTMLPurifier/AttrTypesTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTypes.php';
-
 class HTMLPurifier_AttrTypesTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/AttrValidator_ErrorsTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ErrorsHarness.php';
-require_once 'HTMLPurifier/AttrValidator.php';
-
 class HTMLPurifier_AttrValidator_ErrorsTest extends HTMLPurifier_ErrorsHarness
 {
     

tests/HTMLPurifier/ChildDef/ChameleonTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/Chameleon.php';
-
 class HTMLPurifier_ChildDef_ChameleonTest extends HTMLPurifier_ChildDefHarness
 {
     

tests/HTMLPurifier/ChildDef/CustomTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/Custom.php';
-
 class HTMLPurifier_ChildDef_CustomTest extends HTMLPurifier_ChildDefHarness
 {
     

tests/HTMLPurifier/ChildDef/OptionalTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/Optional.php';
-
 class HTMLPurifier_ChildDef_OptionalTest extends HTMLPurifier_ChildDefHarness
 {
     

tests/HTMLPurifier/ChildDef/RequiredTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/Required.php';
-
 class HTMLPurifier_ChildDef_RequiredTest extends HTMLPurifier_ChildDefHarness
 {
     

tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/StrictBlockquote.php';
-
 class   HTMLPurifier_ChildDef_StrictBlockquoteTest
 extends HTMLPurifier_ChildDefHarness
 {

tests/HTMLPurifier/ChildDef/TableTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/Table.php';
-
 // we're using empty tags to compact the tests: under real circumstances
 // there would be contents in them
 

tests/HTMLPurifier/ChildDefHarness.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ComplexHarness.php';
-require_once 'HTMLPurifier/ChildDef.php';
-
 class HTMLPurifier_ChildDefHarness extends HTMLPurifier_ComplexHarness
 {
     

tests/HTMLPurifier/ComplexHarness.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Lexer/DirectLex.php';
-
 /**
  * General-purpose test-harness that makes testing functions that require
  * configuration and context objects easier when those two parameters are

tests/HTMLPurifier/ConfigSchemaTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ConfigSchema.php';
-
 class HTMLPurifier_ConfigSchemaTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/ConfigTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Config.php';
-
 class HTMLPurifier_ConfigTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/ContextTest.php

@@ -1,10 +1,6 @@
 <?php
 
-require_once 'HTMLPurifier/Context.php';
-
 // mocks
-require_once 'HTMLPurifier/IDAccumulator.php';
-
 class HTMLPurifier_ContextTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/DefinitionCache/Decorator/CleanupTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCache/DecoratorHarness.php';
-require_once 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-
 generate_mock_once('HTMLPurifier_DefinitionCache');
 
 class HTMLPurifier_DefinitionCache_Decorator_CleanupTest extends HTMLPurifier_DefinitionCache_DecoratorHarness

tests/HTMLPurifier/DefinitionCache/Decorator/MemoryTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCache/DecoratorHarness.php';
-require_once 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-
 generate_mock_once('HTMLPurifier_DefinitionCache');
 
 class HTMLPurifier_DefinitionCache_Decorator_MemoryTest extends HTMLPurifier_DefinitionCache_DecoratorHarness

tests/HTMLPurifier/DefinitionCache/DecoratorHarness.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCacheHarness.php';
-require_once 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-
 generate_mock_once('HTMLPurifier_DefinitionCache');
 
 class HTMLPurifier_DefinitionCache_DecoratorHarness extends HTMLPurifier_DefinitionCacheHarness

tests/HTMLPurifier/DefinitionCache/DecoratorTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCacheHarness.php';
-require_once 'HTMLPurifier/DefinitionCache/Decorator.php';
-
 class HTMLPurifier_DefinitionCache_DecoratorTest extends HTMLPurifier_DefinitionCacheHarness
 {
     

tests/HTMLPurifier/DefinitionCache/SerializerTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCacheHarness.php';
-require_once 'HTMLPurifier/DefinitionCache/Serializer.php';
-
 class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_DefinitionCacheHarness
 {
     

tests/HTMLPurifier/DefinitionCacheFactoryTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCacheFactory.php';
-
 class HTMLPurifier_DefinitionCacheFactoryTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/DefinitionCacheHarness.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionTestable.php';
-
 class HTMLPurifier_DefinitionCacheHarness extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/DefinitionCacheTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCache.php';
-
 class HTMLPurifier_DefinitionCacheTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/DefinitionTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Definition.php';
-require_once 'HTMLPurifier/DefinitionTestable.php';
-
 class HTMLPurifier_DefinitionTest extends HTMLPurifier_Harness
 {
     function test_setup() {

tests/HTMLPurifier/DoctypeRegistryTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DoctypeRegistry.php';
-
 class HTMLPurifier_DoctypeRegistryTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/ElementDefTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ElementDef.php';
-
 class HTMLPurifier_ElementDefTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/EncoderTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Encoder.php';
-
 class HTMLPurifier_EncoderTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/EntityLookupTest.php

@@ -2,8 +2,6 @@
 
 // this page is UTF-8 encoded!
 
-require_once 'HTMLPurifier/EntityLookup.php';
-
 class HTMLPurifier_EntityLookupTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/EntityParserTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/EntityParser.php';
-
 class HTMLPurifier_EntityParserTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/ErrorCollectorEMock.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ErrorCollector.php';
-
 generate_mock_once('HTMLPurifier_ErrorCollector');
 
 /**

tests/HTMLPurifier/ErrorCollectorTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ErrorCollector.php';
-
 class HTMLPurifier_ErrorCollectorTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/ErrorsHarness.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ErrorCollectorEMock.php';
-require_once 'HTMLPurifier/Lexer/DirectLex.php';
-
 /**
  * @todo Make the callCount variable actually work, so we can precisely
  *       specify what errors we want: no more, no less

tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Filter/ExtractStyleBlocks.php';
-
 /**
  * @todo Assimilate CSSTidy into our library
  */

tests/HTMLPurifier/GeneratorTest.php

@@ -1,10 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Generator.php';
-require_once 'HTMLPurifier/EntityLookup.php';
-
-require_once 'HTMLPurifier/ComplexHarness.php';
-
 class HTMLPurifier_GeneratorTest extends HTMLPurifier_ComplexHarness
 {
     

tests/HTMLPurifier/HTMLDefinitionTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLDefinition.php';
-
 class HTMLPurifier_HTMLDefinitionTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/HTMLModule/ObjectTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModuleHarness.php';
-
 class HTMLPurifier_HTMLModule_ObjectTest extends HTMLPurifier_HTMLModuleHarness
 {
     

tests/HTMLPurifier/HTMLModule/RubyTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModuleHarness.php';
-
 class HTMLPurifier_HTMLModule_RubyTest extends HTMLPurifier_HTMLModuleHarness
 {
     

tests/HTMLPurifier/HTMLModule/ScriptingTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModuleHarness.php';
-
 class HTMLPurifier_HTMLModule_ScriptingTest extends HTMLPurifier_HTMLModuleHarness
 {
     

tests/HTMLPurifier/HTMLModule/TidyTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModule/Tidy.php';
-
 Mock::generatePartial(
     'HTMLPurifier_HTMLModule_Tidy',
     'HTMLPurifier_HTMLModule_Tidy_TestForConstruct',

tests/HTMLPurifier/HTMLModuleHarness.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/StrategyHarness.php';
-require_once 'HTMLPurifier/Strategy/Core.php';
-
 class HTMLPurifier_HTMLModuleHarness extends HTMLPurifier_StrategyHarness
 {
     function setup() {

tests/HTMLPurifier/HTMLModuleManagerTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModuleManager.php';
-
 class HTMLPurifier_HTMLModuleManagerTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/HTMLModuleTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModule.php';
-require_once 'HTMLPurifier/AttrDef.php';
-
 class HTMLPurifier_HTMLModuleTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/Harness.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URIParser.php';
-
 /**
  * All-use harness, use this rather than SimpleTest's
  */

tests/HTMLPurifier/IDAccumulatorTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/IDAccumulator.php';
-
 class HTMLPurifier_IDAccumulatorTest extends HTMLPurifier_Harness
 {
     

tests/HTMLPurifier/Injector/AutoParagraphTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/InjectorHarness.php';
-require_once 'HTMLPurifier/Injector/AutoParagraph.php';
-
 class HTMLPurifier_Injector_AutoParagraphTest extends HTMLPurifier_InjectorHarness
 {
     

tests/HTMLPurifier/Injector/LinkifyTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/InjectorHarness.php';
-require_once 'HTMLPurifier/Injector/Linkify.php';
-
 class HTMLPurifier_Injector_LinkifyTest extends HTMLPurifier_InjectorHarness
 {
     

tests/HTMLPurifier/Injector/PurifierLinkifyTest.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/InjectorHarness.php';
-require_once 'HTMLPurifier/Injector/PurifierLinkify.php';
-
 class HTMLPurifier_Injector_PurifierLinkifyTest extends HTMLPurifier_InjectorHarness
 {
     

tests/HTMLPurifier/InjectorHarness.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/StrategyHarness.php';
-require_once 'HTMLPurifier/Strategy/MakeWellFormed.php';
-
 class HTMLPurifier_InjectorHarness extends HTMLPurifier_StrategyHarness
 {
     

tests/HTMLPurifier/LanguageFactoryTest.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/LanguageFactory.php';
-
 class HTMLPurifier_LanguageFactoryTest extends HTMLPurifier_Harness
 {