Upgraded drupal core with security updates

[yaffs-website] / web / core / modules / system / tests / src / Functional / Database / SelectPagerDefaultTest.php

diff --git a/web/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php b/web/core/modules/system/tests/src/Functional/Database/SelectPagerDefaultTest.php
similarity index 89%
rename from web/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php
rename to web/core/modules/system/tests/src/Functional/Database/SelectPagerDefaultTest.php
index a264d33ea6099915632e0e655cd4bcf8c093c716..63e7e3163775f8e425ce0cc36dd9a2e73e039a06 100644 (file)
--- a/web/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php
+++ b/web/core/modules/system/tests/src/Functional/Database/SelectPagerDefaultTest.php
@@ -1,6 +1,7 @@
 <?php
 
-namespace Drupal\system\Tests\Database;
+namespace Drupal\Tests\system\Functional\Database;
+
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -8,7 +9,7 @@ use Symfony\Component\HttpFoundation\Request;
  *
  * @group Database
  */
-class SelectPagerDefaultTest extends DatabaseWebTestBase {
+class SelectPagerDefaultTest extends DatabaseTestBase {
 
   /**
    * Confirms that a pager query returns the correct results.
@@ -34,13 +35,13 @@ class SelectPagerDefaultTest extends DatabaseWebTestBase {
 
     for ($page = 0; $page <= $num_pages; ++$page) {
       $this->drupalGet('database_test/pager_query_even/' . $limit, ['query' => ['page' => $page]]);
-      $data = json_decode($this->getRawContent());
+      $data = json_decode($this->getSession()->getPage()->getContent());
 
       if ($page == $num_pages) {
         $correct_number = $count - ($limit * $page);
       }
 
-      $this->assertEqual(count($data->names), $correct_number, format_string('Correct number of records returned by pager: @number', ['@number' => $correct_number]));
+      $this->assertCount($correct_number, $data->names, format_string('Correct number of records returned by pager: @number', ['@number' => $correct_number]));
     }
   }
 
@@ -68,13 +69,13 @@ class SelectPagerDefaultTest extends DatabaseWebTestBase {
 
     for ($page = 0; $page <= $num_pages; ++$page) {
       $this->drupalGet('database_test/pager_query_odd/' . $limit, ['query' => ['page' => $page]]);
-      $data = json_decode($this->getRawContent());
+      $data = json_decode($this->getSession()->getPage()->getContent());
 
       if ($page == $num_pages) {
         $correct_number = $count - ($limit * $page);
       }
 
-      $this->assertEqual(count($data->names), $correct_number, format_string('Correct number of records returned by pager: @number', ['@number' => $correct_number]));
+      $this->assertCount($correct_number, $data->names, format_string('Correct number of records returned by pager: @number', ['@number' => $correct_number]));
     }
   }