Upgraded drupal core with security updates

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

diff --git a/web/core/modules/system/src/Tests/Database/TemporaryQueryTest.php b/web/core/modules/system/tests/src/Functional/Database/TemporaryQueryTest.php
similarity index 90%
rename from web/core/modules/system/src/Tests/Database/TemporaryQueryTest.php
rename to web/core/modules/system/tests/src/Functional/Database/TemporaryQueryTest.php
index d0dce74e46a252b0233fe86d3aef900e5df6cb22..52265857904accc14c5dd289a940598ee8cc3470 100644 (file)
--- a/web/core/modules/system/src/Tests/Database/TemporaryQueryTest.php
+++ b/web/core/modules/system/tests/src/Functional/Database/TemporaryQueryTest.php
@@ -1,18 +1,16 @@
 <?php
 
 <?php
 

-namespace Drupal\system\Tests\Database;
+namespace Drupal\Tests\system\Functional\Database;

 
 /**
  * Tests the temporary query functionality.
  *
  * @group Database
  */
 
 /**
  * Tests the temporary query functionality.
  *
  * @group Database
  */

-class TemporaryQueryTest extends DatabaseWebTestBase {
+class TemporaryQueryTest extends DatabaseTestBase {

 
   /**
 
   /**

-   * Modules to enable.
-   *
-   * @var array
+   * {@inheritdoc}

    */
   public static $modules = ['database_test'];
 
    */
   public static $modules = ['database_test'];
 


@@ -28,7 +26,7 @@ class TemporaryQueryTest extends DatabaseWebTestBase {
    */
   public function testTemporaryQuery() {
     $this->drupalGet('database_test/db_query_temporary');
    */
   public function testTemporaryQuery() {
     $this->drupalGet('database_test/db_query_temporary');

-    $data = json_decode($this->getRawContent());
+    $data = json_decode($this->getSession()->getPage()->getContent());

     if ($data) {
       $this->assertEqual($this->countTableRows('test'), $data->row_count, 'The temporary table contains the correct amount of rows.');
       $this->assertFalse(db_table_exists($data->table_name), 'The temporary table is, indeed, temporary.');
     if ($data) {
       $this->assertEqual($this->countTableRows('test'), $data->row_count, 'The temporary table contains the correct amount of rows.');
       $this->assertFalse(db_table_exists($data->table_name), 'The temporary table is, indeed, temporary.');