From 0138d8cbd73d13651a09f113b9828b418f466615 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Wed, 23 May 2018 02:54:42 -0700
Subject: [PATCH] Flesh out PagerTest

---
 system/Pager/Views/default_full.php |  20 ++--
 tests/system/Pager/PagerTest.php    | 148 ++++++++++++++++------------
 2 files changed, 97 insertions(+), 71 deletions(-)

diff --git a/system/Pager/Views/default_full.php b/system/Pager/Views/default_full.php
index 5f57afcfe8d9..4eb10aa79235 100644
--- a/system/Pager/Views/default_full.php
+++ b/system/Pager/Views/default_full.php
@@ -3,16 +3,16 @@
 <nav aria-label="<?= lang('Pager.pageNavigation') ?>">
 	<ul class="pagination">
 		<?php if ($pager->hasPrevious()) : ?>
-		<li>
-			<a href="<?= $pager->getFirst() ?>" aria-label="<?= lang('Pager.first') ?>">
-				<span aria-hidden="true"><?= lang('Pager.first') ?></span>
-			</a>
-		</li>
-		<li>
-			<a href="<?= $pager->getPrevious() ?>" aria-label="<?= lang('Pager.previous') ?>">
-				<span aria-hidden="true">&laquo;</span>
-			</a>
-		</li>
+			<li>
+				<a href="<?= $pager->getFirst() ?>" aria-label="<?= lang('Pager.first') ?>">
+					<span aria-hidden="true"><?= lang('Pager.first') ?></span>
+				</a>
+			</li>
+			<li>
+				<a href="<?= $pager->getPrevious() ?>" aria-label="<?= lang('Pager.previous') ?>">
+					<span aria-hidden="true">&laquo;</span>
+				</a>
+			</li>
 		<?php endif ?>
 
 		<?php foreach ($pager->links() as $link) : ?>
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 558a4d97bb54..b4ae11a8e893 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -9,6 +9,7 @@
  */
 class PagerTest extends \CIUnitTestCase
 {
+
 	/**
 	 * @var \CodeIgniter\Pager\Pager
 	 */
@@ -17,52 +18,52 @@ class PagerTest extends \CIUnitTestCase
 
 	public function __construct()
 	{
-	    parent::__construct();
+		parent::__construct();
 		helper('url');
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function setUp()
 	{
 		$_SERVER['HTTP_HOST'] = 'example.com';
 		$_GET = [];
 		$this->config = new Pager();
-	    $this->pager = new \CodeIgniter\Pager\Pager($this->config, Services::renderer());
+		$this->pager = new \CodeIgniter\Pager\Pager($this->config, Services::renderer());
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testSetPathRemembersPath()
 	{
-	    $this->pager->setPath('foo/bar');
+		$this->pager->setPath('foo/bar');
 
 		$details = $this->pager->getDetails();
 
 		$this->assertEquals('foo/bar', $details['uri']->getPath());
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetDetailsRecognizesPageQueryVar()
 	{
 		$_GET['page'] = 2;
 
-		// Need this to create the group.
+// Need this to create the group.
 		$this->pager->setPath('foo/bar');
 
-	    $details = $this->pager->getDetails();
+		$details = $this->pager->getDetails();
 
 		$this->assertEquals(2, $details['currentPage']);
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetDetailsRecognizesGroupedPageQueryVar()
 	{
 		$_GET['page_foo'] = 2;
 
-		// Need this to create the group.
+// Need this to create the group.
 		$this->pager->setPath('foo/bar', 'foo');
 
 		$details = $this->pager->getDetails('foo');
@@ -70,20 +71,20 @@ public function testGetDetailsRecognizesGroupedPageQueryVar()
 		$this->assertEquals(2, $details['currentPage']);
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetDetailsThrowExceptionIfGroupNotFound()
 	{
-	    $this->expectException(PagerException::class);
+		$this->expectException(PagerException::class);
 
 		$this->pager->getDetails('foo');
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testDetailsHasConfiguredPerPageValue()
 	{
-		// Need this to create the group.
+// Need this to create the group.
 		$this->pager->setPath('foo/bar', 'foo');
 
 		$details = $this->pager->getDetails('foo');
@@ -91,7 +92,7 @@ public function testDetailsHasConfiguredPerPageValue()
 		$this->assertEquals($this->config->perPage, $details['perPage']);
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testStoreDoesBasicCalcs()
 	{
@@ -104,7 +105,7 @@ public function testStoreDoesBasicCalcs()
 		$this->assertEquals($details['currentPage'], 3);
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testStoreAndHasMore()
 	{
@@ -113,7 +114,7 @@ public function testStoreAndHasMore()
 		$this->assertTrue($this->pager->hasMore('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testStoreAndHasMoreCanBeFalse()
 	{
@@ -122,21 +123,21 @@ public function testStoreAndHasMoreCanBeFalse()
 		$this->assertFalse($this->pager->hasMore('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testHasMoreDefaultsToFalse()
 	{
 		$this->assertFalse($this->pager->hasMore('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testPerPageHasDefaultValue()
 	{
-	    $this->assertEquals($this->config->perPage, $this->pager->getPerPage());
+		$this->assertEquals($this->config->perPage, $this->pager->getPerPage());
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testPerPageKeepsStoredValue()
 	{
@@ -145,14 +146,14 @@ public function testPerPageKeepsStoredValue()
 		$this->assertEquals(13, $this->pager->getPerPage('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetCurrentPageDefaultsToOne()
 	{
 		$this->assertEquals(1, $this->pager->getCurrentPage());
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetCurrentPageRemembersStoredPage()
 	{
@@ -161,7 +162,7 @@ public function testGetCurrentPageRemembersStoredPage()
 		$this->assertEquals(3, $this->pager->getCurrentPage('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetCurrentPageDetectsURI()
 	{
@@ -170,7 +171,7 @@ public function testGetCurrentPageDetectsURI()
 		$this->assertEquals(2, $this->pager->getCurrentPage());
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetCurrentPageDetectsGroupedURI()
 	{
@@ -179,14 +180,14 @@ public function testGetCurrentPageDetectsGroupedURI()
 		$this->assertEquals(2, $this->pager->getCurrentPage('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetTotalPagesDefaultsToOne()
 	{
-	    $this->assertEquals(1, $this->pager->getPageCount());
+		$this->assertEquals(1, $this->pager->getPageCount());
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetTotalPagesCalcsCorrectValue()
 	{
@@ -195,7 +196,7 @@ public function testGetTotalPagesCalcsCorrectValue()
 		$this->assertEquals(6, $this->pager->getPageCount('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetNextURIUsesCurrentURI()
 	{
@@ -204,12 +205,12 @@ public function testGetNextURIUsesCurrentURI()
 		$this->pager->store('foo', 2, 12, 70);
 
 		$expected = current_url(true);
-		$expected = (string)$expected->setQuery('page=3');
+		$expected = (string) $expected->setQuery('page=3');
 
-		$this->assertEquals((string)$expected, $this->pager->getNextPageURI('foo'));
+		$this->assertEquals((string) $expected, $this->pager->getNextPageURI('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetNextURIReturnsNullOnLastPage()
 	{
@@ -218,19 +219,19 @@ public function testGetNextURIReturnsNullOnLastPage()
 		$this->assertNull($this->pager->getNextPageURI('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetNextURICorrectOnFirstPage()
 	{
 		$this->pager->store('foo', 1, 12, 70);
 
 		$expected = current_url(true);
-		$expected = (string)$expected->setQuery('page=2');
+		$expected = (string) $expected->setQuery('page=2');
 
 		$this->assertEquals($expected, $this->pager->getNextPageURI('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetPreviousURIUsesCurrentURI()
 	{
@@ -239,12 +240,12 @@ public function testGetPreviousURIUsesCurrentURI()
 		$this->pager->store('foo', 2, 12, 70);
 
 		$expected = current_url(true);
-		$expected = (string)$expected->setQuery('page=1');
+		$expected = (string) $expected->setQuery('page=1');
 
-		$this->assertEquals((string)$expected, $this->pager->getPreviousPageURI('foo'));
+		$this->assertEquals((string) $expected, $this->pager->getPreviousPageURI('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetNextURIReturnsNullOnFirstPage()
 	{
@@ -253,49 +254,49 @@ public function testGetNextURIReturnsNullOnFirstPage()
 		$this->assertNull($this->pager->getPreviousPageURI('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetNextURIWithQueryStringUsesCurrentURI()
 	{
 		$_GET = [
-			'page' => 3,
+			'page'	 => 3,
 			'status' => 1
 		];
 
 		$expected = current_url(true);
-		$expected = (string)$expected->setQueryArray($_GET);
+		$expected = (string) $expected->setQueryArray($_GET);
 
-		$this->pager->store('foo', $_GET['page']-1, 12, 70);
+		$this->pager->store('foo', $_GET['page'] - 1, 12, 70);
 
-		$this->assertEquals((string)$expected, $this->pager->getNextPageURI('foo'));
+		$this->assertEquals((string) $expected, $this->pager->getNextPageURI('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetPreviousURIWithQueryStringUsesCurrentURI()
 	{
 		$_GET = [
-			'page' => 1,
+			'page'	 => 1,
 			'status' => 1
 		];
 		$expected = current_url(true);
-		$expected = (string)$expected->setQueryArray($_GET);
+		$expected = (string) $expected->setQueryArray($_GET);
 
-		$this->pager->store('foo', $_GET['page']+1, 12, 70);
+		$this->pager->store('foo', $_GET['page'] + 1, 12, 70);
 
-		$this->assertEquals((string)$expected, $this->pager->getPreviousPageURI('foo'));
+		$this->assertEquals((string) $expected, $this->pager->getPreviousPageURI('foo'));
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
 
 	public function testGetOnlyQueries()
 	{
 		$_GET = [
-			'page'     => 2,
-			'search'   => 'foo',
-			'order'    => 'asc',
-			'hello'    => 'xxx',
-			'category' => 'baz',
+			'page'		 => 2,
+			'search'	 => 'foo',
+			'order'		 => 'asc',
+			'hello'		 => 'xxx',
+			'category'	 => 'baz',
 		];
 		$onlyQueries = ['search', 'order'];
 
@@ -304,18 +305,43 @@ public function testGetOnlyQueries()
 		$uri = current_url(true);
 
 		$this->assertEquals(
-			$this->pager->only($onlyQueries)->getPreviousPageURI(),
-			(string)$uri->setQuery('search=foo&order=asc&page=1')
+				$this->pager->only($onlyQueries)->getPreviousPageURI(), (string) $uri->setQuery('search=foo&order=asc&page=1')
 		);
 		$this->assertEquals(
-			$this->pager->only($onlyQueries)->getNextPageURI(),
-			(string)$uri->setQuery('search=foo&order=asc&page=3')
+				$this->pager->only($onlyQueries)->getNextPageURI(), (string) $uri->setQuery('search=foo&order=asc&page=3')
 		);
 		$this->assertEquals(
-			$this->pager->only($onlyQueries)->getPageURI(4),
-			(string)$uri->setQuery('search=foo&order=asc&page=4')
+				$this->pager->only($onlyQueries)->getPageURI(4), (string) $uri->setQuery('search=foo&order=asc&page=4')
 		);
 	}
 
-	//--------------------------------------------------------------------
+//--------------------------------------------------------------------
+
+	public function testBadTemplate()
+	{
+		$this->expectException(PagerException::class);
+		$this->pager->links('default', 'bogus');
+	}
+
+//--------------------------------------------------------------------
+
+	// the tests below are looking for specific <ul> elements.
+	// not the most rigorous, but a start :-/
+	
+	public function testLinks()
+	{
+		$this->assertTrue(strpos($this->pager->links(), '<ul class="pagination">') > 0);
+	}
+
+	public function testSimpleLinks()
+	{
+		$this->assertTrue(strpos($this->pager->simpleLinks(), '<ul class="pager">') > 0);
+	}
+
+	public function testMakeLinks()
+	{
+		$actual = $this->pager->makeLinks(4,10,50);
+		$this->assertTrue(strpos($this->pager->makeLinks(4,10,50), '<ul class="pagination">') > 0);
+	}
+
 }