Index: wp-testcase/test_user.php
===================================================================
--- wp-testcase/test_user.php	(revision 654)
+++ wp-testcase/test_user.php	(working copy)
@@ -407,6 +407,60 @@
 		$this->assertFalse( $user->exists() );
 	}
 
+	function test_get_current_user() {
+		global $current_user;
+
+		$current = wp_get_current_user();
+
+		$id = $this->_make_user( 'administrator' );
+
+		wp_set_current_user( $id );
+		$user = wp_get_current_user();
+		$this->assertInstanceOf( 'WP_User', $user );
+		$this->assertEquals( $id, $user->ID );
+
+		$current_user = 12345;
+		$user = wp_get_current_user();
+		$this->assertInstanceOf( 'WP_User', $user );
+		$this->assertEquals( 0, $user->ID );
+
+		$current_user = new WP_Error( 'oops' );
+		$user = wp_get_current_user();
+		$this->assertInstanceOf( 'WP_User', $user );
+		$this->assertEquals( 0, $user->ID );
+
+		wp_set_current_user( $id );
+		$user = wp_get_current_user();
+		$this->assertInstanceOf( 'WP_User', $user );
+		$this->assertEquals( $id, $user->ID );
+
+		wp_set_current_user( $current->ID );
+	}
+
+	function test_set_current_user() {
+		global $current_user;
+
+		$current = wp_get_current_user();
+
+		$id = $this->_make_user( 'administrator' );
+
+		wp_set_current_user( $id );
+		$user = wp_get_current_user();
+		$this->assertInstanceOf( 'WP_User', $user );
+		$this->assertEquals( $id, $user->ID );
+
+		$user = wp_set_current_user( 123456789 );
+		$this->assertInstanceOf( 'WP_User', $user );
+		$this->assertEquals( 0, $user->ID );
+
+		$current_user = new stdClass;
+		$current_user->ID = $id;
+		$user = wp_set_current_user( $id );
+		$this->assertInstanceOf( 'WP_User', $user );
+		$this->assertEquals( $id, $user->ID );
+
+		wp_set_current_user( $current->ID );
+	}
 }
 
 ?>