Changeset 25362

Timestamp:

09/11/2013 09:32:14 PM (11 years ago)

Author:

wonderboymusic

Message:

Restore the test code for get_theme(), add the notice suppression filters, and fix the type in the remove_filter() call.

See #25282.

Location:

trunk/tests/phpunit/tests

Files:

• admin/includesTheme.php (modified) (2 diffs)
• theme.php (modified) (1 diff)

trunk/tests/phpunit/tests/admin/includesTheme.php

@@ -18 +18 @@
         wp_clean_themes_cache();
         unset( $GLOBALS['wp_themes'] );
+        
+        add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
+    }
+
+    function deprecated_function_run_check( $function ) {
+        if ( in_array( $function, array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme' ) ) )
+            add_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
+    }
+
+    function filter_deprecated_function_trigger_error() {
+        remove_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
+        return false;
     }
 
@@ -41 +53 @@
      */
     function test_page_templates() {
+        $theme = get_theme( 'Page Template Theme' );
+        $this->assertNotEmpty( $theme );
+
+        switch_theme( $theme['Template'], $theme['Stylesheet'] );
+
+        $templates = get_page_templates();
+        $this->assertCount( 3, $templates );
+        $this->assertEquals( "template-top-level.php", $templates['Top Level'] );
+        $this->assertEquals( "subdir/template-sub-dir.php", $templates['Sub Dir'] );
+        $this->assertEquals( "template-header.php", $templates['This Template Header Is On One Line'] );
+
         $theme = wp_get_theme( 'page-templates' );
         $this->assertNotEmpty( $theme );

trunk/tests/phpunit/tests/theme.php

@@ -26 +26 @@
 
     function filter_deprecated_function_trigger_error() {
-        remove_filter( 'filter_deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
+        remove_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
         return false;
     }