Changeset 875 in tests

Timestamp:

07/03/2012 05:24:03 PM (13 years ago)

Author:

nacin

Message:

Rename the unit tests wp-config.php to wp-tests-config.php. Also:

• Rename wp-testdata to data
• Rename wp-testlib to includes
• Rename wp-testcase to tests
• Begin to remove files from the old test suite we no longer need to port code from

fixes #98. see #42.

Location:

trunk

Files:

• bin/install.php (modified) (1 diff)
• bootstrap.php (modified) (4 diffs)
• data (moved) (moved from trunk/wp-testdata)
• data/sample_blogs.php (deleted)
• includes (moved) (moved from trunk/wp-testlib)
• includes/base.php (deleted)
• includes/getopt.php (deleted)
• phpunit.xml (modified) (1 diff)
• tests (moved) (moved from trunk/wp-testcase)
• tests/test_http.php (modified) (2 diffs)
• tests/test_import_wp.php (modified) (1 diff)
• tests/test_includes_functions.php (modified) (1 diff)
• tests/test_post_output.php (modified) (2 diffs)
• wp-tests-config-sample.php (moved) (moved from trunk/wp-config-sample.php)
• wptest.sh (deleted)

trunk/bin/install.php

@@ -13 +13 @@
 define( 'WP_INSTALLING', true );
 require_once $config_file_path;
-require_once $config_dir . '/wp-testlib/functions.php';
+require_once $config_dir . '/includes/functions.php';
 
 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';

trunk/bootstrap.php

@@ -8 +8 @@
 require_once 'PHPUnit/Autoload.php';
 
-$config_file_path = dirname( __FILE__ ) . '/wp-config.php';
+$config_file_path = dirname( __FILE__ ) . '/wp-tests-config.php';
 
 /*
@@ -23 +23 @@
 require_once $config_file_path;
 
-define( 'DIR_TESTDATA', dirname( __FILE__ ) . '/wp-testdata' );
+define( 'DIR_TESTDATA', dirname( __FILE__ ) . '/data' );
 
 if ( ! defined( 'WP_TESTS_FORCE_KNOWN_BUGS' ) )
@@ -47 +47 @@
 }
 
-require dirname( __FILE__ ) . '/wp-testlib/functions.php';
+require dirname( __FILE__ ) . '/includes/functions.php';
 
 // Preset WordPress options defined in bootstrap file.
@@ -68 +68 @@
 _delete_all_posts();
 
-require dirname( __FILE__ ) . '/wp-testlib/testcase.php';
-require dirname( __FILE__ ) . '/wp-testlib/testcase-xmlrpc.php';
-require dirname( __FILE__ ) . '/wp-testlib/testcase-ajax.php';
-require dirname( __FILE__ ) . '/wp-testlib/exceptions.php';
-require dirname( __FILE__ ) . '/wp-testlib/utils.php';
+require dirname( __FILE__ ) . '/includes/testcase.php';
+require dirname( __FILE__ ) . '/includes/testcase-xmlrpc.php';
+require dirname( __FILE__ ) . '/includes/testcase-ajax.php';
+require dirname( __FILE__ ) . '/includes/exceptions.php';
+require dirname( __FILE__ ) . '/includes/utils.php';

trunk/phpunit.xml

@@ -7 +7 @@
         <!-- Default test suite to run all tests -->
         <testsuite>
-            <directory suffix=".php">wp-testcase</directory>
-            <file phpVersion="5.3.0" phpVersionOperator=">=">wp-testcase/test_actions_closures.php</file>
-            <exclude>wp-testcase/test_query_results.php</exclude>
+            <directory suffix=".php">tests</directory>
+            <file phpVersion="5.3.0">tests/test_actions_closures.php</file>
+            <exclude>tests/test_query_results.php</exclude>
         </testsuite>
     </testsuites>

trunk/tests/test_http.php

@@ -16 +16 @@
  */
 abstract class WP_HTTP_UnitTestCase extends WP_UnitTestCase {
-    // You can use your own version of wp-testdata/WPHTTP-testcase-redirection-script.php here.
+    // You can use your own version of data/WPHTTP-testcase-redirection-script.php here.
     var $redirection_script = 'http://api.wordpress.org/core/tests/1.0/redirection.php';
 
@@ -157 +157 @@
 
     function test_file_stream() {
-        $url = 'http://unit-tests.svn.wordpress.org/trunk/wp-testdata/images/2004-07-22-DSC_0007.jpg'; // we'll test against a file in the unit test data
+        $url = 'http://unit-tests.svn.wordpress.org/trunk/data/images/2004-07-22-DSC_0007.jpg'; // we'll test against a file in the unit test data
         $size = 87348;
         $res = wp_remote_request( $url, array( 'stream' => true, 'timeout' => 30 ) ); //Auto generate the filename.

trunk/tests/test_import_wp.php

@@ -1 +1 @@
 <?php
-
-#include_once(DIR_TESTROOT.'/wp-testlib/wp-profiler.php');
-
-// need to include the importer as an external, so path may need to change...
 
 abstract class WP_Import_UnitTestCase extends WP_UnitTestCase {

trunk/tests/test_includes_functions.php

@@ -99 +99 @@
     function test_wp_unique_filename() {
         /* this test requires:
-           - that you have dir + file 'wp-testdata/images/test-image.png',
+           - that you have dir + file 'data/images/test-image.png',
            - and that this dir is writeable
            - there is an image 'test-image.png' that will be used to test unique filenames

trunk/tests/test_post_output.php

@@ -141 +141 @@
         // permalink page
         $link = '/2008/04/01/simple-gallery-test/';
-        $this->http('/2008/04/01/simple-gallery-test/');
+        $this->go_to('/2008/04/01/simple-gallery-test/');
         the_post();
         // filtered output
@@ -217 +217 @@
 
         // permalink page
-        $this->http('/2008/04/01/simple-gallery-test/');
+        $this->go_to('/2008/04/01/simple-gallery-test/');
         the_post();
         // filtered output