diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php index 3929649..5523518 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php @@ -97,35 +97,22 @@ public function testPreviewWithPagersUI() { $this->assertTrue(!empty($elements), 'Full pager found.'); // Verify elements and links to pages. - foreach ($elements as $page => $element) { - // Make element/page index 1-based. - $page++; - // We expect to find 5 elements: current page == 1, links to pages 2 and - // and 3, links to 'next >' and 'last >>' pages. - switch ($page) { - case 1: - $this->assertClass($element, 'pager-current', 'Element for current page has .pager-current class.'); - $this->assertFalse(isset($element->a), 'Element for current page has no link.'); - break; - - case 2: - case 3: - $this->assertClass($element, 'pager-item', "Element for page $page has .pager-item class."); - $this->assertTrue($element->a, "Link to page $page found."); - break; - - case 4: - $this->assertClass($element, 'pager-next', "Element for next page has .pager-next class."); - $this->assertTrue($element->a, "Link to next page found."); - break; - - case 5: - $this->assertClass($element, 'pager-last', "Element for last page has .pager-last class."); - $this->assertTrue($element->a, "Link to last page found."); - break; - - } - } + // We expect to find 5 elements: current page == 1, links to pages 2 and + // and 3, links to 'next >' and 'last >>' pages. + $this->assertClass($elements[0], 'pager-current', 'Element for current page has .pager-current class.'); + $this->assertFalse(isset($elements[0]->a), 'Element for current page has no link.'); + + $this->assertClass($elements[1], 'pager-item', "Element for page 2 has .pager-item class."); + $this->assertTrue($elements[1]->a, "Link to page 2 found."); + + $this->assertClass($elements[2], 'pager-item', "Element for page 3 has .pager-item class."); + $this->assertTrue($elements[2]->a, "Link to page 3 found."); + + $this->assertClass($elements[3], 'pager-next', "Element for next page has .pager-next class."); + $this->assertTrue($elements[3]->a, "Link to next page found."); + + $this->assertClass($elements[4], 'pager-last', "Element for last page has .pager-last class."); + $this->assertTrue($elements[4]->a, "Link to last page found."); // Test Mini Pager. $this->getPreviewAJAX('test_mini_pager', 'default', 3); @@ -135,29 +122,16 @@ public function testPreviewWithPagersUI() { $this->assertTrue(!empty($elements), 'Mini pager found.'); // Verify elements and links to pages. - foreach ($elements as $page => $element) { - // Make element/page index 1-based. - $page++; - // We expect to find 3 elements: previous page (with no link), current page == 1, - // and link to 'next >' page. - switch ($page) { - case 1: - $this->assertClass($element, 'pager-previous', 'Element for previous page has .pager-previous class.'); - $this->assertFalse(isset($element->a), 'Element for previous page has no link.'); - break; - - case 2: - $this->assertClass($element, 'pager-current', 'Element for current page has .pager-current class.'); - $this->assertFalse(isset($element->a), 'Element for current page has no link.'); - break; - - case 3: - $this->assertClass($element, 'pager-next', "Element for next page has .pager-next class."); - $this->assertTrue($element->a, "Link to next page found."); - break; - - } - } + // We expect to find 3 elements: previous and current pages, with no link, + // and next page with a link. + $this->assertClass($elements[0], 'pager-previous', 'Element for previous page has .pager-previous class.'); + $this->assertFalse(isset($elements[0]->a), 'Element for previous page has no link.'); + + $this->assertClass($elements[1], 'pager-current', 'Element for current page has .pager-current class.'); + $this->assertFalse(isset($elements[1]->a), 'Element for current page has no link.'); + + $this->assertClass($elements[2], 'pager-next', "Element for next page has .pager-next class."); + $this->assertTrue($elements[2]->a, "Link to next page found."); } /**