1 files changed, 112 insertions, 56 deletions
diff --git a/tests/phpunit/includes/HooksTest.php b/tests/phpunit/includes/HooksTest.php
index 2f9d9f8d..81dd4870 100644
--- a/tests/phpunit/includes/HooksTest.php
+++ b/tests/phpunit/includes/HooksTest.php
@@ -2,101 +2,157 @@
 
 class HooksTest extends MediaWikiTestCase {
 
-	public function testOldStyleHooks() {
-		$foo = 'Foo';
-		$bar = 'Bar';
-
-		$i = new NothingClass();
-
+	function setUp() {
 		global $wgHooks;
+		parent::setUp();
+		Hooks::clear( 'MediaWikiHooksTest001' );
+		unset( $wgHooks['MediaWikiHooksTest001'] );
+	}
 
-		$wgHooks['MediaWikiHooksTest001'][] = array( $i, 'someNonStatic' );
-
-		wfRunHooks( 'MediaWikiHooksTest001', array( &$foo, &$bar ) );
-
-		$this->assertEquals( 'fOO', $foo, 'Standard method' );
-		$foo = 'Foo';
-
-		$wgHooks['MediaWikiHooksTest001'][] = $i;
-
-		wfRunHooks( 'MediaWikiHooksTest001', array( &$foo, &$bar ) );
+	public static function provideHooks() {
+		$i = new NothingClass();
 
-		$this->assertEquals( 'foo', $foo, 'onEventName style' );
-		$foo = 'Foo';
+		return array(
+			array( 'Object and method', array( $i, 'someNonStatic' ), 'changed-nonstatic', 'changed-nonstatic' ),
+			array( 'Object and no method', array( $i ), 'changed-onevent', 'original' ),
+			array( 'Object and method with data', array( $i, 'someNonStaticWithData', 'data' ), 'data', 'original' ),
+			array( 'Object and static method', array( $i, 'someStatic' ), 'changed-static', 'original' ),
+			array( 'Class::method static call', array( 'NothingClass::someStatic' ), 'changed-static', 'original' ),
+			array( 'Global function', array( 'NothingFunction' ), 'changed-func', 'original' ),
+			array( 'Global function with data', array( 'NothingFunctionData', 'data' ), 'data', 'original' ),
+			array( 'Closure', array( function ( &$foo, $bar ) {
+				$foo = 'changed-closure';
+
+				return true;
+			} ), 'changed-closure', 'original' ),
+			array( 'Closure with data', array( function ( $data, &$foo, $bar ) {
+				$foo = $data;
+
+				return true;
+			}, 'data' ), 'data', 'original' )
+		);
+	}
 
-		$wgHooks['MediaWikiHooksTest001'][] = array( $i, 'someNonStaticWithData', 'baz' );
+	/**
+	 * @dataProvider provideHooks
+	 */
+	public function testOldStyleHooks( $msg, array $hook, $expectedFoo, $expectedBar ) {
+		global $wgHooks;
+		$foo = $bar = 'original';
 
+		$wgHooks['MediaWikiHooksTest001'][] = $hook;
 		wfRunHooks( 'MediaWikiHooksTest001', array( &$foo, &$bar ) );
 
-		$this->assertEquals( 'baz', $foo, 'Data included' );
-		$foo = 'Foo';
-
-		$wgHooks['MediaWikiHooksTest001'][] = array( $i, 'someStatic' );
-
-		wfRunHooks( 'MediaWikiHooksTest001', array( &$foo, &$bar ) );
+		$this->assertSame( $expectedFoo, $foo, $msg );
+		$this->assertSame( $expectedBar, $bar, $msg );
+	}
 
-		$this->assertEquals( 'bah', $foo, 'Standard static method' );
-		//$foo = 'Foo';
+	/**
+	 * @dataProvider provideHooks
+	 */
+	public function testNewStyleHooks( $msg, $hook, $expectedFoo, $expectedBar ) {
+		$foo = $bar = 'original';
 
-		unset( $wgHooks['MediaWikiHooksTest001'] );
+		Hooks::register( 'MediaWikiHooksTest001', $hook );
+		Hooks::run( 'MediaWikiHooksTest001', array( &$foo, &$bar ) );
 
+		$this->assertSame( $expectedFoo, $foo, $msg );
+		$this->assertSame( $expectedBar, $bar, $msg );
 	}
 
-	public function testNewStyleHooks() {
-		$foo = 'Foo';
-		$bar = 'Bar';
-
-		$i = new NothingClass();
+	public function testNewStyleHookInteraction() {
+		global $wgHooks;
 
-		Hooks::register( 'MediaWikiHooksTest001', array( $i, 'someNonStatic' ) );
+		$a = new NothingClass();
+		$b = new NothingClass();
 
-		Hooks::run( 'MediaWikiHooksTest001', array( &$foo, &$bar ) );
+		$wgHooks['MediaWikiHooksTest001'][] = $a;
+		$this->assertTrue( Hooks::isRegistered( 'MediaWikiHooksTest001' ), 'Hook registered via $wgHooks should be noticed by Hooks::isRegistered' );
 
-		$this->assertEquals( 'fOO', $foo, 'Standard method' );
-		$foo = 'Foo';
+		Hooks::register( 'MediaWikiHooksTest001', $b );
+		$this->assertEquals( 2, count( Hooks::getHandlers( 'MediaWikiHooksTest001' ) ), 'Hooks::getHandlers() should return hooks registered via wgHooks as well as Hooks::register' );
 
-		Hooks::register( 'MediaWikiHooksTest001', $i );
+		$foo = 'quux';
+		$bar = 'qaax';
 
 		Hooks::run( 'MediaWikiHooksTest001', array( &$foo, &$bar ) );
+		$this->assertEquals( 1, $a->calls, 'Hooks::run() should run hooks registered via wgHooks as well as Hooks::register' );
+		$this->assertEquals( 1, $b->calls, 'Hooks::run() should run hooks registered via wgHooks as well as Hooks::register' );
+	}
 
-		$this->assertEquals( 'foo', $foo, 'onEventName style' );
-		$foo = 'Foo';
+	/**
+	 * @expectedException MWException
+	 */
+	public function testUncallableFunction() {
+		Hooks::register( 'MediaWikiHooksTest001', 'ThisFunctionDoesntExist' );
+		Hooks::run( 'MediaWikiHooksTest001', array() );
+	}
 
-		Hooks::register( 'MediaWikiHooksTest001', array( $i, 'someNonStaticWithData', 'baz' ) );
+	public function testFalseReturn() {
+		Hooks::register( 'MediaWikiHooksTest001', function ( &$foo ) {
+			return false;
+		} );
+		Hooks::register( 'MediaWikiHooksTest001', function ( &$foo ) {
+			$foo = 'test';
+
+			return true;
+		} );
+		$foo = 'original';
+		Hooks::run( 'MediaWikiHooksTest001', array( &$foo ) );
+		$this->assertSame( 'original', $foo, 'Hooks continued processing after a false return.' );
+	}
 
-		Hooks::run( 'MediaWikiHooksTest001', array( &$foo, &$bar ) );
+	/**
+	 * @expectedException FatalError
+	 */
+	public function testFatalError() {
+		Hooks::register( 'MediaWikiHooksTest001', function () {
+			return 'test';
+		} );
+		Hooks::run( 'MediaWikiHooksTest001', array() );
+	}
+}
 
-		$this->assertEquals( 'baz', $foo, 'Data included' );
-		$foo = 'Foo';
+function NothingFunction( &$foo, &$bar ) {
+	$foo = 'changed-func';
 
-		Hooks::register( 'MediaWikiHooksTest001', array( $i, 'someStatic' ) );
+	return true;
+}
 
-		Hooks::run( 'MediaWikiHooksTest001', array( &$foo, &$bar ) );
+function NothingFunctionData( $data, &$foo, &$bar ) {
+	$foo = $data;
 
-		$this->assertEquals( 'bah', $foo, 'Standard static method' );
-		$foo = 'Foo';
-	}
+	return true;
 }
 
 class NothingClass {
-	static public function someStatic( &$foo, &$bar ) {
-		$foo = 'bah';
+	public $calls = 0;
+
+	public static function someStatic( &$foo, &$bar ) {
+		$foo = 'changed-static';
+
 		return true;
 	}
 
 	public function someNonStatic( &$foo, &$bar ) {
-		$foo = 'fOO';
-		$bar = 'bAR';
+		$this->calls++;
+		$foo = 'changed-nonstatic';
+		$bar = 'changed-nonstatic';
+
 		return true;
 	}
 
 	public function onMediaWikiHooksTest001( &$foo, &$bar ) {
-		$foo = 'foo';
+		$this->calls++;
+		$foo = 'changed-onevent';
+
 		return true;
 	}
 
-	public function someNonStaticWithData( $foo, &$bar ) {
-		$bar = $foo;
+	public function someNonStaticWithData( $data, &$foo, &$bar ) {
+		$this->calls++;
+		$foo = $data;
+
 		return true;
 	}
 }