mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
[ticket/11768] Updated tests to use the new constructor signature
PHPBB3-11768
This commit is contained in:
parent
c4a58bce89
commit
90d1a431bd
2 changed files with 30 additions and 16 deletions
|
@ -24,11 +24,16 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
|
||||||
->with('_foo_parser')
|
->with('_foo_parser')
|
||||||
->will($this->returnValue($mock));
|
->will($this->returnValue($mock));
|
||||||
|
|
||||||
|
$factory = $this->getMockBuilder('phpbb\\textformatter\\s9e\\factory')
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
|
$factory->expects($this->never())->method('regenerate');
|
||||||
|
|
||||||
$parser = new \phpbb\textformatter\s9e\parser(
|
$parser = new \phpbb\textformatter\s9e\parser(
|
||||||
$cache,
|
$cache,
|
||||||
'_foo_parser',
|
'_foo_parser',
|
||||||
$this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
|
$this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
|
||||||
new phpbb_mock_container_builder
|
$factory
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,11 +51,16 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
|
||||||
$cache = new phpbb_mock_cache;
|
$cache = new phpbb_mock_cache;
|
||||||
$cache->put('_foo_parser', $mock);
|
$cache->put('_foo_parser', $mock);
|
||||||
|
|
||||||
|
$factory = $this->getMockBuilder('phpbb\\textformatter\\s9e\\factory')
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
|
$factory->expects($this->never())->method('regenerate');
|
||||||
|
|
||||||
$parser = new \phpbb\textformatter\s9e\parser(
|
$parser = new \phpbb\textformatter\s9e\parser(
|
||||||
$cache,
|
$cache,
|
||||||
'_foo_parser',
|
'_foo_parser',
|
||||||
$this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
|
$this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
|
||||||
new phpbb_mock_container_builder
|
$factory
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->assertSame('<t>test</t>', $parser->parse('test'));
|
$this->assertSame('<t>test</t>', $parser->parse('test'));
|
||||||
|
@ -67,19 +77,18 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
|
||||||
->with('test')
|
->with('test')
|
||||||
->will($this->returnValue('<t>test</t>'));
|
->will($this->returnValue('<t>test</t>'));
|
||||||
|
|
||||||
$factory = $this->getMock('stdClass', array('regenerate'));
|
$factory = $this->getMockBuilder('phpbb\\textformatter\\s9e\\factory')
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
$factory->expects($this->once())
|
$factory->expects($this->once())
|
||||||
->method('regenerate')
|
->method('regenerate')
|
||||||
->will($this->returnValue(array($mock, false)));
|
->will($this->returnValue(array($mock, false)));
|
||||||
|
|
||||||
$container = new phpbb_mock_container_builder;
|
|
||||||
$container->set('text_formatter.s9e.factory', $factory);
|
|
||||||
|
|
||||||
$parser = new \phpbb\textformatter\s9e\parser(
|
$parser = new \phpbb\textformatter\s9e\parser(
|
||||||
new phpbb_mock_cache,
|
new phpbb_mock_cache,
|
||||||
'_foo_parser',
|
'_foo_parser',
|
||||||
$this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
|
$this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
|
||||||
$container
|
$factory
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->assertSame('<t>test</t>', $parser->parse('test'));
|
$this->assertSame('<t>test</t>', $parser->parse('test'));
|
||||||
|
@ -104,11 +113,15 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
|
||||||
$cache = new phpbb_mock_cache;
|
$cache = new phpbb_mock_cache;
|
||||||
$cache->put('_foo_parser', $mock);
|
$cache->put('_foo_parser', $mock);
|
||||||
|
|
||||||
|
$factory = $this->getMockBuilder('phpbb\\textformatter\\s9e\\factory')
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
|
|
||||||
$parser = new \phpbb\textformatter\s9e\parser(
|
$parser = new \phpbb\textformatter\s9e\parser(
|
||||||
$cache,
|
$cache,
|
||||||
'_foo_parser',
|
'_foo_parser',
|
||||||
$this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
|
$this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock(),
|
||||||
new phpbb_mock_container_builder
|
$factory
|
||||||
);
|
);
|
||||||
|
|
||||||
call_user_func_array(array($parser, $adapter_method), (array) $adapter_arg);
|
call_user_func_array(array($parser, $adapter_method), (array) $adapter_arg);
|
||||||
|
|
|
@ -33,14 +33,16 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
|
||||||
->with('_foo_renderer')
|
->with('_foo_renderer')
|
||||||
->will($this->returnValue(array('class' => 'renderer_foo', 'renderer' => serialize($mock))));
|
->will($this->returnValue(array('class' => 'renderer_foo', 'renderer' => serialize($mock))));
|
||||||
|
|
||||||
$container = new phpbb_mock_container_builder;
|
$factory = $this->getMockBuilder('phpbb\\textformatter\\s9e\\factory')
|
||||||
$container->set('text_formatter.s9e.factory', $factory);
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
|
$factory->expects($this->never())->method('regenerate');
|
||||||
|
|
||||||
$renderer = new \phpbb\textformatter\s9e\renderer(
|
$renderer = new \phpbb\textformatter\s9e\renderer(
|
||||||
$cache,
|
$cache,
|
||||||
$this->get_cache_dir(),
|
$this->get_cache_dir(),
|
||||||
'_foo_renderer',
|
'_foo_renderer',
|
||||||
$container
|
$factory
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,19 +56,18 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
|
||||||
->with('_foo_renderer')
|
->with('_foo_renderer')
|
||||||
->will($this->returnValue(false));
|
->will($this->returnValue(false));
|
||||||
|
|
||||||
$factory = $this->getMock('stdClass', array('regenerate'));
|
$factory = $this->getMockBuilder('phpbb\\textformatter\\s9e\\factory')
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
$factory->expects($this->once())
|
$factory->expects($this->once())
|
||||||
->method('regenerate')
|
->method('regenerate')
|
||||||
->will($this->returnValue(array($mock, false)));
|
->will($this->returnValue(array($mock, false)));
|
||||||
|
|
||||||
$container = new phpbb_mock_container_builder;
|
|
||||||
$container->set('text_formatter.s9e.factory', $factory);
|
|
||||||
|
|
||||||
$renderer = new \phpbb\textformatter\s9e\renderer(
|
$renderer = new \phpbb\textformatter\s9e\renderer(
|
||||||
$cache,
|
$cache,
|
||||||
$this->get_cache_dir(),
|
$this->get_cache_dir(),
|
||||||
'_foo_renderer',
|
'_foo_renderer',
|
||||||
$container
|
$factory
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue