diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 0000000000..2178ce2e42 --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,28 @@ + + + + + tests/phpunit/tests + tests/phpunit/tests/actions/closures.php + tests/phpunit/tests/image/editor.php + tests/phpunit/tests/image/editor_gd.php + tests/phpunit/tests/image/editor_imagick.php + tests/phpunit/tests/actions/closures.php + tests/phpunit/tests/image/editor.php + tests/phpunit/tests/image/editor_gd.php + tests/phpunit/tests/image/editor_imagick.php + + + + + ajax + + + + + + diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist deleted file mode 100644 index ff0b5882d7..0000000000 --- a/tests/phpunit.xml.dist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - tests - tests/actions/closures.php - tests/image/editor.php - tests/image/editor_gd.php - tests/image/editor_imagick.php - tests/actions/closures.php - tests/image/editor.php - tests/image/editor_gd.php - tests/image/editor_imagick.php - - - - - ajax - - - - - - diff --git a/tests/README.txt b/tests/phpunit/README.txt similarity index 100% rename from tests/README.txt rename to tests/phpunit/README.txt diff --git a/tests/build.xml b/tests/phpunit/build.xml similarity index 100% rename from tests/build.xml rename to tests/phpunit/build.xml diff --git a/tests/data/WPHTTP-testcase-redirection-script.php b/tests/phpunit/data/WPHTTP-testcase-redirection-script.php similarity index 100% rename from tests/data/WPHTTP-testcase-redirection-script.php rename to tests/phpunit/data/WPHTTP-testcase-redirection-script.php diff --git a/tests/data/export/crazy-cdata-escaped.xml b/tests/phpunit/data/export/crazy-cdata-escaped.xml similarity index 100% rename from tests/data/export/crazy-cdata-escaped.xml rename to tests/phpunit/data/export/crazy-cdata-escaped.xml diff --git a/tests/data/export/crazy-cdata.xml b/tests/phpunit/data/export/crazy-cdata.xml similarity index 100% rename from tests/data/export/crazy-cdata.xml rename to tests/phpunit/data/export/crazy-cdata.xml diff --git a/tests/data/export/invalid-version-tag.xml b/tests/phpunit/data/export/invalid-version-tag.xml similarity index 100% rename from tests/data/export/invalid-version-tag.xml rename to tests/phpunit/data/export/invalid-version-tag.xml diff --git a/tests/data/export/malformed.xml b/tests/phpunit/data/export/malformed.xml similarity index 100% rename from tests/data/export/malformed.xml rename to tests/phpunit/data/export/malformed.xml diff --git a/tests/data/export/missing-version-tag.xml b/tests/phpunit/data/export/missing-version-tag.xml similarity index 100% rename from tests/data/export/missing-version-tag.xml rename to tests/phpunit/data/export/missing-version-tag.xml diff --git a/tests/data/export/small-export.xml b/tests/phpunit/data/export/small-export.xml similarity index 100% rename from tests/data/export/small-export.xml rename to tests/phpunit/data/export/small-export.xml diff --git a/tests/data/export/test-serialized-postmeta-no-cdata.xml b/tests/phpunit/data/export/test-serialized-postmeta-no-cdata.xml similarity index 100% rename from tests/data/export/test-serialized-postmeta-no-cdata.xml rename to tests/phpunit/data/export/test-serialized-postmeta-no-cdata.xml diff --git a/tests/data/export/test-serialized-postmeta-with-cdata.xml b/tests/phpunit/data/export/test-serialized-postmeta-with-cdata.xml similarity index 100% rename from tests/data/export/test-serialized-postmeta-with-cdata.xml rename to tests/phpunit/data/export/test-serialized-postmeta-with-cdata.xml diff --git a/tests/data/export/test-utw-post-meta-import.xml b/tests/phpunit/data/export/test-utw-post-meta-import.xml similarity index 100% rename from tests/data/export/test-utw-post-meta-import.xml rename to tests/phpunit/data/export/test-utw-post-meta-import.xml diff --git a/tests/data/export/valid-wxr-1.0.xml b/tests/phpunit/data/export/valid-wxr-1.0.xml similarity index 100% rename from tests/data/export/valid-wxr-1.0.xml rename to tests/phpunit/data/export/valid-wxr-1.0.xml diff --git a/tests/data/export/valid-wxr-1.1.xml b/tests/phpunit/data/export/valid-wxr-1.1.xml similarity index 100% rename from tests/data/export/valid-wxr-1.1.xml rename to tests/phpunit/data/export/valid-wxr-1.1.xml diff --git a/tests/data/formatting/big5.txt b/tests/phpunit/data/formatting/big5.txt similarity index 100% rename from tests/data/formatting/big5.txt rename to tests/phpunit/data/formatting/big5.txt diff --git a/tests/data/formatting/cr-line-endings-file-header.php b/tests/phpunit/data/formatting/cr-line-endings-file-header.php similarity index 100% rename from tests/data/formatting/cr-line-endings-file-header.php rename to tests/phpunit/data/formatting/cr-line-endings-file-header.php diff --git a/tests/data/formatting/entities.txt b/tests/phpunit/data/formatting/entities.txt similarity index 100% rename from tests/data/formatting/entities.txt rename to tests/phpunit/data/formatting/entities.txt diff --git a/tests/data/formatting/remove_accents.01.input.txt b/tests/phpunit/data/formatting/remove_accents.01.input.txt similarity index 100% rename from tests/data/formatting/remove_accents.01.input.txt rename to tests/phpunit/data/formatting/remove_accents.01.input.txt diff --git a/tests/data/formatting/sizzle.js b/tests/phpunit/data/formatting/sizzle.js similarity index 100% rename from tests/data/formatting/sizzle.js rename to tests/phpunit/data/formatting/sizzle.js diff --git a/tests/data/formatting/utf-8/README b/tests/phpunit/data/formatting/utf-8/README similarity index 100% rename from tests/data/formatting/utf-8/README rename to tests/phpunit/data/formatting/utf-8/README diff --git a/tests/data/formatting/utf-8/entitize.py b/tests/phpunit/data/formatting/utf-8/entitize.py similarity index 100% rename from tests/data/formatting/utf-8/entitize.py rename to tests/phpunit/data/formatting/utf-8/entitize.py diff --git a/tests/data/formatting/utf-8/entitized.txt b/tests/phpunit/data/formatting/utf-8/entitized.txt similarity index 100% rename from tests/data/formatting/utf-8/entitized.txt rename to tests/phpunit/data/formatting/utf-8/entitized.txt diff --git a/tests/data/formatting/utf-8/u-urlencode.py b/tests/phpunit/data/formatting/utf-8/u-urlencode.py similarity index 100% rename from tests/data/formatting/utf-8/u-urlencode.py rename to tests/phpunit/data/formatting/utf-8/u-urlencode.py diff --git a/tests/data/formatting/utf-8/u-urlencoded.txt b/tests/phpunit/data/formatting/utf-8/u-urlencoded.txt similarity index 100% rename from tests/data/formatting/utf-8/u-urlencoded.txt rename to tests/phpunit/data/formatting/utf-8/u-urlencoded.txt diff --git a/tests/data/formatting/utf-8/urlencode.py b/tests/phpunit/data/formatting/utf-8/urlencode.py similarity index 100% rename from tests/data/formatting/utf-8/urlencode.py rename to tests/phpunit/data/formatting/utf-8/urlencode.py diff --git a/tests/data/formatting/utf-8/urlencoded.txt b/tests/phpunit/data/formatting/utf-8/urlencoded.txt similarity index 100% rename from tests/data/formatting/utf-8/urlencoded.txt rename to tests/phpunit/data/formatting/utf-8/urlencoded.txt diff --git a/tests/data/formatting/utf-8/utf-8.txt b/tests/phpunit/data/formatting/utf-8/utf-8.txt similarity index 100% rename from tests/data/formatting/utf-8/utf-8.txt rename to tests/phpunit/data/formatting/utf-8/utf-8.txt diff --git a/tests/data/formatting/windows1252.py b/tests/phpunit/data/formatting/windows1252.py similarity index 100% rename from tests/data/formatting/windows1252.py rename to tests/phpunit/data/formatting/windows1252.py diff --git a/tests/data/formatting/xssAttacks.xml b/tests/phpunit/data/formatting/xssAttacks.xml similarity index 100% rename from tests/data/formatting/xssAttacks.xml rename to tests/phpunit/data/formatting/xssAttacks.xml diff --git a/tests/data/images/2004-07-22-DSC_0007.jpg b/tests/phpunit/data/images/2004-07-22-DSC_0007.jpg similarity index 100% rename from tests/data/images/2004-07-22-DSC_0007.jpg rename to tests/phpunit/data/images/2004-07-22-DSC_0007.jpg diff --git a/tests/data/images/2004-07-22-DSC_0008.jpg b/tests/phpunit/data/images/2004-07-22-DSC_0008.jpg similarity index 100% rename from tests/data/images/2004-07-22-DSC_0008.jpg rename to tests/phpunit/data/images/2004-07-22-DSC_0008.jpg diff --git a/tests/data/images/2007-06-17DSC_4173.JPG b/tests/phpunit/data/images/2007-06-17DSC_4173.JPG similarity index 100% rename from tests/data/images/2007-06-17DSC_4173.JPG rename to tests/phpunit/data/images/2007-06-17DSC_4173.JPG diff --git a/tests/data/images/a2-small-100x75.jpg b/tests/phpunit/data/images/a2-small-100x75.jpg similarity index 100% rename from tests/data/images/a2-small-100x75.jpg rename to tests/phpunit/data/images/a2-small-100x75.jpg diff --git a/tests/data/images/a2-small.jpg b/tests/phpunit/data/images/a2-small.jpg similarity index 100% rename from tests/data/images/a2-small.jpg rename to tests/phpunit/data/images/a2-small.jpg diff --git a/tests/data/images/canola.jpg b/tests/phpunit/data/images/canola.jpg similarity index 100% rename from tests/data/images/canola.jpg rename to tests/phpunit/data/images/canola.jpg diff --git a/tests/data/images/gradient-square.jpg b/tests/phpunit/data/images/gradient-square.jpg similarity index 100% rename from tests/data/images/gradient-square.jpg rename to tests/phpunit/data/images/gradient-square.jpg diff --git a/tests/data/images/test-image-cmyk.jpg b/tests/phpunit/data/images/test-image-cmyk.jpg similarity index 100% rename from tests/data/images/test-image-cmyk.jpg rename to tests/phpunit/data/images/test-image-cmyk.jpg diff --git a/tests/data/images/test-image-grayscale.jpg b/tests/phpunit/data/images/test-image-grayscale.jpg similarity index 100% rename from tests/data/images/test-image-grayscale.jpg rename to tests/phpunit/data/images/test-image-grayscale.jpg diff --git a/tests/data/images/test-image-iptc.jpg b/tests/phpunit/data/images/test-image-iptc.jpg similarity index 100% rename from tests/data/images/test-image-iptc.jpg rename to tests/phpunit/data/images/test-image-iptc.jpg diff --git a/tests/data/images/test-image-lzw.tiff b/tests/phpunit/data/images/test-image-lzw.tiff similarity index 100% rename from tests/data/images/test-image-lzw.tiff rename to tests/phpunit/data/images/test-image-lzw.tiff diff --git a/tests/data/images/test-image-mime-jpg.png b/tests/phpunit/data/images/test-image-mime-jpg.png similarity index 100% rename from tests/data/images/test-image-mime-jpg.png rename to tests/phpunit/data/images/test-image-mime-jpg.png diff --git a/tests/data/images/test-image-zip.tiff b/tests/phpunit/data/images/test-image-zip.tiff similarity index 100% rename from tests/data/images/test-image-zip.tiff rename to tests/phpunit/data/images/test-image-zip.tiff diff --git a/tests/data/images/test-image.bmp b/tests/phpunit/data/images/test-image.bmp similarity index 100% rename from tests/data/images/test-image.bmp rename to tests/phpunit/data/images/test-image.bmp diff --git a/tests/data/images/test-image.gif b/tests/phpunit/data/images/test-image.gif similarity index 100% rename from tests/data/images/test-image.gif rename to tests/phpunit/data/images/test-image.gif diff --git a/tests/data/images/test-image.jp2 b/tests/phpunit/data/images/test-image.jp2 similarity index 100% rename from tests/data/images/test-image.jp2 rename to tests/phpunit/data/images/test-image.jp2 diff --git a/tests/data/images/test-image.jpg b/tests/phpunit/data/images/test-image.jpg similarity index 100% rename from tests/data/images/test-image.jpg rename to tests/phpunit/data/images/test-image.jpg diff --git a/tests/data/images/test-image.pct b/tests/phpunit/data/images/test-image.pct similarity index 100% rename from tests/data/images/test-image.pct rename to tests/phpunit/data/images/test-image.pct diff --git a/tests/data/images/test-image.png b/tests/phpunit/data/images/test-image.png similarity index 100% rename from tests/data/images/test-image.png rename to tests/phpunit/data/images/test-image.png diff --git a/tests/data/images/test-image.psd b/tests/phpunit/data/images/test-image.psd similarity index 100% rename from tests/data/images/test-image.psd rename to tests/phpunit/data/images/test-image.psd diff --git a/tests/data/images/test-image.sgi b/tests/phpunit/data/images/test-image.sgi similarity index 100% rename from tests/data/images/test-image.sgi rename to tests/phpunit/data/images/test-image.sgi diff --git a/tests/data/images/test-image.tga b/tests/phpunit/data/images/test-image.tga similarity index 100% rename from tests/data/images/test-image.tga rename to tests/phpunit/data/images/test-image.tga diff --git a/tests/data/images/test-image.tiff b/tests/phpunit/data/images/test-image.tiff similarity index 100% rename from tests/data/images/test-image.tiff rename to tests/phpunit/data/images/test-image.tiff diff --git a/tests/data/images/transparent.png b/tests/phpunit/data/images/transparent.png similarity index 100% rename from tests/data/images/transparent.png rename to tests/phpunit/data/images/transparent.png diff --git a/tests/data/images/waffles.jpg b/tests/phpunit/data/images/waffles.jpg similarity index 100% rename from tests/data/images/waffles.jpg rename to tests/phpunit/data/images/waffles.jpg diff --git a/tests/data/plugins/hello.php b/tests/phpunit/data/plugins/hello.php similarity index 100% rename from tests/data/plugins/hello.php rename to tests/phpunit/data/plugins/hello.php diff --git a/tests/data/pomo/bad_nplurals.mo b/tests/phpunit/data/pomo/bad_nplurals.mo similarity index 100% rename from tests/data/pomo/bad_nplurals.mo rename to tests/phpunit/data/pomo/bad_nplurals.mo diff --git a/tests/data/pomo/bad_nplurals.po b/tests/phpunit/data/pomo/bad_nplurals.po similarity index 100% rename from tests/data/pomo/bad_nplurals.po rename to tests/phpunit/data/pomo/bad_nplurals.po diff --git a/tests/data/pomo/context.mo b/tests/phpunit/data/pomo/context.mo similarity index 100% rename from tests/data/pomo/context.mo rename to tests/phpunit/data/pomo/context.mo diff --git a/tests/data/pomo/de_DE-2.8.mo b/tests/phpunit/data/pomo/de_DE-2.8.mo similarity index 100% rename from tests/data/pomo/de_DE-2.8.mo rename to tests/phpunit/data/pomo/de_DE-2.8.mo diff --git a/tests/data/pomo/empty.po b/tests/phpunit/data/pomo/empty.po similarity index 100% rename from tests/data/pomo/empty.po rename to tests/phpunit/data/pomo/empty.po diff --git a/tests/data/pomo/mo.pot b/tests/phpunit/data/pomo/mo.pot similarity index 100% rename from tests/data/pomo/mo.pot rename to tests/phpunit/data/pomo/mo.pot diff --git a/tests/data/pomo/overload.mo b/tests/phpunit/data/pomo/overload.mo similarity index 100% rename from tests/data/pomo/overload.mo rename to tests/phpunit/data/pomo/overload.mo diff --git a/tests/data/pomo/plural.mo b/tests/phpunit/data/pomo/plural.mo similarity index 100% rename from tests/data/pomo/plural.mo rename to tests/phpunit/data/pomo/plural.mo diff --git a/tests/data/pomo/simple.mo b/tests/phpunit/data/pomo/simple.mo similarity index 100% rename from tests/data/pomo/simple.mo rename to tests/phpunit/data/pomo/simple.mo diff --git a/tests/data/pomo/simple.po b/tests/phpunit/data/pomo/simple.po similarity index 100% rename from tests/data/pomo/simple.po rename to tests/phpunit/data/pomo/simple.po diff --git a/tests/data/pomo/windows-line-endings.po b/tests/phpunit/data/pomo/windows-line-endings.po similarity index 100% rename from tests/data/pomo/windows-line-endings.po rename to tests/phpunit/data/pomo/windows-line-endings.po diff --git a/tests/data/themedir1/default/functions.php b/tests/phpunit/data/themedir1/default/functions.php similarity index 100% rename from tests/data/themedir1/default/functions.php rename to tests/phpunit/data/themedir1/default/functions.php diff --git a/tests/data/themedir1/default/index.php b/tests/phpunit/data/themedir1/default/index.php similarity index 100% rename from tests/data/themedir1/default/index.php rename to tests/phpunit/data/themedir1/default/index.php diff --git a/tests/data/themedir1/default/style.css b/tests/phpunit/data/themedir1/default/style.css similarity index 100% rename from tests/data/themedir1/default/style.css rename to tests/phpunit/data/themedir1/default/style.css diff --git a/tests/data/themedir1/page-templates/index.php b/tests/phpunit/data/themedir1/page-templates/index.php similarity index 100% rename from tests/data/themedir1/page-templates/index.php rename to tests/phpunit/data/themedir1/page-templates/index.php diff --git a/tests/data/themedir1/page-templates/style.css b/tests/phpunit/data/themedir1/page-templates/style.css similarity index 100% rename from tests/data/themedir1/page-templates/style.css rename to tests/phpunit/data/themedir1/page-templates/style.css diff --git a/tests/data/themedir1/page-templates/subdir/template-sub-dir.php b/tests/phpunit/data/themedir1/page-templates/subdir/template-sub-dir.php similarity index 100% rename from tests/data/themedir1/page-templates/subdir/template-sub-dir.php rename to tests/phpunit/data/themedir1/page-templates/subdir/template-sub-dir.php diff --git a/tests/data/themedir1/page-templates/template-header.php b/tests/phpunit/data/themedir1/page-templates/template-header.php similarity index 100% rename from tests/data/themedir1/page-templates/template-header.php rename to tests/phpunit/data/themedir1/page-templates/template-header.php diff --git a/tests/data/themedir1/page-templates/template-top-level.php b/tests/phpunit/data/themedir1/page-templates/template-top-level.php similarity index 100% rename from tests/data/themedir1/page-templates/template-top-level.php rename to tests/phpunit/data/themedir1/page-templates/template-top-level.php diff --git a/tests/data/themedir1/sandbox/functions.php b/tests/phpunit/data/themedir1/sandbox/functions.php similarity index 100% rename from tests/data/themedir1/sandbox/functions.php rename to tests/phpunit/data/themedir1/sandbox/functions.php diff --git a/tests/data/themedir1/sandbox/index.php b/tests/phpunit/data/themedir1/sandbox/index.php similarity index 100% rename from tests/data/themedir1/sandbox/index.php rename to tests/phpunit/data/themedir1/sandbox/index.php diff --git a/tests/data/themedir1/sandbox/style.css b/tests/phpunit/data/themedir1/sandbox/style.css similarity index 100% rename from tests/data/themedir1/sandbox/style.css rename to tests/phpunit/data/themedir1/sandbox/style.css diff --git a/tests/data/themedir1/stylesheetonly/style.css b/tests/phpunit/data/themedir1/stylesheetonly/style.css similarity index 100% rename from tests/data/themedir1/stylesheetonly/style.css rename to tests/phpunit/data/themedir1/stylesheetonly/style.css diff --git a/tests/data/themedir1/subdir/theme with spaces/index.php b/tests/phpunit/data/themedir1/subdir/theme with spaces/index.php similarity index 100% rename from tests/data/themedir1/subdir/theme with spaces/index.php rename to tests/phpunit/data/themedir1/subdir/theme with spaces/index.php diff --git a/tests/data/themedir1/subdir/theme with spaces/style.css b/tests/phpunit/data/themedir1/subdir/theme with spaces/style.css similarity index 100% rename from tests/data/themedir1/subdir/theme with spaces/style.css rename to tests/phpunit/data/themedir1/subdir/theme with spaces/style.css diff --git a/tests/data/themedir1/subdir/theme2/functions.php b/tests/phpunit/data/themedir1/subdir/theme2/functions.php similarity index 100% rename from tests/data/themedir1/subdir/theme2/functions.php rename to tests/phpunit/data/themedir1/subdir/theme2/functions.php diff --git a/tests/data/themedir1/subdir/theme2/index.php b/tests/phpunit/data/themedir1/subdir/theme2/index.php similarity index 100% rename from tests/data/themedir1/subdir/theme2/index.php rename to tests/phpunit/data/themedir1/subdir/theme2/index.php diff --git a/tests/data/themedir1/subdir/theme2/style.css b/tests/phpunit/data/themedir1/subdir/theme2/style.css similarity index 100% rename from tests/data/themedir1/subdir/theme2/style.css rename to tests/phpunit/data/themedir1/subdir/theme2/style.css diff --git a/tests/data/themedir1/theme1-dupe/functions.php b/tests/phpunit/data/themedir1/theme1-dupe/functions.php similarity index 100% rename from tests/data/themedir1/theme1-dupe/functions.php rename to tests/phpunit/data/themedir1/theme1-dupe/functions.php diff --git a/tests/data/themedir1/theme1-dupe/index.php b/tests/phpunit/data/themedir1/theme1-dupe/index.php similarity index 100% rename from tests/data/themedir1/theme1-dupe/index.php rename to tests/phpunit/data/themedir1/theme1-dupe/index.php diff --git a/tests/data/themedir1/theme1-dupe/style.css b/tests/phpunit/data/themedir1/theme1-dupe/style.css similarity index 100% rename from tests/data/themedir1/theme1-dupe/style.css rename to tests/phpunit/data/themedir1/theme1-dupe/style.css diff --git a/tests/data/themedir1/theme1/functions.php b/tests/phpunit/data/themedir1/theme1/functions.php similarity index 100% rename from tests/data/themedir1/theme1/functions.php rename to tests/phpunit/data/themedir1/theme1/functions.php diff --git a/tests/data/themedir1/theme1/index.php b/tests/phpunit/data/themedir1/theme1/index.php similarity index 100% rename from tests/data/themedir1/theme1/index.php rename to tests/phpunit/data/themedir1/theme1/index.php diff --git a/tests/data/themedir1/theme1/style.css b/tests/phpunit/data/themedir1/theme1/style.css similarity index 100% rename from tests/data/themedir1/theme1/style.css rename to tests/phpunit/data/themedir1/theme1/style.css diff --git a/tests/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php similarity index 90% rename from tests/includes/bootstrap.php rename to tests/phpunit/includes/bootstrap.php index 626b486841..b73dd4e09c 100644 --- a/tests/includes/bootstrap.php +++ b/tests/phpunit/includes/bootstrap.php @@ -4,21 +4,18 @@ */ -$config_file_path = dirname( __FILE__ ) . '/../wp-tests-config.php'; -if ( ! file_exists( $config_file_path ) ) { - // Support having the config file one level up. - $config_file_path = dirname( __FILE__ ) . '/../../wp-tests-config.php'; +$config_file_path = dirname( dirname( __FILE__ ) ); +if ( ! file_exists( $config_file_path . '/wp-tests-config.php' ) ) { + // Support the config file from the root of the develop repository. + if ( basename( $config_file_path ) === 'phpunit' && basename( dirname( $config_file_path ) ) === 'tests' ) + $config_file_path = dirname( dirname( $config_file_path ) ); } +$config_file_path .= '/wp-tests-config.php'; /* * Globalize some WordPress variables, because PHPUnit loads this file inside a function * See: https://github.com/sebastianbergmann/phpunit/issues/325 - * - * These are not needed for WordPress 3.3+, only for older versions -*/ -global $table_prefix, $wp_embed, $wp_locale, $_wp_deprecated_widgets_callbacks, $wp_widget_factory; - -// These are still needed + */ global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp, $phpmailer; if ( !is_readable( $config_file_path ) ) { diff --git a/tests/includes/exceptions.php b/tests/phpunit/includes/exceptions.php similarity index 100% rename from tests/includes/exceptions.php rename to tests/phpunit/includes/exceptions.php diff --git a/tests/includes/factory.php b/tests/phpunit/includes/factory.php similarity index 100% rename from tests/includes/factory.php rename to tests/phpunit/includes/factory.php diff --git a/tests/includes/functions.php b/tests/phpunit/includes/functions.php similarity index 100% rename from tests/includes/functions.php rename to tests/phpunit/includes/functions.php diff --git a/tests/includes/install.php b/tests/phpunit/includes/install.php similarity index 100% rename from tests/includes/install.php rename to tests/phpunit/includes/install.php diff --git a/tests/includes/mock-fs.php b/tests/phpunit/includes/mock-fs.php similarity index 100% rename from tests/includes/mock-fs.php rename to tests/phpunit/includes/mock-fs.php diff --git a/tests/includes/mock-image-editor.php b/tests/phpunit/includes/mock-image-editor.php similarity index 100% rename from tests/includes/mock-image-editor.php rename to tests/phpunit/includes/mock-image-editor.php diff --git a/tests/includes/mock-mailer.php b/tests/phpunit/includes/mock-mailer.php similarity index 100% rename from tests/includes/mock-mailer.php rename to tests/phpunit/includes/mock-mailer.php diff --git a/tests/includes/testcase-ajax.php b/tests/phpunit/includes/testcase-ajax.php similarity index 100% rename from tests/includes/testcase-ajax.php rename to tests/phpunit/includes/testcase-ajax.php diff --git a/tests/includes/testcase-xmlrpc.php b/tests/phpunit/includes/testcase-xmlrpc.php similarity index 100% rename from tests/includes/testcase-xmlrpc.php rename to tests/phpunit/includes/testcase-xmlrpc.php diff --git a/tests/includes/testcase.php b/tests/phpunit/includes/testcase.php similarity index 100% rename from tests/includes/testcase.php rename to tests/phpunit/includes/testcase.php diff --git a/tests/includes/trac.php b/tests/phpunit/includes/trac.php similarity index 100% rename from tests/includes/trac.php rename to tests/phpunit/includes/trac.php diff --git a/tests/includes/utils.php b/tests/phpunit/includes/utils.php similarity index 100% rename from tests/includes/utils.php rename to tests/phpunit/includes/utils.php diff --git a/tests/includes/wp-profiler.php b/tests/phpunit/includes/wp-profiler.php similarity index 100% rename from tests/includes/wp-profiler.php rename to tests/phpunit/includes/wp-profiler.php diff --git a/tests/multisite.xml b/tests/phpunit/multisite.xml similarity index 100% rename from tests/multisite.xml rename to tests/phpunit/multisite.xml diff --git a/tests/tests/actions.php b/tests/phpunit/tests/actions.php similarity index 100% rename from tests/tests/actions.php rename to tests/phpunit/tests/actions.php diff --git a/tests/tests/actions/callbacks.php b/tests/phpunit/tests/actions/callbacks.php similarity index 100% rename from tests/tests/actions/callbacks.php rename to tests/phpunit/tests/actions/callbacks.php diff --git a/tests/tests/actions/closures.php b/tests/phpunit/tests/actions/closures.php similarity index 100% rename from tests/tests/actions/closures.php rename to tests/phpunit/tests/actions/closures.php diff --git a/tests/tests/admin/includesFile.php b/tests/phpunit/tests/admin/includesFile.php similarity index 100% rename from tests/tests/admin/includesFile.php rename to tests/phpunit/tests/admin/includesFile.php diff --git a/tests/tests/admin/includesMisc.php b/tests/phpunit/tests/admin/includesMisc.php similarity index 100% rename from tests/tests/admin/includesMisc.php rename to tests/phpunit/tests/admin/includesMisc.php diff --git a/tests/tests/admin/includesPlugin.php b/tests/phpunit/tests/admin/includesPlugin.php similarity index 100% rename from tests/tests/admin/includesPlugin.php rename to tests/phpunit/tests/admin/includesPlugin.php diff --git a/tests/tests/admin/includesPost.php b/tests/phpunit/tests/admin/includesPost.php similarity index 100% rename from tests/tests/admin/includesPost.php rename to tests/phpunit/tests/admin/includesPost.php diff --git a/tests/tests/admin/includesScreen.php b/tests/phpunit/tests/admin/includesScreen.php similarity index 100% rename from tests/tests/admin/includesScreen.php rename to tests/phpunit/tests/admin/includesScreen.php diff --git a/tests/tests/admin/includesTemplate.php b/tests/phpunit/tests/admin/includesTemplate.php similarity index 100% rename from tests/tests/admin/includesTemplate.php rename to tests/phpunit/tests/admin/includesTemplate.php diff --git a/tests/tests/admin/includesTheme.php b/tests/phpunit/tests/admin/includesTheme.php similarity index 100% rename from tests/tests/admin/includesTheme.php rename to tests/phpunit/tests/admin/includesTheme.php diff --git a/tests/tests/adminbar.php b/tests/phpunit/tests/adminbar.php similarity index 100% rename from tests/tests/adminbar.php rename to tests/phpunit/tests/adminbar.php diff --git a/tests/tests/ajax/Autosave.php b/tests/phpunit/tests/ajax/Autosave.php similarity index 100% rename from tests/tests/ajax/Autosave.php rename to tests/phpunit/tests/ajax/Autosave.php diff --git a/tests/tests/ajax/Compression.php b/tests/phpunit/tests/ajax/Compression.php similarity index 100% rename from tests/tests/ajax/Compression.php rename to tests/phpunit/tests/ajax/Compression.php diff --git a/tests/tests/ajax/DeleteComment.php b/tests/phpunit/tests/ajax/DeleteComment.php similarity index 100% rename from tests/tests/ajax/DeleteComment.php rename to tests/phpunit/tests/ajax/DeleteComment.php diff --git a/tests/tests/ajax/DimComment.php b/tests/phpunit/tests/ajax/DimComment.php similarity index 100% rename from tests/tests/ajax/DimComment.php rename to tests/phpunit/tests/ajax/DimComment.php diff --git a/tests/tests/ajax/EditComment.php b/tests/phpunit/tests/ajax/EditComment.php similarity index 100% rename from tests/tests/ajax/EditComment.php rename to tests/phpunit/tests/ajax/EditComment.php diff --git a/tests/tests/ajax/GetComments.php b/tests/phpunit/tests/ajax/GetComments.php similarity index 100% rename from tests/tests/ajax/GetComments.php rename to tests/phpunit/tests/ajax/GetComments.php diff --git a/tests/tests/ajax/MediaEdit.php b/tests/phpunit/tests/ajax/MediaEdit.php similarity index 100% rename from tests/tests/ajax/MediaEdit.php rename to tests/phpunit/tests/ajax/MediaEdit.php diff --git a/tests/tests/ajax/ReplytoComment.php b/tests/phpunit/tests/ajax/ReplytoComment.php similarity index 100% rename from tests/tests/ajax/ReplytoComment.php rename to tests/phpunit/tests/ajax/ReplytoComment.php diff --git a/tests/tests/ajax/Response.php b/tests/phpunit/tests/ajax/Response.php similarity index 100% rename from tests/tests/ajax/Response.php rename to tests/phpunit/tests/ajax/Response.php diff --git a/tests/tests/ajax/TagSearch.php b/tests/phpunit/tests/ajax/TagSearch.php similarity index 100% rename from tests/tests/ajax/TagSearch.php rename to tests/phpunit/tests/ajax/TagSearch.php diff --git a/tests/tests/attachment/slashes.php b/tests/phpunit/tests/attachment/slashes.php similarity index 100% rename from tests/tests/attachment/slashes.php rename to tests/phpunit/tests/attachment/slashes.php diff --git a/tests/tests/auth.php b/tests/phpunit/tests/auth.php similarity index 100% rename from tests/tests/auth.php rename to tests/phpunit/tests/auth.php diff --git a/tests/tests/basic.php b/tests/phpunit/tests/basic.php similarity index 100% rename from tests/tests/basic.php rename to tests/phpunit/tests/basic.php diff --git a/tests/tests/cache.php b/tests/phpunit/tests/cache.php similarity index 100% rename from tests/tests/cache.php rename to tests/phpunit/tests/cache.php diff --git a/tests/tests/canonical.php b/tests/phpunit/tests/canonical.php similarity index 100% rename from tests/tests/canonical.php rename to tests/phpunit/tests/canonical.php diff --git a/tests/tests/canonical/customRules.php b/tests/phpunit/tests/canonical/customRules.php similarity index 100% rename from tests/tests/canonical/customRules.php rename to tests/phpunit/tests/canonical/customRules.php diff --git a/tests/tests/canonical/noRewrite.php b/tests/phpunit/tests/canonical/noRewrite.php similarity index 100% rename from tests/tests/canonical/noRewrite.php rename to tests/phpunit/tests/canonical/noRewrite.php diff --git a/tests/tests/canonical/pageOnFront.php b/tests/phpunit/tests/canonical/pageOnFront.php similarity index 100% rename from tests/tests/canonical/pageOnFront.php rename to tests/phpunit/tests/canonical/pageOnFront.php diff --git a/tests/tests/canonical/permalinkFormats.php b/tests/phpunit/tests/canonical/permalinkFormats.php similarity index 100% rename from tests/tests/canonical/permalinkFormats.php rename to tests/phpunit/tests/canonical/permalinkFormats.php diff --git a/tests/tests/comment.php b/tests/phpunit/tests/comment.php similarity index 100% rename from tests/tests/comment.php rename to tests/phpunit/tests/comment.php diff --git a/tests/tests/comment/dateQuery.php b/tests/phpunit/tests/comment/dateQuery.php similarity index 100% rename from tests/tests/comment/dateQuery.php rename to tests/phpunit/tests/comment/dateQuery.php diff --git a/tests/tests/comment/query.php b/tests/phpunit/tests/comment/query.php similarity index 100% rename from tests/tests/comment/query.php rename to tests/phpunit/tests/comment/query.php diff --git a/tests/tests/comment/slashes.php b/tests/phpunit/tests/comment/slashes.php similarity index 100% rename from tests/tests/comment/slashes.php rename to tests/phpunit/tests/comment/slashes.php diff --git a/tests/tests/compat.php b/tests/phpunit/tests/compat.php similarity index 100% rename from tests/tests/compat.php rename to tests/phpunit/tests/compat.php diff --git a/tests/tests/cron.php b/tests/phpunit/tests/cron.php similarity index 100% rename from tests/tests/cron.php rename to tests/phpunit/tests/cron.php diff --git a/tests/tests/db.php b/tests/phpunit/tests/db.php similarity index 100% rename from tests/tests/db.php rename to tests/phpunit/tests/db.php diff --git a/tests/tests/dependencies.php b/tests/phpunit/tests/dependencies.php similarity index 100% rename from tests/tests/dependencies.php rename to tests/phpunit/tests/dependencies.php diff --git a/tests/tests/dependencies/jquery.php b/tests/phpunit/tests/dependencies/jquery.php similarity index 100% rename from tests/tests/dependencies/jquery.php rename to tests/phpunit/tests/dependencies/jquery.php diff --git a/tests/tests/dependencies/scripts.php b/tests/phpunit/tests/dependencies/scripts.php similarity index 100% rename from tests/tests/dependencies/scripts.php rename to tests/phpunit/tests/dependencies/scripts.php diff --git a/tests/tests/dependencies/styles.php b/tests/phpunit/tests/dependencies/styles.php similarity index 100% rename from tests/tests/dependencies/styles.php rename to tests/phpunit/tests/dependencies/styles.php diff --git a/tests/tests/export/class-wp-export-query.php b/tests/phpunit/tests/export/class-wp-export-query.php similarity index 100% rename from tests/tests/export/class-wp-export-query.php rename to tests/phpunit/tests/export/class-wp-export-query.php diff --git a/tests/tests/export/functions.export.php b/tests/phpunit/tests/export/functions.export.php similarity index 100% rename from tests/tests/export/functions.export.php rename to tests/phpunit/tests/export/functions.export.php diff --git a/tests/tests/export/writers.php b/tests/phpunit/tests/export/writers.php similarity index 100% rename from tests/tests/export/writers.php rename to tests/phpunit/tests/export/writers.php diff --git a/tests/tests/feed/rss2.php b/tests/phpunit/tests/feed/rss2.php similarity index 100% rename from tests/tests/feed/rss2.php rename to tests/phpunit/tests/feed/rss2.php diff --git a/tests/tests/file.php b/tests/phpunit/tests/file.php similarity index 100% rename from tests/tests/file.php rename to tests/phpunit/tests/file.php diff --git a/tests/tests/filesystem/base.php b/tests/phpunit/tests/filesystem/base.php similarity index 100% rename from tests/tests/filesystem/base.php rename to tests/phpunit/tests/filesystem/base.php diff --git a/tests/tests/filesystem/find_folder.php b/tests/phpunit/tests/filesystem/find_folder.php similarity index 100% rename from tests/tests/filesystem/find_folder.php rename to tests/phpunit/tests/filesystem/find_folder.php diff --git a/tests/tests/filters.php b/tests/phpunit/tests/filters.php similarity index 100% rename from tests/tests/filters.php rename to tests/phpunit/tests/filters.php diff --git a/tests/tests/formatting/Autop.php b/tests/phpunit/tests/formatting/Autop.php similarity index 100% rename from tests/tests/formatting/Autop.php rename to tests/phpunit/tests/formatting/Autop.php diff --git a/tests/tests/formatting/CleanPre.php b/tests/phpunit/tests/formatting/CleanPre.php similarity index 100% rename from tests/tests/formatting/CleanPre.php rename to tests/phpunit/tests/formatting/CleanPre.php diff --git a/tests/tests/formatting/ConvertChars.php b/tests/phpunit/tests/formatting/ConvertChars.php similarity index 100% rename from tests/tests/formatting/ConvertChars.php rename to tests/phpunit/tests/formatting/ConvertChars.php diff --git a/tests/tests/formatting/EscAttr.php b/tests/phpunit/tests/formatting/EscAttr.php similarity index 100% rename from tests/tests/formatting/EscAttr.php rename to tests/phpunit/tests/formatting/EscAttr.php diff --git a/tests/tests/formatting/EscHtml.php b/tests/phpunit/tests/formatting/EscHtml.php similarity index 100% rename from tests/tests/formatting/EscHtml.php rename to tests/phpunit/tests/formatting/EscHtml.php diff --git a/tests/tests/formatting/EscTextarea.php b/tests/phpunit/tests/formatting/EscTextarea.php similarity index 100% rename from tests/tests/formatting/EscTextarea.php rename to tests/phpunit/tests/formatting/EscTextarea.php diff --git a/tests/tests/formatting/EscUrl.php b/tests/phpunit/tests/formatting/EscUrl.php similarity index 100% rename from tests/tests/formatting/EscUrl.php rename to tests/phpunit/tests/formatting/EscUrl.php diff --git a/tests/tests/formatting/HtmlExcerpt.php b/tests/phpunit/tests/formatting/HtmlExcerpt.php similarity index 100% rename from tests/tests/formatting/HtmlExcerpt.php rename to tests/phpunit/tests/formatting/HtmlExcerpt.php diff --git a/tests/tests/formatting/IsEmail.php b/tests/phpunit/tests/formatting/IsEmail.php similarity index 100% rename from tests/tests/formatting/IsEmail.php rename to tests/phpunit/tests/formatting/IsEmail.php diff --git a/tests/tests/formatting/JSEscape.php b/tests/phpunit/tests/formatting/JSEscape.php similarity index 100% rename from tests/tests/formatting/JSEscape.php rename to tests/phpunit/tests/formatting/JSEscape.php diff --git a/tests/tests/formatting/LikeEscape.php b/tests/phpunit/tests/formatting/LikeEscape.php similarity index 100% rename from tests/tests/formatting/LikeEscape.php rename to tests/phpunit/tests/formatting/LikeEscape.php diff --git a/tests/tests/formatting/MakeClickable.php b/tests/phpunit/tests/formatting/MakeClickable.php similarity index 100% rename from tests/tests/formatting/MakeClickable.php rename to tests/phpunit/tests/formatting/MakeClickable.php diff --git a/tests/tests/formatting/MapDeep.php b/tests/phpunit/tests/formatting/MapDeep.php similarity index 100% rename from tests/tests/formatting/MapDeep.php rename to tests/phpunit/tests/formatting/MapDeep.php diff --git a/tests/tests/formatting/RemoveAccents.php b/tests/phpunit/tests/formatting/RemoveAccents.php similarity index 100% rename from tests/tests/formatting/RemoveAccents.php rename to tests/phpunit/tests/formatting/RemoveAccents.php diff --git a/tests/tests/formatting/SanitizeFileName.php b/tests/phpunit/tests/formatting/SanitizeFileName.php similarity index 100% rename from tests/tests/formatting/SanitizeFileName.php rename to tests/phpunit/tests/formatting/SanitizeFileName.php diff --git a/tests/tests/formatting/SanitizeMimeType.php b/tests/phpunit/tests/formatting/SanitizeMimeType.php similarity index 100% rename from tests/tests/formatting/SanitizeMimeType.php rename to tests/phpunit/tests/formatting/SanitizeMimeType.php diff --git a/tests/tests/formatting/SanitizeOrderby.php b/tests/phpunit/tests/formatting/SanitizeOrderby.php similarity index 100% rename from tests/tests/formatting/SanitizeOrderby.php rename to tests/phpunit/tests/formatting/SanitizeOrderby.php diff --git a/tests/tests/formatting/SanitizePost.php b/tests/phpunit/tests/formatting/SanitizePost.php similarity index 100% rename from tests/tests/formatting/SanitizePost.php rename to tests/phpunit/tests/formatting/SanitizePost.php diff --git a/tests/tests/formatting/SanitizeTextField.php b/tests/phpunit/tests/formatting/SanitizeTextField.php similarity index 100% rename from tests/tests/formatting/SanitizeTextField.php rename to tests/phpunit/tests/formatting/SanitizeTextField.php diff --git a/tests/tests/formatting/SanitizeTitle.php b/tests/phpunit/tests/formatting/SanitizeTitle.php similarity index 100% rename from tests/tests/formatting/SanitizeTitle.php rename to tests/phpunit/tests/formatting/SanitizeTitle.php diff --git a/tests/tests/formatting/SanitizeTitleWithDashes.php b/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php similarity index 100% rename from tests/tests/formatting/SanitizeTitleWithDashes.php rename to tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php diff --git a/tests/tests/formatting/SanitizeTrackbackUrls.php b/tests/phpunit/tests/formatting/SanitizeTrackbackUrls.php similarity index 100% rename from tests/tests/formatting/SanitizeTrackbackUrls.php rename to tests/phpunit/tests/formatting/SanitizeTrackbackUrls.php diff --git a/tests/tests/formatting/SanitizeUser.php b/tests/phpunit/tests/formatting/SanitizeUser.php similarity index 100% rename from tests/tests/formatting/SanitizeUser.php rename to tests/phpunit/tests/formatting/SanitizeUser.php diff --git a/tests/tests/formatting/SeemsUtf8.php b/tests/phpunit/tests/formatting/SeemsUtf8.php similarity index 100% rename from tests/tests/formatting/SeemsUtf8.php rename to tests/phpunit/tests/formatting/SeemsUtf8.php diff --git a/tests/tests/formatting/Slashit.php b/tests/phpunit/tests/formatting/Slashit.php similarity index 100% rename from tests/tests/formatting/Slashit.php rename to tests/phpunit/tests/formatting/Slashit.php diff --git a/tests/tests/formatting/Smilies.php b/tests/phpunit/tests/formatting/Smilies.php similarity index 100% rename from tests/tests/formatting/Smilies.php rename to tests/phpunit/tests/formatting/Smilies.php diff --git a/tests/tests/formatting/StripSlashesDeep.php b/tests/phpunit/tests/formatting/StripSlashesDeep.php similarity index 100% rename from tests/tests/formatting/StripSlashesDeep.php rename to tests/phpunit/tests/formatting/StripSlashesDeep.php diff --git a/tests/tests/formatting/UrlEncodedToEntities.php b/tests/phpunit/tests/formatting/UrlEncodedToEntities.php similarity index 100% rename from tests/tests/formatting/UrlEncodedToEntities.php rename to tests/phpunit/tests/formatting/UrlEncodedToEntities.php diff --git a/tests/tests/formatting/Utf8UriEncode.php b/tests/phpunit/tests/formatting/Utf8UriEncode.php similarity index 100% rename from tests/tests/formatting/Utf8UriEncode.php rename to tests/phpunit/tests/formatting/Utf8UriEncode.php diff --git a/tests/tests/formatting/WPSpecialchars.php b/tests/phpunit/tests/formatting/WPSpecialchars.php similarity index 100% rename from tests/tests/formatting/WPSpecialchars.php rename to tests/phpunit/tests/formatting/WPSpecialchars.php diff --git a/tests/tests/formatting/WPTexturize.php b/tests/phpunit/tests/formatting/WPTexturize.php similarity index 100% rename from tests/tests/formatting/WPTexturize.php rename to tests/phpunit/tests/formatting/WPTexturize.php diff --git a/tests/tests/formatting/WPTrimWords.php b/tests/phpunit/tests/formatting/WPTrimWords.php similarity index 100% rename from tests/tests/formatting/WPTrimWords.php rename to tests/phpunit/tests/formatting/WPTrimWords.php diff --git a/tests/tests/formatting/WpHtmlEditPre.php b/tests/phpunit/tests/formatting/WpHtmlEditPre.php similarity index 100% rename from tests/tests/formatting/WpHtmlEditPre.php rename to tests/phpunit/tests/formatting/WpHtmlEditPre.php diff --git a/tests/tests/formatting/WpRichEditPre.php b/tests/phpunit/tests/formatting/WpRichEditPre.php similarity index 100% rename from tests/tests/formatting/WpRichEditPre.php rename to tests/phpunit/tests/formatting/WpRichEditPre.php diff --git a/tests/tests/formatting/Zeroise.php b/tests/phpunit/tests/formatting/Zeroise.php similarity index 100% rename from tests/tests/formatting/Zeroise.php rename to tests/phpunit/tests/formatting/Zeroise.php diff --git a/tests/tests/formatting/balanceTags.php b/tests/phpunit/tests/formatting/balanceTags.php similarity index 100% rename from tests/tests/formatting/balanceTags.php rename to tests/phpunit/tests/formatting/balanceTags.php diff --git a/tests/tests/formatting/date.php b/tests/phpunit/tests/formatting/date.php similarity index 100% rename from tests/tests/formatting/date.php rename to tests/phpunit/tests/formatting/date.php diff --git a/tests/tests/formatting/ent2ncr.php b/tests/phpunit/tests/formatting/ent2ncr.php similarity index 100% rename from tests/tests/formatting/ent2ncr.php rename to tests/phpunit/tests/formatting/ent2ncr.php diff --git a/tests/tests/formatting/isoDescrambler.php b/tests/phpunit/tests/formatting/isoDescrambler.php similarity index 100% rename from tests/tests/formatting/isoDescrambler.php rename to tests/phpunit/tests/formatting/isoDescrambler.php diff --git a/tests/tests/formatting/redirect.php b/tests/phpunit/tests/formatting/redirect.php similarity index 100% rename from tests/tests/formatting/redirect.php rename to tests/phpunit/tests/formatting/redirect.php diff --git a/tests/tests/formatting/wp_basename.php b/tests/phpunit/tests/formatting/wp_basename.php similarity index 100% rename from tests/tests/formatting/wp_basename.php rename to tests/phpunit/tests/formatting/wp_basename.php diff --git a/tests/tests/functions.php b/tests/phpunit/tests/functions.php similarity index 100% rename from tests/tests/functions.php rename to tests/phpunit/tests/functions.php diff --git a/tests/tests/functions/deprecated.php b/tests/phpunit/tests/functions/deprecated.php similarity index 100% rename from tests/tests/functions/deprecated.php rename to tests/phpunit/tests/functions/deprecated.php diff --git a/tests/tests/functions/listFilter.php b/tests/phpunit/tests/functions/listFilter.php similarity index 100% rename from tests/tests/functions/listFilter.php rename to tests/phpunit/tests/functions/listFilter.php diff --git a/tests/tests/general/archives.php b/tests/phpunit/tests/general/archives.php similarity index 100% rename from tests/tests/general/archives.php rename to tests/phpunit/tests/general/archives.php diff --git a/tests/tests/http/base.php b/tests/phpunit/tests/http/base.php similarity index 100% rename from tests/tests/http/base.php rename to tests/phpunit/tests/http/base.php diff --git a/tests/tests/http/curl.php b/tests/phpunit/tests/http/curl.php similarity index 100% rename from tests/tests/http/curl.php rename to tests/phpunit/tests/http/curl.php diff --git a/tests/tests/http/fsockopen.php b/tests/phpunit/tests/http/fsockopen.php similarity index 100% rename from tests/tests/http/fsockopen.php rename to tests/phpunit/tests/http/fsockopen.php diff --git a/tests/tests/http/functions.php b/tests/phpunit/tests/http/functions.php similarity index 100% rename from tests/tests/http/functions.php rename to tests/phpunit/tests/http/functions.php diff --git a/tests/tests/http/http.php b/tests/phpunit/tests/http/http.php similarity index 100% rename from tests/tests/http/http.php rename to tests/phpunit/tests/http/http.php diff --git a/tests/tests/http/streams.php b/tests/phpunit/tests/http/streams.php similarity index 100% rename from tests/tests/http/streams.php rename to tests/phpunit/tests/http/streams.php diff --git a/tests/tests/image/base.php b/tests/phpunit/tests/image/base.php similarity index 100% rename from tests/tests/image/base.php rename to tests/phpunit/tests/image/base.php diff --git a/tests/tests/image/dimensions.php b/tests/phpunit/tests/image/dimensions.php similarity index 100% rename from tests/tests/image/dimensions.php rename to tests/phpunit/tests/image/dimensions.php diff --git a/tests/tests/image/editor.php b/tests/phpunit/tests/image/editor.php similarity index 100% rename from tests/tests/image/editor.php rename to tests/phpunit/tests/image/editor.php diff --git a/tests/tests/image/editor_gd.php b/tests/phpunit/tests/image/editor_gd.php similarity index 100% rename from tests/tests/image/editor_gd.php rename to tests/phpunit/tests/image/editor_gd.php diff --git a/tests/tests/image/editor_imagick.php b/tests/phpunit/tests/image/editor_imagick.php similarity index 100% rename from tests/tests/image/editor_imagick.php rename to tests/phpunit/tests/image/editor_imagick.php diff --git a/tests/tests/image/functions.php b/tests/phpunit/tests/image/functions.php similarity index 100% rename from tests/tests/image/functions.php rename to tests/phpunit/tests/image/functions.php diff --git a/tests/tests/image/intermediate_size.php b/tests/phpunit/tests/image/intermediate_size.php similarity index 100% rename from tests/tests/image/intermediate_size.php rename to tests/phpunit/tests/image/intermediate_size.php diff --git a/tests/tests/image/meta.php b/tests/phpunit/tests/image/meta.php similarity index 100% rename from tests/tests/image/meta.php rename to tests/phpunit/tests/image/meta.php diff --git a/tests/tests/image/resize.php b/tests/phpunit/tests/image/resize.php similarity index 100% rename from tests/tests/image/resize.php rename to tests/phpunit/tests/image/resize.php diff --git a/tests/tests/image/resize_gd.php b/tests/phpunit/tests/image/resize_gd.php similarity index 100% rename from tests/tests/image/resize_gd.php rename to tests/phpunit/tests/image/resize_gd.php diff --git a/tests/tests/image/resize_imagick.php b/tests/phpunit/tests/image/resize_imagick.php similarity index 100% rename from tests/tests/image/resize_imagick.php rename to tests/phpunit/tests/image/resize_imagick.php diff --git a/tests/tests/image/size.php b/tests/phpunit/tests/image/size.php similarity index 100% rename from tests/tests/image/size.php rename to tests/phpunit/tests/image/size.php diff --git a/tests/tests/import/base.php b/tests/phpunit/tests/import/base.php similarity index 100% rename from tests/tests/import/base.php rename to tests/phpunit/tests/import/base.php diff --git a/tests/tests/import/import.php b/tests/phpunit/tests/import/import.php similarity index 100% rename from tests/tests/import/import.php rename to tests/phpunit/tests/import/import.php diff --git a/tests/tests/import/parser.php b/tests/phpunit/tests/import/parser.php similarity index 100% rename from tests/tests/import/parser.php rename to tests/phpunit/tests/import/parser.php diff --git a/tests/tests/import/postmeta.php b/tests/phpunit/tests/import/postmeta.php similarity index 100% rename from tests/tests/import/postmeta.php rename to tests/phpunit/tests/import/postmeta.php diff --git a/tests/tests/includes/factory.php b/tests/phpunit/tests/includes/factory.php similarity index 100% rename from tests/tests/includes/factory.php rename to tests/phpunit/tests/includes/factory.php diff --git a/tests/tests/iterators.php b/tests/phpunit/tests/iterators.php similarity index 100% rename from tests/tests/iterators.php rename to tests/phpunit/tests/iterators.php diff --git a/tests/tests/kses.php b/tests/phpunit/tests/kses.php similarity index 100% rename from tests/tests/kses.php rename to tests/phpunit/tests/kses.php diff --git a/tests/tests/l10n.php b/tests/phpunit/tests/l10n.php similarity index 100% rename from tests/tests/l10n.php rename to tests/phpunit/tests/l10n.php diff --git a/tests/tests/link.php b/tests/phpunit/tests/link.php similarity index 100% rename from tests/tests/link.php rename to tests/phpunit/tests/link.php diff --git a/tests/tests/mail.php b/tests/phpunit/tests/mail.php similarity index 100% rename from tests/tests/mail.php rename to tests/phpunit/tests/mail.php diff --git a/tests/tests/media.php b/tests/phpunit/tests/media.php similarity index 100% rename from tests/tests/media.php rename to tests/phpunit/tests/media.php diff --git a/tests/tests/meta.php b/tests/phpunit/tests/meta.php similarity index 100% rename from tests/tests/meta.php rename to tests/phpunit/tests/meta.php diff --git a/tests/tests/meta/query.php b/tests/phpunit/tests/meta/query.php similarity index 100% rename from tests/tests/meta/query.php rename to tests/phpunit/tests/meta/query.php diff --git a/tests/tests/meta/slashes.php b/tests/phpunit/tests/meta/slashes.php similarity index 100% rename from tests/tests/meta/slashes.php rename to tests/phpunit/tests/meta/slashes.php diff --git a/tests/tests/ms.php b/tests/phpunit/tests/ms.php similarity index 100% rename from tests/tests/ms.php rename to tests/phpunit/tests/ms.php diff --git a/tests/tests/option/blogOption.php b/tests/phpunit/tests/option/blogOption.php similarity index 100% rename from tests/tests/option/blogOption.php rename to tests/phpunit/tests/option/blogOption.php diff --git a/tests/tests/option/option.php b/tests/phpunit/tests/option/option.php similarity index 100% rename from tests/tests/option/option.php rename to tests/phpunit/tests/option/option.php diff --git a/tests/tests/option/siteOption.php b/tests/phpunit/tests/option/siteOption.php similarity index 100% rename from tests/tests/option/siteOption.php rename to tests/phpunit/tests/option/siteOption.php diff --git a/tests/tests/option/siteTransient.php b/tests/phpunit/tests/option/siteTransient.php similarity index 100% rename from tests/tests/option/siteTransient.php rename to tests/phpunit/tests/option/siteTransient.php diff --git a/tests/tests/option/slashes.php b/tests/phpunit/tests/option/slashes.php similarity index 100% rename from tests/tests/option/slashes.php rename to tests/phpunit/tests/option/slashes.php diff --git a/tests/tests/option/transient.php b/tests/phpunit/tests/option/transient.php similarity index 100% rename from tests/tests/option/transient.php rename to tests/phpunit/tests/option/transient.php diff --git a/tests/tests/pomo/mo.php b/tests/phpunit/tests/pomo/mo.php similarity index 100% rename from tests/tests/pomo/mo.php rename to tests/phpunit/tests/pomo/mo.php diff --git a/tests/tests/pomo/noopTranslations.php b/tests/phpunit/tests/pomo/noopTranslations.php similarity index 100% rename from tests/tests/pomo/noopTranslations.php rename to tests/phpunit/tests/pomo/noopTranslations.php diff --git a/tests/tests/pomo/po.php b/tests/phpunit/tests/pomo/po.php similarity index 100% rename from tests/tests/pomo/po.php rename to tests/phpunit/tests/pomo/po.php diff --git a/tests/tests/pomo/translationEntry.php b/tests/phpunit/tests/pomo/translationEntry.php similarity index 100% rename from tests/tests/pomo/translationEntry.php rename to tests/phpunit/tests/pomo/translationEntry.php diff --git a/tests/tests/pomo/translations.php b/tests/phpunit/tests/pomo/translations.php similarity index 100% rename from tests/tests/pomo/translations.php rename to tests/phpunit/tests/pomo/translations.php diff --git a/tests/tests/post.php b/tests/phpunit/tests/post.php similarity index 100% rename from tests/tests/post.php rename to tests/phpunit/tests/post.php diff --git a/tests/tests/post/attachments.php b/tests/phpunit/tests/post/attachments.php similarity index 100% rename from tests/tests/post/attachments.php rename to tests/phpunit/tests/post/attachments.php diff --git a/tests/tests/post/filtering.php b/tests/phpunit/tests/post/filtering.php similarity index 100% rename from tests/tests/post/filtering.php rename to tests/phpunit/tests/post/filtering.php diff --git a/tests/tests/post/formats.php b/tests/phpunit/tests/post/formats.php similarity index 100% rename from tests/tests/post/formats.php rename to tests/phpunit/tests/post/formats.php diff --git a/tests/tests/post/gallery.php b/tests/phpunit/tests/post/gallery.php similarity index 100% rename from tests/tests/post/gallery.php rename to tests/phpunit/tests/post/gallery.php diff --git a/tests/tests/post/getPages.php b/tests/phpunit/tests/post/getPages.php similarity index 100% rename from tests/tests/post/getPages.php rename to tests/phpunit/tests/post/getPages.php diff --git a/tests/tests/post/meta.php b/tests/phpunit/tests/post/meta.php similarity index 100% rename from tests/tests/post/meta.php rename to tests/phpunit/tests/post/meta.php diff --git a/tests/tests/post/nav-menu.php b/tests/phpunit/tests/post/nav-menu.php similarity index 100% rename from tests/tests/post/nav-menu.php rename to tests/phpunit/tests/post/nav-menu.php diff --git a/tests/tests/post/objects.php b/tests/phpunit/tests/post/objects.php similarity index 100% rename from tests/tests/post/objects.php rename to tests/phpunit/tests/post/objects.php diff --git a/tests/tests/post/output.php b/tests/phpunit/tests/post/output.php similarity index 100% rename from tests/tests/post/output.php rename to tests/phpunit/tests/post/output.php diff --git a/tests/tests/post/query.php b/tests/phpunit/tests/post/query.php similarity index 100% rename from tests/tests/post/query.php rename to tests/phpunit/tests/post/query.php diff --git a/tests/tests/post/revisions.php b/tests/phpunit/tests/post/revisions.php similarity index 100% rename from tests/tests/post/revisions.php rename to tests/phpunit/tests/post/revisions.php diff --git a/tests/tests/post/slashes.php b/tests/phpunit/tests/post/slashes.php similarity index 100% rename from tests/tests/post/slashes.php rename to tests/phpunit/tests/post/slashes.php diff --git a/tests/tests/post/types.php b/tests/phpunit/tests/post/types.php similarity index 100% rename from tests/tests/post/types.php rename to tests/phpunit/tests/post/types.php diff --git a/tests/tests/query.php b/tests/phpunit/tests/query.php similarity index 100% rename from tests/tests/query.php rename to tests/phpunit/tests/query.php diff --git a/tests/tests/query/conditionals.php b/tests/phpunit/tests/query/conditionals.php similarity index 100% rename from tests/tests/query/conditionals.php rename to tests/phpunit/tests/query/conditionals.php diff --git a/tests/tests/query/date.php b/tests/phpunit/tests/query/date.php similarity index 100% rename from tests/tests/query/date.php rename to tests/phpunit/tests/query/date.php diff --git a/tests/tests/query/dateQuery.php b/tests/phpunit/tests/query/dateQuery.php similarity index 100% rename from tests/tests/query/dateQuery.php rename to tests/phpunit/tests/query/dateQuery.php diff --git a/tests/tests/query/results.php b/tests/phpunit/tests/query/results.php similarity index 100% rename from tests/tests/query/results.php rename to tests/phpunit/tests/query/results.php diff --git a/tests/tests/query/verboseRewriteRules.php b/tests/phpunit/tests/query/verboseRewriteRules.php similarity index 100% rename from tests/tests/query/verboseRewriteRules.php rename to tests/phpunit/tests/query/verboseRewriteRules.php diff --git a/tests/tests/shortcode.php b/tests/phpunit/tests/shortcode.php similarity index 100% rename from tests/tests/shortcode.php rename to tests/phpunit/tests/shortcode.php diff --git a/tests/tests/taxonomy.php b/tests/phpunit/tests/taxonomy.php similarity index 100% rename from tests/tests/taxonomy.php rename to tests/phpunit/tests/taxonomy.php diff --git a/tests/tests/term.php b/tests/phpunit/tests/term.php similarity index 100% rename from tests/tests/term.php rename to tests/phpunit/tests/term.php diff --git a/tests/tests/term/getTerms.php b/tests/phpunit/tests/term/getTerms.php similarity index 100% rename from tests/tests/term/getTerms.php rename to tests/phpunit/tests/term/getTerms.php diff --git a/tests/tests/term/slashes.php b/tests/phpunit/tests/term/slashes.php similarity index 100% rename from tests/tests/term/slashes.php rename to tests/phpunit/tests/term/slashes.php diff --git a/tests/tests/theme.php b/tests/phpunit/tests/theme.php similarity index 100% rename from tests/tests/theme.php rename to tests/phpunit/tests/theme.php diff --git a/tests/tests/theme/WPTheme.php b/tests/phpunit/tests/theme/WPTheme.php similarity index 100% rename from tests/tests/theme/WPTheme.php rename to tests/phpunit/tests/theme/WPTheme.php diff --git a/tests/tests/theme/support.php b/tests/phpunit/tests/theme/support.php similarity index 100% rename from tests/tests/theme/support.php rename to tests/phpunit/tests/theme/support.php diff --git a/tests/tests/theme/themeDir.php b/tests/phpunit/tests/theme/themeDir.php similarity index 100% rename from tests/tests/theme/themeDir.php rename to tests/phpunit/tests/theme/themeDir.php diff --git a/tests/tests/upload.php b/tests/phpunit/tests/upload.php similarity index 100% rename from tests/tests/upload.php rename to tests/phpunit/tests/upload.php diff --git a/tests/tests/url.php b/tests/phpunit/tests/url.php similarity index 100% rename from tests/tests/url.php rename to tests/phpunit/tests/url.php diff --git a/tests/tests/user.php b/tests/phpunit/tests/user.php similarity index 100% rename from tests/tests/user.php rename to tests/phpunit/tests/user.php diff --git a/tests/tests/user/author.php b/tests/phpunit/tests/user/author.php similarity index 100% rename from tests/tests/user/author.php rename to tests/phpunit/tests/user/author.php diff --git a/tests/tests/user/capabilities.php b/tests/phpunit/tests/user/capabilities.php similarity index 100% rename from tests/tests/user/capabilities.php rename to tests/phpunit/tests/user/capabilities.php diff --git a/tests/tests/user/mapMetaCap.php b/tests/phpunit/tests/user/mapMetaCap.php similarity index 100% rename from tests/tests/user/mapMetaCap.php rename to tests/phpunit/tests/user/mapMetaCap.php diff --git a/tests/tests/user/query.php b/tests/phpunit/tests/user/query.php similarity index 100% rename from tests/tests/user/query.php rename to tests/phpunit/tests/user/query.php diff --git a/tests/tests/user/slashes.php b/tests/phpunit/tests/user/slashes.php similarity index 100% rename from tests/tests/user/slashes.php rename to tests/phpunit/tests/user/slashes.php diff --git a/tests/tests/widgets.php b/tests/phpunit/tests/widgets.php similarity index 100% rename from tests/tests/widgets.php rename to tests/phpunit/tests/widgets.php diff --git a/tests/tests/xmlrpc/basic.php b/tests/phpunit/tests/xmlrpc/basic.php similarity index 100% rename from tests/tests/xmlrpc/basic.php rename to tests/phpunit/tests/xmlrpc/basic.php diff --git a/tests/tests/xmlrpc/mt/getRecentPostTitles.php b/tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php similarity index 100% rename from tests/tests/xmlrpc/mt/getRecentPostTitles.php rename to tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php diff --git a/tests/tests/xmlrpc/mw/editPost.php b/tests/phpunit/tests/xmlrpc/mw/editPost.php similarity index 100% rename from tests/tests/xmlrpc/mw/editPost.php rename to tests/phpunit/tests/xmlrpc/mw/editPost.php diff --git a/tests/tests/xmlrpc/mw/getPost.php b/tests/phpunit/tests/xmlrpc/mw/getPost.php similarity index 100% rename from tests/tests/xmlrpc/mw/getPost.php rename to tests/phpunit/tests/xmlrpc/mw/getPost.php diff --git a/tests/tests/xmlrpc/mw/getRecentPosts.php b/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php similarity index 100% rename from tests/tests/xmlrpc/mw/getRecentPosts.php rename to tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php diff --git a/tests/tests/xmlrpc/mw/newPost.php b/tests/phpunit/tests/xmlrpc/mw/newPost.php similarity index 100% rename from tests/tests/xmlrpc/mw/newPost.php rename to tests/phpunit/tests/xmlrpc/mw/newPost.php diff --git a/tests/tests/xmlrpc/wp/deletePost.php b/tests/phpunit/tests/xmlrpc/wp/deletePost.php similarity index 100% rename from tests/tests/xmlrpc/wp/deletePost.php rename to tests/phpunit/tests/xmlrpc/wp/deletePost.php diff --git a/tests/tests/xmlrpc/wp/deleteTerm.php b/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php similarity index 100% rename from tests/tests/xmlrpc/wp/deleteTerm.php rename to tests/phpunit/tests/xmlrpc/wp/deleteTerm.php diff --git a/tests/tests/xmlrpc/wp/editPost.php b/tests/phpunit/tests/xmlrpc/wp/editPost.php similarity index 100% rename from tests/tests/xmlrpc/wp/editPost.php rename to tests/phpunit/tests/xmlrpc/wp/editPost.php diff --git a/tests/tests/xmlrpc/wp/editProfile.php b/tests/phpunit/tests/xmlrpc/wp/editProfile.php similarity index 100% rename from tests/tests/xmlrpc/wp/editProfile.php rename to tests/phpunit/tests/xmlrpc/wp/editProfile.php diff --git a/tests/tests/xmlrpc/wp/editTerm.php b/tests/phpunit/tests/xmlrpc/wp/editTerm.php similarity index 100% rename from tests/tests/xmlrpc/wp/editTerm.php rename to tests/phpunit/tests/xmlrpc/wp/editTerm.php diff --git a/tests/tests/xmlrpc/wp/getComment.php b/tests/phpunit/tests/xmlrpc/wp/getComment.php similarity index 100% rename from tests/tests/xmlrpc/wp/getComment.php rename to tests/phpunit/tests/xmlrpc/wp/getComment.php diff --git a/tests/tests/xmlrpc/wp/getComments.php b/tests/phpunit/tests/xmlrpc/wp/getComments.php similarity index 100% rename from tests/tests/xmlrpc/wp/getComments.php rename to tests/phpunit/tests/xmlrpc/wp/getComments.php diff --git a/tests/tests/xmlrpc/wp/getMediaItem.php b/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php similarity index 100% rename from tests/tests/xmlrpc/wp/getMediaItem.php rename to tests/phpunit/tests/xmlrpc/wp/getMediaItem.php diff --git a/tests/tests/xmlrpc/wp/getOptions.php b/tests/phpunit/tests/xmlrpc/wp/getOptions.php similarity index 100% rename from tests/tests/xmlrpc/wp/getOptions.php rename to tests/phpunit/tests/xmlrpc/wp/getOptions.php diff --git a/tests/tests/xmlrpc/wp/getPage.php b/tests/phpunit/tests/xmlrpc/wp/getPage.php similarity index 100% rename from tests/tests/xmlrpc/wp/getPage.php rename to tests/phpunit/tests/xmlrpc/wp/getPage.php diff --git a/tests/tests/xmlrpc/wp/getPageList.php b/tests/phpunit/tests/xmlrpc/wp/getPageList.php similarity index 100% rename from tests/tests/xmlrpc/wp/getPageList.php rename to tests/phpunit/tests/xmlrpc/wp/getPageList.php diff --git a/tests/tests/xmlrpc/wp/getPages.php b/tests/phpunit/tests/xmlrpc/wp/getPages.php similarity index 100% rename from tests/tests/xmlrpc/wp/getPages.php rename to tests/phpunit/tests/xmlrpc/wp/getPages.php diff --git a/tests/tests/xmlrpc/wp/getPost.php b/tests/phpunit/tests/xmlrpc/wp/getPost.php similarity index 100% rename from tests/tests/xmlrpc/wp/getPost.php rename to tests/phpunit/tests/xmlrpc/wp/getPost.php diff --git a/tests/tests/xmlrpc/wp/getPostType.php b/tests/phpunit/tests/xmlrpc/wp/getPostType.php similarity index 100% rename from tests/tests/xmlrpc/wp/getPostType.php rename to tests/phpunit/tests/xmlrpc/wp/getPostType.php diff --git a/tests/tests/xmlrpc/wp/getPostTypes.php b/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php similarity index 100% rename from tests/tests/xmlrpc/wp/getPostTypes.php rename to tests/phpunit/tests/xmlrpc/wp/getPostTypes.php diff --git a/tests/tests/xmlrpc/wp/getPosts.php b/tests/phpunit/tests/xmlrpc/wp/getPosts.php similarity index 100% rename from tests/tests/xmlrpc/wp/getPosts.php rename to tests/phpunit/tests/xmlrpc/wp/getPosts.php diff --git a/tests/tests/xmlrpc/wp/getProfile.php b/tests/phpunit/tests/xmlrpc/wp/getProfile.php similarity index 100% rename from tests/tests/xmlrpc/wp/getProfile.php rename to tests/phpunit/tests/xmlrpc/wp/getProfile.php diff --git a/tests/tests/xmlrpc/wp/getRevisions.php b/tests/phpunit/tests/xmlrpc/wp/getRevisions.php similarity index 100% rename from tests/tests/xmlrpc/wp/getRevisions.php rename to tests/phpunit/tests/xmlrpc/wp/getRevisions.php diff --git a/tests/tests/xmlrpc/wp/getTaxonomies.php b/tests/phpunit/tests/xmlrpc/wp/getTaxonomies.php similarity index 100% rename from tests/tests/xmlrpc/wp/getTaxonomies.php rename to tests/phpunit/tests/xmlrpc/wp/getTaxonomies.php diff --git a/tests/tests/xmlrpc/wp/getTaxonomy.php b/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php similarity index 100% rename from tests/tests/xmlrpc/wp/getTaxonomy.php rename to tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php diff --git a/tests/tests/xmlrpc/wp/getTerm.php b/tests/phpunit/tests/xmlrpc/wp/getTerm.php similarity index 100% rename from tests/tests/xmlrpc/wp/getTerm.php rename to tests/phpunit/tests/xmlrpc/wp/getTerm.php diff --git a/tests/tests/xmlrpc/wp/getTerms.php b/tests/phpunit/tests/xmlrpc/wp/getTerms.php similarity index 100% rename from tests/tests/xmlrpc/wp/getTerms.php rename to tests/phpunit/tests/xmlrpc/wp/getTerms.php diff --git a/tests/tests/xmlrpc/wp/getUser.php b/tests/phpunit/tests/xmlrpc/wp/getUser.php similarity index 100% rename from tests/tests/xmlrpc/wp/getUser.php rename to tests/phpunit/tests/xmlrpc/wp/getUser.php diff --git a/tests/tests/xmlrpc/wp/getUsers.php b/tests/phpunit/tests/xmlrpc/wp/getUsers.php similarity index 100% rename from tests/tests/xmlrpc/wp/getUsers.php rename to tests/phpunit/tests/xmlrpc/wp/getUsers.php diff --git a/tests/tests/xmlrpc/wp/newPost.php b/tests/phpunit/tests/xmlrpc/wp/newPost.php similarity index 100% rename from tests/tests/xmlrpc/wp/newPost.php rename to tests/phpunit/tests/xmlrpc/wp/newPost.php diff --git a/tests/tests/xmlrpc/wp/newTerm.php b/tests/phpunit/tests/xmlrpc/wp/newTerm.php similarity index 100% rename from tests/tests/xmlrpc/wp/newTerm.php rename to tests/phpunit/tests/xmlrpc/wp/newTerm.php diff --git a/tests/tests/xmlrpc/wp/restoreRevision.php b/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php similarity index 100% rename from tests/tests/xmlrpc/wp/restoreRevision.php rename to tests/phpunit/tests/xmlrpc/wp/restoreRevision.php diff --git a/tests/tests/xmlrpc/wp/uploadFile.php b/tests/phpunit/tests/xmlrpc/wp/uploadFile.php similarity index 100% rename from tests/tests/xmlrpc/wp/uploadFile.php rename to tests/phpunit/tests/xmlrpc/wp/uploadFile.php diff --git a/tests/wp-mail-real-test.php b/tests/phpunit/wp-mail-real-test.php similarity index 100% rename from tests/wp-mail-real-test.php rename to tests/phpunit/wp-mail-real-test.php diff --git a/tests/wp-tests-config-sample.php b/wp-tests-config-sample.php similarity index 94% rename from tests/wp-tests-config-sample.php rename to wp-tests-config-sample.php index c1474c25f3..e6f0e1e1ed 100644 --- a/tests/wp-tests-config-sample.php +++ b/wp-tests-config-sample.php @@ -1,7 +1,7 @@