1 files changed, 16 insertions, 5 deletions

diff --git a/modules/simpletest/tests/registry.test b/modules/simpletest/tests/registry.test
index 0ef763920..97608bf8b 100644
--- a/modules/simpletest/tests/registry.test
+++ b/modules/simpletest/tests/registry.test
@@ -24,7 +24,7 @@ class RegistryParseFileTestCase extends DrupalWebTestCase {
   function testRegistryParseFile() {
     _registry_parse_file($this->fileName, $this->getFileContents());
     foreach (array('functionName', 'className', 'interfaceName') as $resource) {
-      $foundName = db_result(db_query("SELECT name FROM {registry} WHERE name = '%s'", $this->$resource));
+      $foundName = db_query('SELECT name FROM {registry} WHERE name = :name', array(':name' => $this->$resource))->fetchField();
       $this->assertTrue($this->$resource == $foundName, t('Resource "@resource" found.', array('@resource' => $this->$resource)));
     }
   }
@@ -75,11 +75,22 @@ class RegistryParseFilesTestCase extends DrupalWebTestCase {
       if ($fileType == 'existing_changed') {
         // Insert a record with a dodgy md5.
         $this->$fileType->fakeMD5 = md5($this->$fileType->contents . rand());
-        db_query("INSERT INTO {registry_file} (md5, filename) VALUES ('%s', '%s')", $this->$fileType->fakeMD5, $this->$fileType->fileName);
+        db_insert('registry_file')
+          ->fields(array(
+            'md5' => $this->$fileType->fakeMD5,
+            'filename' => $this->$fileType->fileName,
+          ))
+          ->execute();
 
         // Insert some fake resource records.
         foreach (array('function', 'class', 'interface') as $type) {
-          db_query("INSERT INTO {registry} (name, type, filename) VALUES ('%s', '%s', '%s')", $type . md5(rand()), $type, $this->$fileType->fileName);
+          db_insert('registry')
+            ->fields(array(
+              'name' => $type . md5(rand()),
+              'type' => $type,
+              'filename' => $this->$fileType->fileName,
+            ))
+            ->execute();
         }
       }
     }
@@ -93,11 +104,11 @@ class RegistryParseFilesTestCase extends DrupalWebTestCase {
     foreach ($this->fileTypes as $fileType) {
       // Test that we have all the right resources.
       foreach (array('functionName', 'className', 'interfaceName') as $resource) {
-        $foundName = db_result(db_query("SELECT name FROM {registry} WHERE name = '%s'", $this->$fileType->$resource));
+        $foundName = db_query('SELECT name FROM {registry} WHERE name = :name', array(':name' => $this->$fileType->$resource))->fetchField();
         $this->assertTrue($this->$fileType->$resource == $foundName, t('Resource "@resource" found.', array('@resource' => $this->$fileType->$resource)));
       }
       // Test that we have the right md5.
-      $md5 = db_result(db_query("SELECT md5 FROM {registry_file} WHERE filename = '%s'", $this->$fileType->fileName));
+      $md5 = db_query('SELECT md5 FROM {registry_file} WHERE filename = :filename', array(':filename' => $this->$fileType->fileName))->fetchField();
       $this->assertTrue(md5($this->$fileType->contents) == $md5, t('MD5 for "@filename" matched.' . $fileType . $md5, array('@filename' => $this->$fileType->fileName)));
     }
   }