X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fsystem%2Ftests%2Fsrc%2FFunctional%2FDatabase%2FTemporaryQueryTest.php;fp=web%2Fcore%2Fmodules%2Fsystem%2Fsrc%2FTests%2FDatabase%2FTemporaryQueryTest.php;h=52265857904accc14c5dd289a940598ee8cc3470;hp=d0dce74e46a252b0233fe86d3aef900e5df6cb22;hb=bfbba508964731508b9bd6d5835c2edc858db95b;hpb=cb9a80db11fc6b014e5b1e693a5a391c95eb5d9a

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 d0dce74e4..522658579 100644
--- 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
 
-namespace Drupal\system\Tests\Database;
+namespace Drupal\Tests\system\Functional\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'];
 
@@ -28,7 +26,7 @@ class TemporaryQueryTest extends DatabaseWebTestBase {
    */
   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.');