Merge branch '7.x' of git.drupal.org:project/drupal into 7.x

1 files changed, 2 insertions, 16 deletions

diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test
index 91a51f361..87d386aa7 100644
--- a/modules/simpletest/tests/database_test.test
+++ b/modules/simpletest/tests/database_test.test
@@ -1454,23 +1454,9 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that a comparison with NULL is always FALSE.
-   */
-  function testNullCondition() {
-    $this->ensureSampleDataNull();
-
-    $names = db_select('test_null', 'tn')
-      ->fields('tn', array('name'))
-      ->condition('age', NULL)
-      ->execute()->fetchCol();
-
-    $this->assertEqual(count($names), 0, t('No records found when comparing to NULL.'));
-  }
-
-  /**
    * Test that we can find a record with a NULL value.
    */
-  function testIsNullCondition() {
+  function testNullCondition() {
     $this->ensureSampleDataNull();
 
     $names = db_select('test_null', 'tn')
@@ -1485,7 +1471,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   /**
    * Test that we can find a record without a NULL value.
    */
-  function testIsNotNullCondition() {
+  function testNotNullCondition() {
     $this->ensureSampleDataNull();
 
     $names = db_select('test_null', 'tn')