Merge "Fix sessionfailure i18n message during authentication"
[lhc/web/wiklou.git] / tests / phpunit / maintenance / MaintenanceTest.php
index ecb4f34..141561f 100644 (file)
@@ -2,55 +2,34 @@
 
 namespace MediaWiki\Tests\Maintenance;
 
+use Maintenance;
 use MediaWiki\MediaWikiServices;
-use MediaWikiTestCase;
+use Wikimedia\TestingAccessWrapper;
 
 /**
  * @covers Maintenance
  */
-class MaintenanceTest extends MediaWikiTestCase {
+class MaintenanceTest extends MaintenanceBaseTestCase {
 
        /**
-        * The main Maintenance instance that is used for testing.
-        *
-        * @var MaintenanceFixup
+        * @see MaintenanceBaseTestCase::getMaintenanceClass
         */
-       private $m;
-
-       protected function setUp() {
-               parent::setUp();
-               $this->m = new MaintenanceFixup( $this );
-       }
-
-       protected function tearDown() {
-               if ( $this->m ) {
-                       $this->m->simulateShutdown();
-                       $this->m = null;
-               }
-               parent::tearDown();
+       protected function getMaintenanceClass() {
+               return Maintenance::class;
        }
 
        /**
-        * asserts the output before and after simulating shutdown
-        *
-        * This function simulates shutdown of self::m.
+        * @see MaintenanceBaseTestCase::createMaintenance
         *
-        * @param string $preShutdownOutput Expected output before simulating shutdown
-        * @param bool $expectNLAppending Whether or not shutdown simulation is expected
-        *   to add a newline to the output. If false, $preShutdownOutput is the
-        *   expected output after shutdown simulation. Otherwise,
-        *   $preShutdownOutput with an appended newline is the expected output
-        *   after shutdown simulation.
+        * Note to extension authors looking for a model to follow: This function
+        * is normally not needed in a maintenance test, it's only overridden here
+        * because Maintenance is abstract.
         */
-       private function assertOutputPrePostShutdown( $preShutdownOutput, $expectNLAppending ) {
-               $this->assertEquals( $preShutdownOutput, $this->getActualOutput(),
-                       "Output before shutdown simulation" );
+       protected function createMaintenance() {
+               $className = $this->getMaintenanceClass();
+               $obj = $this->getMockForAbstractClass( $className );
 
-               $this->m->simulateShutdown();
-               $this->m = null;
-
-               $postShutdownOutput = $preShutdownOutput . ( $expectNLAppending ? "\n" : "" );
-               $this->expectOutputString( $postShutdownOutput );
+               return TestingAccessWrapper::newFromObject( $obj );
        }
 
        // Although the following tests do not seem to be too consistent (compare for
@@ -58,632 +37,445 @@ class MaintenanceTest extends MediaWikiTestCase {
        // test.*Intermittent.* tests), the objective of these tests is not to describe
        // consistent behavior, but rather currently existing behavior.
 
-       function testOutputEmpty() {
-               $this->m->output( "" );
-               $this->assertOutputPrePostShutdown( "", false );
-       }
-
-       function testOutputString() {
-               $this->m->output( "foo" );
-               $this->assertOutputPrePostShutdown( "foo", false );
-       }
-
-       function testOutputStringString() {
-               $this->m->output( "foo" );
-               $this->m->output( "bar" );
-               $this->assertOutputPrePostShutdown( "foobar", false );
-       }
-
-       function testOutputStringNL() {
-               $this->m->output( "foo\n" );
-               $this->assertOutputPrePostShutdown( "foo\n", false );
-       }
-
-       function testOutputStringNLNL() {
-               $this->m->output( "foo\n\n" );
-               $this->assertOutputPrePostShutdown( "foo\n\n", false );
-       }
-
-       function testOutputStringNLString() {
-               $this->m->output( "foo\nbar" );
-               $this->assertOutputPrePostShutdown( "foo\nbar", false );
-       }
-
-       function testOutputStringNLStringNL() {
-               $this->m->output( "foo\nbar\n" );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputStringNLStringNLLinewise() {
-               $this->m->output( "foo\n" );
-               $this->m->output( "bar\n" );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputStringNLStringNLArbitrary() {
-               $this->m->output( "" );
-               $this->m->output( "foo" );
-               $this->m->output( "" );
-               $this->m->output( "\n" );
-               $this->m->output( "ba" );
-               $this->m->output( "" );
-               $this->m->output( "r\n" );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputStringNLStringNLArbitraryAgain() {
-               $this->m->output( "" );
-               $this->m->output( "foo" );
-               $this->m->output( "" );
-               $this->m->output( "\nb" );
-               $this->m->output( "a" );
-               $this->m->output( "" );
-               $this->m->output( "r\n" );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputWNullChannelEmpty() {
-               $this->m->output( "", null );
-               $this->assertOutputPrePostShutdown( "", false );
-       }
-
-       function testOutputWNullChannelString() {
-               $this->m->output( "foo", null );
-               $this->assertOutputPrePostShutdown( "foo", false );
-       }
-
-       function testOutputWNullChannelStringString() {
-               $this->m->output( "foo", null );
-               $this->m->output( "bar", null );
-               $this->assertOutputPrePostShutdown( "foobar", false );
-       }
-
-       function testOutputWNullChannelStringNL() {
-               $this->m->output( "foo\n", null );
-               $this->assertOutputPrePostShutdown( "foo\n", false );
-       }
-
-       function testOutputWNullChannelStringNLNL() {
-               $this->m->output( "foo\n\n", null );
-               $this->assertOutputPrePostShutdown( "foo\n\n", false );
-       }
-
-       function testOutputWNullChannelStringNLString() {
-               $this->m->output( "foo\nbar", null );
-               $this->assertOutputPrePostShutdown( "foo\nbar", false );
-       }
-
-       function testOutputWNullChannelStringNLStringNL() {
-               $this->m->output( "foo\nbar\n", null );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputWNullChannelStringNLStringNLLinewise() {
-               $this->m->output( "foo\n", null );
-               $this->m->output( "bar\n", null );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputWNullChannelStringNLStringNLArbitrary() {
-               $this->m->output( "", null );
-               $this->m->output( "foo", null );
-               $this->m->output( "", null );
-               $this->m->output( "\n", null );
-               $this->m->output( "ba", null );
-               $this->m->output( "", null );
-               $this->m->output( "r\n", null );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputWNullChannelStringNLStringNLArbitraryAgain() {
-               $this->m->output( "", null );
-               $this->m->output( "foo", null );
-               $this->m->output( "", null );
-               $this->m->output( "\nb", null );
-               $this->m->output( "a", null );
-               $this->m->output( "", null );
-               $this->m->output( "r\n", null );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputWChannelString() {
-               $this->m->output( "foo", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo", true );
-       }
-
-       function testOutputWChannelStringNL() {
-               $this->m->output( "foo\n", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo", true );
-       }
-
-       function testOutputWChannelStringNLNL() {
-               // If this test fails, note that output takes strings with double line
-               // endings (although output's implementation in this situation calls
-               // outputChanneled with a string ending in a nl ... which is not allowed
-               // according to the documentation of outputChanneled)
-               $this->m->output( "foo\n\n", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo\n", true );
-       }
-
-       function testOutputWChannelStringNLString() {
-               $this->m->output( "foo\nbar", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo\nbar", true );
-       }
-
-       function testOutputWChannelStringNLStringNL() {
-               $this->m->output( "foo\nbar\n", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo\nbar", true );
-       }
-
-       function testOutputWChannelStringNLStringNLLinewise() {
-               $this->m->output( "foo\n", "bazChannel" );
-               $this->m->output( "bar\n", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foobar", true );
-       }
-
-       function testOutputWChannelStringNLStringNLArbitrary() {
-               $this->m->output( "", "bazChannel" );
-               $this->m->output( "foo", "bazChannel" );
-               $this->m->output( "", "bazChannel" );
-               $this->m->output( "\n", "bazChannel" );
-               $this->m->output( "ba", "bazChannel" );
-               $this->m->output( "", "bazChannel" );
-               $this->m->output( "r\n", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foobar", true );
-       }
-
-       function testOutputWChannelStringNLStringNLArbitraryAgain() {
-               $this->m->output( "", "bazChannel" );
-               $this->m->output( "foo", "bazChannel" );
-               $this->m->output( "", "bazChannel" );
-               $this->m->output( "\nb", "bazChannel" );
-               $this->m->output( "a", "bazChannel" );
-               $this->m->output( "", "bazChannel" );
-               $this->m->output( "r\n", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo\nbar", true );
-       }
-
-       function testOutputWMultipleChannelsChannelChange() {
-               $this->m->output( "foo", "bazChannel" );
-               $this->m->output( "bar", "bazChannel" );
-               $this->m->output( "qux", "quuxChannel" );
-               $this->m->output( "corge", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foobar\nqux\ncorge", true );
-       }
-
-       function testOutputWMultipleChannelsChannelChangeNL() {
-               $this->m->output( "foo", "bazChannel" );
-               $this->m->output( "bar\n", "bazChannel" );
-               $this->m->output( "qux\n", "quuxChannel" );
-               $this->m->output( "corge", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foobar\nqux\ncorge", true );
-       }
-
-       function testOutputWAndWOChannelStringStartWO() {
-               $this->m->output( "foo" );
-               $this->m->output( "bar", "bazChannel" );
-               $this->m->output( "qux" );
-               $this->m->output( "quux", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foobar\nquxquux", true );
-       }
-
-       function testOutputWAndWOChannelStringStartW() {
-               $this->m->output( "foo", "bazChannel" );
-               $this->m->output( "bar" );
-               $this->m->output( "qux", "bazChannel" );
-               $this->m->output( "quux" );
-               $this->assertOutputPrePostShutdown( "foo\nbarqux\nquux", false );
-       }
-
-       function testOutputWChannelTypeSwitch() {
-               $this->m->output( "foo", 1 );
-               $this->m->output( "bar", 1.0 );
-               $this->assertOutputPrePostShutdown( "foo\nbar", true );
-       }
-
-       function testOutputIntermittentEmpty() {
-               $this->m->output( "foo" );
-               $this->m->output( "" );
-               $this->m->output( "bar" );
-               $this->assertOutputPrePostShutdown( "foobar", false );
-       }
-
-       function testOutputIntermittentFalse() {
-               $this->m->output( "foo" );
-               $this->m->output( false );
-               $this->m->output( "bar" );
-               $this->assertOutputPrePostShutdown( "foobar", false );
-       }
-
-       function testOutputIntermittentFalseAfterOtherChannel() {
-               $this->m->output( "qux", "quuxChannel" );
-               $this->m->output( "foo" );
-               $this->m->output( false );
-               $this->m->output( "bar" );
-               $this->assertOutputPrePostShutdown( "qux\nfoobar", false );
-       }
-
-       function testOutputWNullChannelIntermittentEmpty() {
-               $this->m->output( "foo", null );
-               $this->m->output( "", null );
-               $this->m->output( "bar", null );
-               $this->assertOutputPrePostShutdown( "foobar", false );
-       }
-
-       function testOutputWNullChannelIntermittentFalse() {
-               $this->m->output( "foo", null );
-               $this->m->output( false, null );
-               $this->m->output( "bar", null );
-               $this->assertOutputPrePostShutdown( "foobar", false );
-       }
-
-       function testOutputWChannelIntermittentEmpty() {
-               $this->m->output( "foo", "bazChannel" );
-               $this->m->output( "", "bazChannel" );
-               $this->m->output( "bar", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foobar", true );
-       }
-
-       function testOutputWChannelIntermittentFalse() {
-               $this->m->output( "foo", "bazChannel" );
-               $this->m->output( false, "bazChannel" );
-               $this->m->output( "bar", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foobar", true );
-       }
-
-       // Note that (per documentation) outputChanneled does take strings that end
-       // in \n, hence we do not test such strings.
-
-       function testOutputChanneledEmpty() {
-               $this->m->outputChanneled( "" );
-               $this->assertOutputPrePostShutdown( "\n", false );
-       }
-
-       function testOutputChanneledString() {
-               $this->m->outputChanneled( "foo" );
-               $this->assertOutputPrePostShutdown( "foo\n", false );
-       }
-
-       function testOutputChanneledStringString() {
-               $this->m->outputChanneled( "foo" );
-               $this->m->outputChanneled( "bar" );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputChanneledStringNLString() {
-               $this->m->outputChanneled( "foo\nbar" );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputChanneledStringNLStringNLArbitraryAgain() {
-               $this->m->outputChanneled( "" );
-               $this->m->outputChanneled( "foo" );
-               $this->m->outputChanneled( "" );
-               $this->m->outputChanneled( "\nb" );
-               $this->m->outputChanneled( "a" );
-               $this->m->outputChanneled( "" );
-               $this->m->outputChanneled( "r" );
-               $this->assertOutputPrePostShutdown( "\nfoo\n\n\nb\na\n\nr\n", false );
-       }
-
-       function testOutputChanneledWNullChannelEmpty() {
-               $this->m->outputChanneled( "", null );
-               $this->assertOutputPrePostShutdown( "\n", false );
-       }
-
-       function testOutputChanneledWNullChannelString() {
-               $this->m->outputChanneled( "foo", null );
-               $this->assertOutputPrePostShutdown( "foo\n", false );
-       }
-
-       function testOutputChanneledWNullChannelStringString() {
-               $this->m->outputChanneled( "foo", null );
-               $this->m->outputChanneled( "bar", null );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputChanneledWNullChannelStringNLString() {
-               $this->m->outputChanneled( "foo\nbar", null );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputChanneledWNullChannelStringNLStringNLArbitraryAgain() {
-               $this->m->outputChanneled( "", null );
-               $this->m->outputChanneled( "foo", null );
-               $this->m->outputChanneled( "", null );
-               $this->m->outputChanneled( "\nb", null );
-               $this->m->outputChanneled( "a", null );
-               $this->m->outputChanneled( "", null );
-               $this->m->outputChanneled( "r", null );
-               $this->assertOutputPrePostShutdown( "\nfoo\n\n\nb\na\n\nr\n", false );
-       }
-
-       function testOutputChanneledWChannelString() {
-               $this->m->outputChanneled( "foo", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo", true );
-       }
-
-       function testOutputChanneledWChannelStringNLString() {
-               $this->m->outputChanneled( "foo\nbar", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo\nbar", true );
-       }
-
-       function testOutputChanneledWChannelStringString() {
-               $this->m->outputChanneled( "foo", "bazChannel" );
-               $this->m->outputChanneled( "bar", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foobar", true );
-       }
-
-       function testOutputChanneledWChannelStringNLStringNLArbitraryAgain() {
-               $this->m->outputChanneled( "", "bazChannel" );
-               $this->m->outputChanneled( "foo", "bazChannel" );
-               $this->m->outputChanneled( "", "bazChannel" );
-               $this->m->outputChanneled( "\nb", "bazChannel" );
-               $this->m->outputChanneled( "a", "bazChannel" );
-               $this->m->outputChanneled( "", "bazChannel" );
-               $this->m->outputChanneled( "r", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo\nbar", true );
-       }
-
-       function testOutputChanneledWMultipleChannelsChannelChange() {
-               $this->m->outputChanneled( "foo", "bazChannel" );
-               $this->m->outputChanneled( "bar", "bazChannel" );
-               $this->m->outputChanneled( "qux", "quuxChannel" );
-               $this->m->outputChanneled( "corge", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foobar\nqux\ncorge", true );
-       }
-
-       function testOutputChanneledWMultipleChannelsChannelChangeEnclosedNull() {
-               $this->m->outputChanneled( "foo", "bazChannel" );
-               $this->m->outputChanneled( "bar", null );
-               $this->m->outputChanneled( "qux", null );
-               $this->m->outputChanneled( "corge", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo\nbar\nqux\ncorge", true );
-       }
-
-       function testOutputChanneledWMultipleChannelsChannelAfterNullChange() {
-               $this->m->outputChanneled( "foo", "bazChannel" );
-               $this->m->outputChanneled( "bar", null );
-               $this->m->outputChanneled( "qux", null );
-               $this->m->outputChanneled( "corge", "quuxChannel" );
-               $this->assertOutputPrePostShutdown( "foo\nbar\nqux\ncorge", true );
-       }
-
-       function testOutputChanneledWAndWOChannelStringStartWO() {
-               $this->m->outputChanneled( "foo" );
-               $this->m->outputChanneled( "bar", "bazChannel" );
-               $this->m->outputChanneled( "qux" );
-               $this->m->outputChanneled( "quux", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo\nbar\nqux\nquux", true );
-       }
-
-       function testOutputChanneledWAndWOChannelStringStartW() {
-               $this->m->outputChanneled( "foo", "bazChannel" );
-               $this->m->outputChanneled( "bar" );
-               $this->m->outputChanneled( "qux", "bazChannel" );
-               $this->m->outputChanneled( "quux" );
-               $this->assertOutputPrePostShutdown( "foo\nbar\nqux\nquux\n", false );
-       }
-
-       function testOutputChanneledWChannelTypeSwitch() {
-               $this->m->outputChanneled( "foo", 1 );
-               $this->m->outputChanneled( "bar", 1.0 );
-               $this->assertOutputPrePostShutdown( "foo\nbar", true );
-       }
-
-       function testOutputChanneledWOChannelIntermittentEmpty() {
-               $this->m->outputChanneled( "foo" );
-               $this->m->outputChanneled( "" );
-               $this->m->outputChanneled( "bar" );
-               $this->assertOutputPrePostShutdown( "foo\n\nbar\n", false );
-       }
-
-       function testOutputChanneledWOChannelIntermittentFalse() {
-               $this->m->outputChanneled( "foo" );
-               $this->m->outputChanneled( false );
-               $this->m->outputChanneled( "bar" );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputChanneledWNullChannelIntermittentEmpty() {
-               $this->m->outputChanneled( "foo", null );
-               $this->m->outputChanneled( "", null );
-               $this->m->outputChanneled( "bar", null );
-               $this->assertOutputPrePostShutdown( "foo\n\nbar\n", false );
-       }
-
-       function testOutputChanneledWNullChannelIntermittentFalse() {
-               $this->m->outputChanneled( "foo", null );
-               $this->m->outputChanneled( false, null );
-               $this->m->outputChanneled( "bar", null );
-               $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
-       }
-
-       function testOutputChanneledWChannelIntermittentEmpty() {
-               $this->m->outputChanneled( "foo", "bazChannel" );
-               $this->m->outputChanneled( "", "bazChannel" );
-               $this->m->outputChanneled( "bar", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foobar", true );
+       /**
+        * @dataProvider provideOutputData
+        */
+       function testOutput( $outputs, $expected, $extraNL ) {
+               foreach ( $outputs as $data ) {
+                       if ( is_array( $data ) ) {
+                               list( $msg, $channel ) = $data;
+                       } else {
+                               $msg = $data;
+                               $channel = null;
+                       }
+                       $this->maintenance->output( $msg, $channel );
+               }
+               $this->assertOutputPrePostShutdown( $expected, $extraNL );
+       }
+
+       public function provideOutputData() {
+               return [
+                       [ [ "" ], "", false ],
+                       [ [ "foo" ], "foo", false ],
+                       [ [ "foo", "bar" ], "foobar", false ],
+                       [ [ "foo\n" ], "foo\n", false ],
+                       [ [ "foo\n\n" ], "foo\n\n", false ],
+                       [ [ "foo\nbar" ], "foo\nbar", false ],
+                       [ [ "foo\nbar\n" ], "foo\nbar\n", false ],
+                       [ [ "foo\n", "bar\n" ], "foo\nbar\n", false ],
+                       [ [ "", "foo", "", "\n", "ba", "", "r\n" ], "foo\nbar\n", false ],
+                       [ [ "", "foo", "", "\nb", "a", "", "r\n" ], "foo\nbar\n", false ],
+                       [ [ [ "foo", "bazChannel" ] ], "foo", true ],
+                       [ [ [ "foo\n", "bazChannel" ] ], "foo", true ],
+
+                       // If this test fails, note that output takes strings with double line
+                       // endings (although output's implementation in this situation calls
+                       // outputChanneled with a string ending in a nl ... which is not allowed
+                       // according to the documentation of outputChanneled)
+                       [ [ [ "foo\n\n", "bazChannel" ] ], "foo\n", true ],
+                       [ [ [ "foo\nbar", "bazChannel" ] ], "foo\nbar", true ],
+                       [ [ [ "foo\nbar\n", "bazChannel" ] ], "foo\nbar", true ],
+                       [
+                               [
+                                       [ "foo\n", "bazChannel" ],
+                                       [ "bar\n", "bazChannel" ],
+                               ],
+                               "foobar",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "", "bazChannel" ],
+                                       [ "foo", "bazChannel" ],
+                                       [ "", "bazChannel" ],
+                                       [ "\n", "bazChannel" ],
+                                       [ "ba", "bazChannel" ],
+                                       [ "", "bazChannel" ],
+                                       [ "r\n", "bazChannel" ],
+                               ],
+                               "foobar",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "", "bazChannel" ],
+                                       [ "foo", "bazChannel" ],
+                                       [ "", "bazChannel" ],
+                                       [ "\nb", "bazChannel" ],
+                                       [ "a", "bazChannel" ],
+                                       [ "", "bazChannel" ],
+                                       [ "r\n", "bazChannel" ],
+                               ],
+                               "foo\nbar",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "foo", "bazChannel" ],
+                                       [ "bar", "bazChannel" ],
+                                       [ "qux", "quuxChannel" ],
+                                       [ "corge", "bazChannel" ],
+                               ],
+                               "foobar\nqux\ncorge",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "foo", "bazChannel" ],
+                                       [ "bar\n", "bazChannel" ],
+                                       [ "qux\n", "quuxChannel" ],
+                                       [ "corge", "bazChannel" ],
+                               ],
+                               "foobar\nqux\ncorge",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "foo", null ],
+                                       [ "bar", "bazChannel" ],
+                                       [ "qux", null ],
+                                       [ "quux", "bazChannel" ],
+                               ],
+                               "foobar\nquxquux",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "foo", "bazChannel" ],
+                                       [ "bar", null ],
+                                       [ "qux", "bazChannel" ],
+                                       [ "quux", null ],
+                               ],
+                               "foo\nbarqux\nquux",
+                               false
+                       ],
+                       [
+                               [
+                                       [ "foo", 1 ],
+                                       [ "bar", 1.0 ],
+                               ],
+                               "foo\nbar",
+                               true
+                       ],
+                       [ [ "foo", "", "bar" ], "foobar", false ],
+                       [ [ "foo", false, "bar" ], "foobar", false ],
+                       [
+                               [
+                                       [ "qux", "quuxChannel" ],
+                                       "foo",
+                                       false,
+                                       "bar"
+                               ],
+                               "qux\nfoobar",
+                               false
+                       ],
+                       [
+                               [
+                                       [ "foo", "bazChannel" ],
+                                       [ "", "bazChannel" ],
+                                       [ "bar", "bazChannel" ],
+                               ],
+                               "foobar",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "foo", "bazChannel" ],
+                                       [ false, "bazChannel" ],
+                                       [ "bar", "bazChannel" ],
+                               ],
+                               "foobar",
+                               true
+                       ],
+               ];
        }
 
-       function testOutputChanneledWChannelIntermittentFalse() {
-               $this->m->outputChanneled( "foo", "bazChannel" );
-               $this->m->outputChanneled( false, "bazChannel" );
-               $this->m->outputChanneled( "bar", "bazChannel" );
-               $this->assertOutputPrePostShutdown( "foo\nbar", true );
+       /**
+        * @dataProvider provideOutputChanneledData
+        */
+       function testOutputChanneled( $outputs, $expected, $extraNL ) {
+               foreach ( $outputs as $data ) {
+                       if ( is_array( $data ) ) {
+                               list( $msg, $channel ) = $data;
+                       } else {
+                               $msg = $data;
+                               $channel = null;
+                       }
+                       $this->maintenance->outputChanneled( $msg, $channel );
+               }
+               $this->assertOutputPrePostShutdown( $expected, $extraNL );
+       }
+
+       public function provideOutputChanneledData() {
+               return [
+                       [ [ "" ], "\n", false ],
+                       [ [ "foo" ], "foo\n", false ],
+                       [ [ "foo", "bar" ], "foo\nbar\n", false ],
+                       [ [ "foo\nbar" ], "foo\nbar\n", false ],
+                       [ [ "", "foo", "", "\nb", "a", "", "r" ], "\nfoo\n\n\nb\na\n\nr\n", false ],
+                       [ [ [ "foo", "bazChannel" ] ], "foo", true ],
+                       [
+                               [
+                                       [ "foo\nbar", "bazChannel" ]
+                               ],
+                               "foo\nbar",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "foo", "bazChannel" ],
+                                       [ "bar", "bazChannel" ],
+                               ],
+                               "foobar",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "", "bazChannel" ],
+                                       [ "foo", "bazChannel" ],
+                                       [ "", "bazChannel" ],
+                                       [ "\nb", "bazChannel" ],
+                                       [ "a", "bazChannel" ],
+                                       [ "", "bazChannel" ],
+                                       [ "r", "bazChannel" ],
+                               ],
+                               "foo\nbar",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "foo", "bazChannel" ],
+                                       [ "bar", "bazChannel" ],
+                                       [ "qux", "quuxChannel" ],
+                                       [ "corge", "bazChannel" ],
+                               ],
+                               "foobar\nqux\ncorge",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "foo", "bazChannel" ],
+                                       [ "bar", "bazChannel" ],
+                                       [ "qux", "quuxChannel" ],
+                                       [ "corge", "bazChannel" ],
+                               ],
+                               "foobar\nqux\ncorge",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "foo", "bazChannel" ],
+                                       [ "bar", null ],
+                                       [ "qux", null ],
+                                       [ "corge", "bazChannel" ],
+                               ],
+                               "foo\nbar\nqux\ncorge",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "foo", null ],
+                                       [ "bar", "bazChannel" ],
+                                       [ "qux", null ],
+                                       [ "quux", "bazChannel" ],
+                               ],
+                               "foo\nbar\nqux\nquux",
+                               true
+                       ],
+                       [
+                               [
+                                       [ "foo", "bazChannel" ],
+                                       [ "bar", null ],
+                                       [ "qux", "bazChannel" ],
+                                       [ "quux", null ],
+                               ],
+                               "foo\nbar\nqux\nquux\n",
+                               false
+                       ],
+                       [
+                               [
+                                       [ "foo", 1 ],
+                                       [ "bar", 1.0 ],
+                               ],
+                               "foo\nbar",
+                               true
+                       ],
+                       [ [ "foo", "", "bar" ], "foo\n\nbar\n", false ],
+                       [ [ "foo", false, "bar" ], "foo\nbar\n", false ],
+               ];
        }
 
        function testCleanupChanneledClean() {
-               $this->m->cleanupChanneled();
+               $this->maintenance->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "", false );
        }
 
        function testCleanupChanneledAfterOutput() {
-               $this->m->output( "foo" );
-               $this->m->cleanupChanneled();
+               $this->maintenance->output( "foo" );
+               $this->maintenance->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo", false );
        }
 
        function testCleanupChanneledAfterOutputWNullChannel() {
-               $this->m->output( "foo", null );
-               $this->m->cleanupChanneled();
+               $this->maintenance->output( "foo", null );
+               $this->maintenance->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo", false );
        }
 
        function testCleanupChanneledAfterOutputWChannel() {
-               $this->m->output( "foo", "bazChannel" );
-               $this->m->cleanupChanneled();
+               $this->maintenance->output( "foo", "bazChannel" );
+               $this->maintenance->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo\n", false );
        }
 
        function testCleanupChanneledAfterNLOutput() {
-               $this->m->output( "foo\n" );
-               $this->m->cleanupChanneled();
+               $this->maintenance->output( "foo\n" );
+               $this->maintenance->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo\n", false );
        }
 
        function testCleanupChanneledAfterNLOutputWNullChannel() {
-               $this->m->output( "foo\n", null );
-               $this->m->cleanupChanneled();
+               $this->maintenance->output( "foo\n", null );
+               $this->maintenance->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo\n", false );
        }
 
        function testCleanupChanneledAfterNLOutputWChannel() {
-               $this->m->output( "foo\n", "bazChannel" );
-               $this->m->cleanupChanneled();
+               $this->maintenance->output( "foo\n", "bazChannel" );
+               $this->maintenance->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo\n", false );
        }
 
        function testCleanupChanneledAfterOutputChanneledWOChannel() {
-               $this->m->outputChanneled( "foo" );
-               $this->m->cleanupChanneled();
+               $this->maintenance->outputChanneled( "foo" );
+               $this->maintenance->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo\n", false );
        }
 
        function testCleanupChanneledAfterOutputChanneledWNullChannel() {
-               $this->m->outputChanneled( "foo", null );
-               $this->m->cleanupChanneled();
+               $this->maintenance->outputChanneled( "foo", null );
+               $this->maintenance->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo\n", false );
        }
 
        function testCleanupChanneledAfterOutputChanneledWChannel() {
-               $this->m->outputChanneled( "foo", "bazChannel" );
-               $this->m->cleanupChanneled();
+               $this->maintenance->outputChanneled( "foo", "bazChannel" );
+               $this->maintenance->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo\n", false );
        }
 
        function testMultipleMaintenanceObjectsInteractionOutput() {
-               $m2 = new MaintenanceFixup( $this );
+               $m2 = $this->createMaintenance();
 
-               $this->m->output( "foo" );
+               $this->maintenance->output( "foo" );
                $m2->output( "bar" );
 
                $this->assertEquals( "foobar", $this->getActualOutput(),
                        "Output before shutdown simulation (m2)" );
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foobar", false );
        }
 
        function testMultipleMaintenanceObjectsInteractionOutputWNullChannel() {
-               $m2 = new MaintenanceFixup( $this );
+               $m2 = $this->createMaintenance();
 
-               $this->m->output( "foo", null );
+               $this->maintenance->output( "foo", null );
                $m2->output( "bar", null );
 
                $this->assertEquals( "foobar", $this->getActualOutput(),
                        "Output before shutdown simulation (m2)" );
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foobar", false );
        }
 
        function testMultipleMaintenanceObjectsInteractionOutputWChannel() {
-               $m2 = new MaintenanceFixup( $this );
+               $m2 = $this->createMaintenance();
 
-               $this->m->output( "foo", "bazChannel" );
+               $this->maintenance->output( "foo", "bazChannel" );
                $m2->output( "bar", "bazChannel" );
 
                $this->assertEquals( "foobar", $this->getActualOutput(),
                        "Output before shutdown simulation (m2)" );
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foobar\n", true );
        }
 
        function testMultipleMaintenanceObjectsInteractionOutputWNullChannelNL() {
-               $m2 = new MaintenanceFixup( $this );
+               $m2 = $this->createMaintenance();
 
-               $this->m->output( "foo\n", null );
+               $this->maintenance->output( "foo\n", null );
                $m2->output( "bar\n", null );
 
                $this->assertEquals( "foo\nbar\n", $this->getActualOutput(),
                        "Output before shutdown simulation (m2)" );
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
        }
 
        function testMultipleMaintenanceObjectsInteractionOutputWChannelNL() {
-               $m2 = new MaintenanceFixup( $this );
+               $m2 = $this->createMaintenance();
 
-               $this->m->output( "foo\n", "bazChannel" );
+               $this->maintenance->output( "foo\n", "bazChannel" );
                $m2->output( "bar\n", "bazChannel" );
 
                $this->assertEquals( "foobar", $this->getActualOutput(),
                        "Output before shutdown simulation (m2)" );
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foobar\n", true );
        }
 
        function testMultipleMaintenanceObjectsInteractionOutputChanneled() {
-               $m2 = new MaintenanceFixup( $this );
+               $m2 = $this->createMaintenance();
 
-               $this->m->outputChanneled( "foo" );
+               $this->maintenance->outputChanneled( "foo" );
                $m2->outputChanneled( "bar" );
 
                $this->assertEquals( "foo\nbar\n", $this->getActualOutput(),
                        "Output before shutdown simulation (m2)" );
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
        }
 
        function testMultipleMaintenanceObjectsInteractionOutputChanneledWNullChannel() {
-               $m2 = new MaintenanceFixup( $this );
+               $m2 = $this->createMaintenance();
 
-               $this->m->outputChanneled( "foo", null );
+               $this->maintenance->outputChanneled( "foo", null );
                $m2->outputChanneled( "bar", null );
 
                $this->assertEquals( "foo\nbar\n", $this->getActualOutput(),
                        "Output before shutdown simulation (m2)" );
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foo\nbar\n", false );
        }
 
        function testMultipleMaintenanceObjectsInteractionOutputChanneledWChannel() {
-               $m2 = new MaintenanceFixup( $this );
+               $m2 = $this->createMaintenance();
 
-               $this->m->outputChanneled( "foo", "bazChannel" );
+               $this->maintenance->outputChanneled( "foo", "bazChannel" );
                $m2->outputChanneled( "bar", "bazChannel" );
 
                $this->assertEquals( "foobar", $this->getActualOutput(),
                        "Output before shutdown simulation (m2)" );
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foobar\n", true );
        }
 
        function testMultipleMaintenanceObjectsInteractionCleanupChanneledWChannel() {
-               $m2 = new MaintenanceFixup( $this );
+               $m2 = $this->createMaintenance();
 
-               $this->m->outputChanneled( "foo", "bazChannel" );
+               $this->maintenance->outputChanneled( "foo", "bazChannel" );
                $m2->outputChanneled( "bar", "bazChannel" );
 
                $this->assertEquals( "foobar", $this->getActualOutput(),
                        "Output before first cleanup" );
-               $this->m->cleanupChanneled();
+               $this->maintenance->cleanupChanneled();
                $this->assertEquals( "foobar\n", $this->getActualOutput(),
                        "Output after first cleanup" );
                $m2->cleanupChanneled();
                $this->assertEquals( "foobar\n\n", $this->getActualOutput(),
                        "Output after second cleanup" );
 
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
                $this->assertOutputPrePostShutdown( "foobar\n\n", false );
        }
 
@@ -691,10 +483,10 @@ class MaintenanceTest extends MediaWikiTestCase {
         * @covers Maintenance::getConfig
         */
        public function testGetConfig() {
-               $this->assertInstanceOf( 'Config', $this->m->getConfig() );
+               $this->assertInstanceOf( 'Config', $this->maintenance->getConfig() );
                $this->assertSame(
                        MediaWikiServices::getInstance()->getMainConfig(),
-                       $this->m->getConfig()
+                       $this->maintenance->getConfig()
                );
        }
 
@@ -703,12 +495,13 @@ class MaintenanceTest extends MediaWikiTestCase {
         */
        public function testSetConfig() {
                $conf = $this->createMock( 'Config' );
-               $this->m->setConfig( $conf );
-               $this->assertSame( $conf, $this->m->getConfig() );
+               $this->maintenance->setConfig( $conf );
+               $this->assertSame( $conf, $this->maintenance->getConfig() );
        }
 
        function testParseArgs() {
-               $m2 = new MaintenanceFixup( $this );
+               $m2 = $this->createMaintenance();
+
                // Create an option with an argument allowed to be specified multiple times
                $m2->addOption( 'multi', 'This option does stuff', false, true, false, true );
                $m2->loadWithArgv( [ '--multi', 'this1', '--multi', 'this2' ] );
@@ -717,9 +510,9 @@ class MaintenanceTest extends MediaWikiTestCase {
                $this->assertEquals( [ [ 'multi', 'this1' ], [ 'multi', 'this2' ] ],
                        $m2->orderedOptions );
 
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
 
-               $m2 = new MaintenanceFixup( $this );
+               $m2 = $this->createMaintenance();
 
                $m2->addOption( 'multi', 'This option does stuff', false, false, false, true );
                $m2->loadWithArgv( [ '--multi', '--multi' ] );
@@ -727,9 +520,10 @@ class MaintenanceTest extends MediaWikiTestCase {
                $this->assertEquals( [ 1, 1 ], $m2->getOption( 'multi' ) );
                $this->assertEquals( [ [ 'multi', 1 ], [ 'multi', 1 ] ], $m2->orderedOptions );
 
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
+
+               $m2 = $this->createMaintenance();
 
-               $m2 = new MaintenanceFixup( $this );
                // Create an option with an argument allowed to be specified multiple times
                $m2->addOption( 'multi', 'This option doesn\'t actually support multiple occurrences' );
                $m2->loadWithArgv( [ '--multi=yo' ] );
@@ -737,6 +531,6 @@ class MaintenanceTest extends MediaWikiTestCase {
                $this->assertEquals( 'yo', $m2->getOption( 'multi' ) );
                $this->assertEquals( [ [ 'multi', 'yo' ] ], $m2->orderedOptions );
 
-               $m2->simulateShutdown();
+               $m2->cleanupChanneled();
        }
 }