This avoids using $wgUser and $wgLang for the ParserOption, which is not
needed in the tests
Change-Id: Iea07e9a0f0898ec5f8eb98a40000f5d33b279c9e
protected function setUp() {
parent::setUp();
protected function setUp() {
parent::setUp();
+ $contLang = Language::factory( 'en' );
$this->setMwGlobals( array(
'wgShowDBErrorBacktrace' => true,
'wgLanguageCode' => 'en',
$this->setMwGlobals( array(
'wgShowDBErrorBacktrace' => true,
'wgLanguageCode' => 'en',
- 'wgContLang' => Language::factory( 'en' ),
+ 'wgContLang' => $contLang,
'wgLang' => Language::factory( 'en' ),
'wgMemc' => new EmptyBagOStuff,
'wgAlwaysUseTidy' => false,
'wgCleanSignatures' => true,
) );
'wgLang' => Language::factory( 'en' ),
'wgMemc' => new EmptyBagOStuff,
'wgAlwaysUseTidy' => false,
'wgCleanSignatures' => true,
) );
- $this->options = new ParserOptions;
+ $this->options = ParserOptions::newFromUserAndLang( new User, $contLang );
$this->options->setTemplateCallback( array( __CLASS__, 'statelessFetchTemplate' ) );
$this->parser = new Parser;
$this->options->setTemplateCallback( array( __CLASS__, 'statelessFetchTemplate' ) );
$this->parser = new Parser;
public function testGetParserOutput( $model, $text, $expectedHtml ) {
$page = $this->createPage( 'WikiPageTest_testGetParserOutput', $text, $model );
public function testGetParserOutput( $model, $text, $expectedHtml ) {
$page = $this->createPage( 'WikiPageTest_testGetParserOutput', $text, $model );
- $opt = new ParserOptions();
+ $opt = $page->makeParserOptions( 'canonical' );
$po = $page->getParserOutput( $opt );
$text = $po->getText();
$po = $page->getParserOutput( $opt );
$text = $po->getText();
protected function setUp() {
parent::setUp();
protected function setUp() {
parent::setUp();
- $this->setMwGlobals( 'wgContLang', Language::factory( 'en' ) );
+ $contLang = Language::factory( 'en' );
+ $this->setMwGlobals( 'wgContLang', $contLang );
$this->testParser = new Parser();
$this->testParser = new Parser();
- $this->testParser->Options( new ParserOptions() );
+ $this->testParser->Options( ParserOptions::newFromUserAndLang( new User, $contLang ) );
# initialize parser output
$this->testParser->clearState();
# initialize parser output
$this->testParser->clearState();
private $title;
protected function setUp() {
private $title;
protected function setUp() {
- $this->testParserOptions = new ParserOptions();
+ parent::setUp();
+ $this->testParserOptions = ParserOptions::newFromUserAndLang( new User, $wgContLang );
$this->testParser = new Parser();
$this->testParser->Options( $this->testParserOptions );
$this->testParser = new Parser();
$this->testParser->Options( $this->testParserOptions );
var $mOptions;
protected function setUp() {
var $mOptions;
protected function setUp() {
+ global $wgParserConf, $wgContLang;
- $this->mOptions = new ParserOptions();
+ $this->mOptions = ParserOptions::newFromUserAndLang( new User, $wgContLang );
$name = isset( $wgParserConf['preprocessorClass'] ) ? $wgParserConf['preprocessorClass'] : 'Preprocessor_DOM';
$this->mPreprocessor = new $name( $this );
$name = isset( $wgParserConf['preprocessorClass'] ) ? $wgParserConf['preprocessorClass'] : 'Preprocessor_DOM';
$this->mPreprocessor = new $name( $this );
* @dataProvider provideValidNames
*/
function testTagHooks( $tag ) {
* @dataProvider provideValidNames
*/
function testTagHooks( $tag ) {
+ global $wgParserConf, $wgContLang;
$parser = new Parser( $wgParserConf );
$parser->setHook( $tag, array( $this, 'tagCallback' ) );
$parser = new Parser( $wgParserConf );
$parser->setHook( $tag, array( $this, 'tagCallback' ) );
- $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
+ $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
$this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
$parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
$this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
$parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
* @expectedException MWException
*/
function testBadTagHooks( $tag ) {
* @expectedException MWException
*/
function testBadTagHooks( $tag ) {
+ global $wgParserConf, $wgContLang;
$parser = new Parser( $wgParserConf );
$parser->setHook( $tag, array( $this, 'tagCallback' ) );
$parser = new Parser( $wgParserConf );
$parser->setHook( $tag, array( $this, 'tagCallback' ) );
- $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
+ $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
$this->fail('Exception not thrown.');
}
$this->fail('Exception not thrown.');
}
* @dataProvider provideValidNames
*/
function testFunctionTagHooks( $tag ) {
* @dataProvider provideValidNames
*/
function testFunctionTagHooks( $tag ) {
+ global $wgParserConf, $wgContLang;
$parser = new Parser( $wgParserConf );
$parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), 0 );
$parser = new Parser( $wgParserConf );
$parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), 0 );
- $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
+ $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
$this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
$parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
$this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
$parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
* @expectedException MWException
*/
function testBadFunctionTagHooks( $tag ) {
* @expectedException MWException
*/
function testBadFunctionTagHooks( $tag ) {
+ global $wgParserConf, $wgContLang;
$parser = new Parser( $wgParserConf );
$parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), SFH_OBJECT_ARGS );
$parser = new Parser( $wgParserConf );
$parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), SFH_OBJECT_ARGS );
- $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
+ $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
$this->fail('Exception not thrown.');
}
$this->fail('Exception not thrown.');
}