diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-02-18 14:11:48 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-02-18 14:11:48 -0600 |
| commit | 7015fc8a00da40212e934ca4a499554e9289488a (patch) | |
| tree | aa8d1f071e865ca4455b475da9f7fab5152259ed /tests/pagination/pagination_test.php | |
| parent | 74d2d6c66a37afc5825190c1f4fd8a97bdf1fbaa (diff) | |
| parent | c7efadc26df3cec35a0aede4bd2b7ec75c28827d (diff) | |
| download | forums-7015fc8a00da40212e934ca4a499554e9289488a.tar forums-7015fc8a00da40212e934ca4a499554e9289488a.tar.gz forums-7015fc8a00da40212e934ca4a499554e9289488a.tar.bz2 forums-7015fc8a00da40212e934ca4a499554e9289488a.tar.xz forums-7015fc8a00da40212e934ca4a499554e9289488a.zip | |
Merge pull request #2002 from prototech/ticket/12153
[ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
Diffstat (limited to 'tests/pagination/pagination_test.php')
| -rw-r--r-- | tests/pagination/pagination_test.php | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php index 4e8083b47f..4c658cbd56 100644 --- a/tests/pagination/pagination_test.php +++ b/tests/pagination/pagination_test.php @@ -38,6 +38,9 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case 10, 10, 'pagination + :per_page:10 + :current_page:2 + :base_url:page.php :previous::page.php :else:1:page.php :current:2:page.php?start=10 @@ -57,6 +60,9 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case 10, 20, 'pagination + :per_page:10 + :current_page:3 + :base_url:page.php :previous::page.php?start=10 :else:1:page.php :else:2:page.php?start=10 @@ -77,6 +83,9 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case 10, 10, 'pagination + :per_page:10 + :current_page:2 + :base_url:test/page/%d :previous::test :else:1:test :current:2:test/page/2 @@ -96,6 +105,9 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case 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 @@ -127,15 +139,10 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case { return array( array( - 'page.php', 10, 10, 0, 'PAGE_OF-1-1', - 'on_page - per_page:10 - on_page:1 - base_url:page.php', ), ); } @@ -143,13 +150,9 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case /** * @dataProvider on_page_data */ - public function test_on_page($base_url, $num_items, $per_page, $start_item, $expect_return, $expect) + public function test_on_page($num_items, $per_page, $start_item, $expect_return) { - $this->assertEquals($expect_return, $this->pagination->on_page($base_url, $num_items, $per_page, $start_item)); - - $this->template->set_filenames(array('test' => 'on_page.html')); - - $this->assertEquals(str_replace("\t", '', $expect), $this->display('test')); + $this->assertEquals($expect_return, $this->pagination->on_page($num_items, $per_page, $start_item)); } public function validate_start_data() |