Index: wp-testcase/test_includes_theme.php
===================================================================
--- wp-testcase/test_includes_theme.php	(revision 422)
+++ wp-testcase/test_includes_theme.php	(working copy)
@@ -360,4 +360,80 @@
 		$this->assertLessThanOrEqual(261998, strlen(serialize($themes)));
 	}
 }
+
+class TestThemeSupport extends WPTestCase {
+	function setUp() {
+		parent::setUp();
+	}
+
+	function tearDown() {
+		parent::tearDown();
+	}
+
+	function test_the_basics() {
+		$this->assertFalse( current_theme_supports( 'automatic-feed-links' ) );
+		add_theme_support( 'automatic-feed-links' );
+		$this->assertTrue( current_theme_supports( 'automatic-feed-links' ) );
+		remove_theme_support( 'automatic-feed-links' );
+		$this->assertFalse( current_theme_supports( 'automatic-feed-links' ) );
+	}
+
+	function test_admin_bar() {
+		$this->assertFalse( current_theme_supports( 'admin-bar' ) );
+		add_theme_support( 'admin-bar' );
+		$this->assertTrue( current_theme_supports( 'admin-bar' ) );
+		remove_theme_support( 'admin-bar' );
+		$this->assertFalse( current_theme_supports( 'admin-bar' ) );
+
+		add_theme_support( 'admin-bar', array( 'callback' => '__return_false' ) );
+		$this->assertTrue( current_theme_supports( 'admin-bar' ) );
+
+		$this->assertEquals(
+			array( 0 => array( 'callback' => '__return_false' ) ),
+			get_theme_support( 'admin-bar' )
+		);
+		remove_theme_support( 'admin-bar' );
+		$this->assertFalse( current_theme_supports( 'admin-bar' ) );
+		$this->assertFalse( get_theme_support( 'admin-bar' ) );
+	}
+
+	function test_post_thumbnails() {
+		$this->assertFalse( current_theme_supports( 'post-thumbnails' ) );
+		add_theme_support( 'post-thumbnails' );
+		$this->assertTrue( current_theme_supports( 'post-thumbnails' ) );
+		remove_theme_support( 'post-thumbnails' );
+		$this->assertFalse( current_theme_supports( 'post-thumbnails' ) );
+
+		// simple array of post types.
+		add_theme_support( 'post-thumbnails', array( 'post', 'page' ) );
+		$this->assertTrue( current_theme_supports( 'post-thumbnails' ) );
+		$this->assertTrue( current_theme_supports( 'post-thumbnails', 'post' ) );
+		$this->assertFalse( current_theme_supports( 'post-thumbnails', 'book' ) );
+		remove_theme_support( 'post-thumbnails' );
+		$this->assertFalse( current_theme_supports( 'post-thumbnails' ) );
+
+		// array of arguments, with the key of 'types' holding the post types.
+		add_theme_support( 'post-thumbnails', array( 'types' => array( 'post', 'page' ) ) );
+		$this->assertTrue( current_theme_supports( 'post-thumbnails' ) );
+		$this->assertTrue( current_theme_supports( 'post-thumbnails', 'post' ) );
+		$this->assertFalse( current_theme_supports( 'post-thumbnails', 'book' ) );
+		remove_theme_support( 'post-thumbnails' );
+		$this->assertFalse( current_theme_supports( 'post-thumbnails' ) );
+
+		// array of arguments, with the key of 'types' holding the post types.
+		add_theme_support( 'post-thumbnails', array( 'types' => true ) );
+		$this->assertTrue( current_theme_supports( 'post-thumbnails' ) );
+		$this->assertTrue( current_theme_supports( 'post-thumbnails', rand_str() ) ); // any type
+		remove_theme_support( 'post-thumbnails' );
+		$this->assertFalse( current_theme_supports( 'post-thumbnails' ) );
+
+		// array of arguments, with some other argument, and no 'types' argument.
+		add_theme_support( 'post-thumbnails', array( rand_str() => rand_str() ) );
+		$this->assertTrue( current_theme_supports( 'post-thumbnails' ) );
+		$this->assertTrue( current_theme_supports( 'post-thumbnails', rand_str() ) ); // any type
+		remove_theme_support( 'post-thumbnails' );
+		$this->assertFalse( current_theme_supports( 'post-thumbnails' ) );
+
+	}
+}
 ?>