summaryrefslogtreecommitdiff
path: root/modules/simpletest
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-08 07:43:55 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-08 07:43:55 +0000
commitc92ddd4cb8899b55166c8bf2ca0edd1d95783cbe (patch)
tree4eea15a0e5b48ce4b18e5eb919dc0987a3b31735 /modules/simpletest
parent85c680a1a0e4b0f48526a064eae94e4b77e0d303 (diff)
downloadbrdo-c92ddd4cb8899b55166c8bf2ca0edd1d95783cbe.tar.gz
brdo-c92ddd4cb8899b55166c8bf2ca0edd1d95783cbe.tar.bz2
#601768 by Crell and Damien Tournoud: Add a DatabaseStatementEmpty to allow complex query to return a proper empty set.
Diffstat (limited to 'modules/simpletest')
-rw-r--r--modules/simpletest/tests/database_test.test53
1 files changed, 50 insertions, 3 deletions
diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test
index 3862f16c0..4af00e69f 100644
--- a/modules/simpletest/tests/database_test.test
+++ b/modules/simpletest/tests/database_test.test
@@ -1889,19 +1889,19 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
$query->fields('test');
$query->orderBy('name');
$count = $query->countQuery();
-
+
// Check that the 'all_fields' statement is handled properly.
$tables = $query->getTables();
$this->assertEqual($tables['test']['all_fields'], 1, t('Query correctly sets \'all_fields\' statement.'));
$tables = $count->getTables();
- $this->assertFalse(isset($tables['test']['all_fields']), t('Count query correctly unsets \'all_fields\' statement.'));
+ $this->assertFalse(isset($tables['test']['all_fields']), t('Count query correctly unsets \'all_fields\' statement.'));
// Check that the ordering clause is handled properly.
$orderby = $query->getOrderBy();
$this->assertEqual($orderby['name'], 'ASC', t('Query correctly sets ordering clause.'));
$orderby = $count->getOrderBy();
$this->assertFalse(isset($orderby['name']), t('Count query correctly unsets ordering caluse.'));
-
+
// Make sure that the count query works.
$count = $count->execute()->fetchField();
@@ -3155,3 +3155,50 @@ class DatabaseNextIdCase extends DrupalWebTestCase {
$this->assertEqual($result, 1001, t('Sequence provides a larger number than the existing ID.'));
}
}
+
+/**
+ * Tests the empty pseudo-statement class.
+ */
+class DatabaseEmptyStatementTestCase extends DrupalWebTestCase {
+ function getInfo() {
+ return array(
+ 'name' => t('Empty statement'),
+ 'description' => t('Test the empty pseudo-statement class.'),
+ 'group' => t('Database'),
+ );
+ }
+
+ /**
+ * Test that the empty result set behaves as empty.
+ */
+ function testEmpty() {
+ $result = new DatabaseStatementEmpty();
+
+ $this->assertTrue($result instanceof DatabaseStatementInterface, t('Class implements expected interface'));
+ $this->assertNull($result->fetchObject(), t('Null result returned.'));
+ }
+
+ /**
+ * Test that the empty result set iterates safely.
+ */
+ function testEmptyIteration() {
+ $result = new DatabaseStatementEmpty();
+
+ foreach ($result as $record) {
+ $this->fail(t('Iterating empty result set should not iterate.'));
+ return;
+ }
+
+ $this->pass(t('Iterating empty result set skipped iteration.'));
+ }
+
+ /**
+ * Test that the empty result set mass-fetches in an expected way.
+ */
+ function testEmptyFetchAll() {
+ $result = new DatabaseStatementEmpty();
+
+ $this->assertEqual($result->fetchAll(), array(), t('Empty array returned from empty result set.'));
+ }
+
+}