Merge branch 'mw-1.26'

1 files changed, 38 insertions, 5 deletions

diff --git a/tests/phpunit/includes/FauxRequestTest.php b/tests/phpunit/includes/FauxRequestTest.php
index 745a5b42..07214b21 100644
--- a/tests/phpunit/includes/FauxRequestTest.php
+++ b/tests/phpunit/includes/FauxRequestTest.php
@@ -6,13 +6,46 @@ class FauxRequestTest extends MediaWikiTestCase {
 	 * @covers FauxRequest::getHeader
 	 */
 	public function testGetSetHeader() {
-		$value = 'test/test';
+		$value = 'text/plain, text/html';
 
 		$request = new FauxRequest();
-		$request->setHeader( 'Content-Type', $value );
+		$request->setHeader( 'Accept', $value );
 
-		$this->assertEquals( $request->getHeader( 'Content-Type' ), $value );
-		$this->assertEquals( $request->getHeader( 'CONTENT-TYPE' ), $value );
-		$this->assertEquals( $request->getHeader( 'content-type' ), $value );
+		$this->assertEquals( $request->getHeader( 'Nonexistent' ), false );
+		$this->assertEquals( $request->getHeader( 'Accept' ), $value );
+		$this->assertEquals( $request->getHeader( 'ACCEPT' ), $value );
+		$this->assertEquals( $request->getHeader( 'accept' ), $value );
+		$this->assertEquals(
+			$request->getHeader( 'Accept', WebRequest::GETHEADER_LIST ),
+			array( 'text/plain', 'text/html' )
+		);
+	}
+
+	/**
+	 * @covers FauxRequest::getAllHeaders
+	 */
+	public function testGetAllHeaders() {
+		$_SERVER['HTTP_TEST'] = 'Example';
+
+		$request = new FauxRequest();
+
+		$this->assertEquals(
+			array(),
+			$request->getAllHeaders()
+		);
+	}
+
+	/**
+	 * @covers FauxRequest::getHeader
+	 */
+	public function testGetHeader() {
+		$_SERVER['HTTP_TEST'] = 'Example';
+
+		$request = new FauxRequest();
+
+		$this->assertEquals(
+			false,
+			$request->getHeader( 'test' )
+		);
 	}
 }