diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/simpletest/tests/database_test.test | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test index 5499cee43..8d400e68c 100644 --- a/modules/simpletest/tests/database_test.test +++ b/modules/simpletest/tests/database_test.test @@ -990,7 +990,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase { function testMergeInsert() { $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField(); - db_merge('test_people') + $result = db_merge('test_people') ->key(array('job' => 'Presenter')) ->fields(array( 'age' => 31, @@ -998,6 +998,8 @@ class DatabaseMergeTestCase extends DatabaseTestCase { )) ->execute(); + $this->assertEqual($result, MergeQuery::STATUS_INSERT, t('Insert status returned.')); + $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField(); $this->assertEqual($num_records_before + 1, $num_records_after, t('Merge inserted properly.')); @@ -1013,7 +1015,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase { function testMergeUpdate() { $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField(); - db_merge('test_people') + $result = db_merge('test_people') ->key(array('job' => 'Speaker')) ->fields(array( 'age' => 31, @@ -1021,6 +1023,8 @@ class DatabaseMergeTestCase extends DatabaseTestCase { )) ->execute(); + $this->assertEqual($result, MergeQuery::STATUS_UPDATE, t('Update status returned.')); + $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField(); $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.')); |