Changeset 25165

Timestamp:

08/29/2013 06:39:34 PM (11 years ago)

Author:

nacin

Message:

Move PHPUnit tests into a tests/phpunit directory.

wp-tests-config.php can/should reside in the root of a develop checkout. phpunit should be run from the root.

see #25088.

Location:

trunk

Files:

• phpunit.xml.dist (moved) (moved from trunk/tests/phpunit.xml.dist) (3 diffs)
• tests/phpunit (added)
• tests/phpunit/README.txt (moved) (moved from trunk/tests/README.txt)
• tests/phpunit/build.xml (moved) (moved from trunk/tests/build.xml)
• tests/phpunit/data (moved) (moved from trunk/tests/data)
• tests/phpunit/includes (moved) (moved from trunk/tests/includes)
• tests/phpunit/includes/bootstrap.php (modified) (1 diff)
• tests/phpunit/multisite.xml (moved) (moved from trunk/tests/multisite.xml)
• tests/phpunit/tests (moved) (moved from trunk/tests/tests)
• tests/phpunit/wp-mail-real-test.php (moved) (moved from trunk/tests/wp-mail-real-test.php)
• wp-tests-config-sample.php (moved) (moved from trunk/tests/wp-tests-config-sample.php) (1 diff)

trunk/phpunit.xml.dist

@@ -1 +1 @@
 <phpunit
-    bootstrap="includes/bootstrap.php"
+    bootstrap="tests/phpunit/includes/bootstrap.php"
         backupGlobals="false"
         colors="true"
@@ -7 +7 @@
         <!-- Default test suite to run all tests -->
         <testsuite>
-            <directory suffix=".php">tests</directory>
-            <exclude>tests/actions/closures.php</exclude>
-            <exclude>tests/image/editor.php</exclude>
-            <exclude>tests/image/editor_gd.php</exclude>
-            <exclude>tests/image/editor_imagick.php</exclude>
-            <file phpVersion="5.3.0">tests/actions/closures.php</file>
-            <file phpVersion="5.3.0">tests/image/editor.php</file>
-            <file phpVersion="5.3.0">tests/image/editor_gd.php</file>
-            <file phpVersion="5.3.0">tests/image/editor_imagick.php</file>
+            <directory suffix=".php">tests/phpunit/tests</directory>
+            <exclude>tests/phpunit/tests/actions/closures.php</exclude>
+            <exclude>tests/phpunit/tests/image/editor.php</exclude>
+            <exclude>tests/phpunit/tests/image/editor_gd.php</exclude>
+            <exclude>tests/phpunit/tests/image/editor_imagick.php</exclude>
+            <file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
+            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
+            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_gd.php</file>
+            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_imagick.php</file>
         </testsuite>
     </testsuites>
@@ -24 +24 @@
     </groups>
     <logging>
-        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+        <log type="junit" target="tests/phpunit/build/logs/junit.xml" logIncompleteSkipped="false"/>
     </logging>
 </phpunit>

trunk/tests/phpunit/includes/bootstrap.php

@@ -5 +5 @@
 
 
-$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;
 

trunk/wp-tests-config-sample.php

@@ -2 +2 @@
 
 /* Path to the WordPress codebase you'd like to test. Add a backslash in the end. */
-define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/src/' );
+define( 'ABSPATH', dirname( __FILE__ ) . '/src/' );
 
 // Test with multisite enabled: (previously -m)