Changeset 69 in tests

Timestamp:

11/02/2007 06:29:11 AM (19 years ago)

Author:

tellyworth

Message:

stop globals from polluting wp_query

File:

• wp-testlib/base.php (modified) (3 diffs)

wp-testlib/base.php

@@ -95 +95 @@
                 #$this->_q_ts = microtime(true);
                 #add_filter('query', array(&$this, '_query_filter'));
-                define('SAVEQUERIES', true);
+                #define('SAVEQUERIES', true);
                 global $wpdb;
                 $wpdb->queries = array();
@@ -134 +134 @@
                 }
 
-                #query_posts($req);
                 $_SERVER['REQUEST_URI'] = $req;
+                unset($_SERVER['PATH_INFO']);
                 $GLOBALS['wp'] =& new WP();
+                
+                // clean out globals to stop them polluting wp and wp_query
+                foreach ($GLOBALS['wp']->public_query_vars as $v)
+                        unset($GLOBALS[$v]);
+                foreach ($GLOBALS['wp']->private_query_vars as $v)
+                        unset($GLOBALS[$v]);
+
                 $GLOBALS['wp']->main($parts['query']);
         }
@@ -282 +289 @@
 }
 
-function wptest_run_tests($classes) {
+function wptest_run_tests($classes, $classname='') {
         $suite = new PHPUnit_Framework_TestSuite();
         foreach ($classes as $testcase)
-                $suite->addTestSuite($testcase);
+                if (!$classname or strtolower($testcase) == strtolower($classname)) {
+                        echo "Adding $testcase\n";
+                        $suite->addTestSuite($testcase);
+                }
 
         #return PHPUnit::run($suite);