1 files changed, 110 insertions, 36 deletions
diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php
index b7a4f101aa..6a3b46cdae 100644
--- a/tests/pagination/pagination_test.php
+++ b/tests/pagination/pagination_test.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package testing
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -21,11 +25,41 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 	public function setUp()
 	{
 		parent::setUp();
-		$user = $this->getMock('\phpbb\user');
-		$user->expects($this->any())
+
+		global $phpbb_dispatcher, $phpbb_root_path, $phpEx;
+
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$this->user = $this->getMock('\phpbb\user', array(), array(
+			new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
+			'\phpbb\datetime'
+		));
+		$this->user->expects($this->any())
 			->method('lang')
 			->will($this->returnCallback(array($this, 'return_callback_implode')));
-		$this->pagination = new \phpbb\pagination($this->template, $user);
+
+		$filesystem = new \phpbb\filesystem\filesystem();
+		$manager = new phpbb_mock_extension_manager(dirname(__FILE__) . '/', array());
+
+		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1'));
+
+		$loader = new \Symfony\Component\Routing\Loader\YamlFileLoader(
+			new \phpbb\routing\file_locator($filesystem, dirname(__FILE__) . '/')
+		);
+		$resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $manager);
+		$router = new phpbb_mock_router(new phpbb_mock_container_builder(), $resources_locator, $loader, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT);
+
+		$request = new phpbb_mock_request();
+		$request->overwrite('SCRIPT_NAME', '/app.php', \phpbb\request\request_interface::SERVER);
+		$request->overwrite('SCRIPT_FILENAME', 'app.php', \phpbb\request\request_interface::SERVER);
+		$request->overwrite('REQUEST_URI', '/app.php', \phpbb\request\request_interface::SERVER);
+
+		$symfony_request = new \phpbb\symfony_request(
+			$request
+		);
+
+		$this->routing_helper = new \phpbb\routing\helper($this->config, $router, $symfony_request, $request, $filesystem, '', 'php');
+		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $symfony_request, $request, $this->routing_helper);
+		$this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper, $phpbb_dispatcher);
 	}
 
 	public function generate_template_pagination_data()
@@ -69,7 +103,6 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 				:current:3:page.php?start=20
 				:else:4:page.php?start=30
 				:else:5:page.php?start=40
-				:else:6:page.php?start=50
 				:ellipsis:9:page.php?start=80
 				:else:10:page.php?start=90
 				:next::page.php?start=30
@@ -77,49 +110,54 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 				:u_next:page.php?start=30',
 			),
 			array(
-				'test/page/%d',
-				'/page/%d',
+				array('routes' => array(
+					'core_controller',
+					'core_page_controller',
+				)),
+				'page',
 				95,
 				10,
 				10,
 				'pagination
 				:per_page:10
 				:current_page:2
-				:base_url:test/page/%d
-				:previous::test
-				:else:1:test
-				:current:2:test/page/2
-				:else:3:test/page/3
-				:else:4:test/page/4
-				:else:5:test/page/5
-				:ellipsis:9:test/page/9
-				:else:10:test/page/10
-				:next::test/page/3
-				:u_prev:test
-				:u_next:test/page/3',
+				:base_url:
+				:previous::/test
+				:else:1:/test
+				:current:2:/test/page/2
+				:else:3:/test/page/3
+				:else:4:/test/page/4
+				:else:5:/test/page/5
+				:ellipsis:9:/test/page/9
+				:else:10:/test/page/10
+				:next::/test/page/3
+				:u_prev:/test
+				:u_next:/test/page/3',
 			),
 			array(
-				'test/page/%d',
-				'/page/%d',
+				array('routes' => array(
+					'core_controller',
+					'core_page_controller',
+				)),
+				'page',
 				95,
 				10,
 				20,
 				'pagination
 				:per_page:10
 				:current_page:3
-				:base_url:test/page/%d
-				:previous::test/page/2
-				:else:1:test
-				:else:2:test/page/2
-				:current:3:test/page/3
-				:else:4:test/page/4
-				:else:5:test/page/5
-				:else:6:test/page/6
-				:ellipsis:9:test/page/9
-				:else:10:test/page/10
-				:next::test/page/4
-				:u_prev:test/page/2
-				:u_next:test/page/4',
+				:base_url:
+				:previous::/test/page/2
+				:else:1:/test
+				:else:2:/test/page/2
+				:current:3:/test/page/3
+				:else:4:/test/page/4
+				:else:5:/test/page/5
+				:ellipsis:9:/test/page/9
+				:else:10:/test/page/10
+				:next::/test/page/4
+				:u_prev:/test/page/2
+				:u_next:/test/page/4',
 			),
 		);
 	}
@@ -135,6 +173,42 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 		$this->assertEquals(str_replace("\t", '', $expect), $this->display('test'));
 	}
 
+	/**
+	 * @dataProvider generate_template_pagination_data
+	 */
+	public function test_generate_template_pagination_sub($base_url, $start_name, $num_items, $per_page, $start_item, $expect)
+	{
+		// Block needs to be assigned before pagination
+		$this->template->assign_block_vars('sub', array(
+			'FOO'		=> 'bar',
+		));
+
+		$this->pagination->generate_template_pagination($base_url, 'sub.pagination', $start_name, $num_items, $per_page, $start_item);
+		$this->template->set_filenames(array('test' => 'pagination_sub.html'));
+
+		$this->assertEquals(str_replace("\t", '', $expect), $this->display('test'));
+	}
+
+	/**
+	 * @dataProvider generate_template_pagination_data
+	 */
+	public function test_generate_template_pagination_double_nested($base_url, $start_name, $num_items, $per_page, $start_item, $expect)
+	{
+		// Block needs to be assigned before pagination
+		$this->template->assign_block_vars('sub', array(
+			'FOO'		=> 'bar',
+		));
+
+		$this->template->assign_block_vars('sub.level2', array(
+			'BAR'		=> 'foo',
+		));
+
+		$this->pagination->generate_template_pagination($base_url, 'sub.level2.pagination', $start_name, $num_items, $per_page, $start_item);
+		$this->template->set_filenames(array('test' => 'pagination_double_nested.html'));
+
+		$this->assertEquals(str_replace("\t", '', $expect), $this->display('test'));
+	}
+
 	public function on_page_data()
 	{
 		return array(