diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-08-08 02:18:53 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-08-08 02:18:53 +0000 |
| commit | 66d31c52ba73e2216202ab2ee45e8f29d33164ea (patch) | |
| tree | 762fa8147bdb12b54ab132910ff8142c2f4739b8 /modules/field/tests | |
| parent | a9c9ef2d3010ac742e82542e3b0d0864cb9a9d25 (diff) | |
| download | brdo-66d31c52ba73e2216202ab2ee45e8f29d33164ea.tar.gz brdo-66d31c52ba73e2216202ab2ee45e8f29d33164ea.tar.bz2 | |
- Patch #423888 by mikeryan, Crell, drunken monkey: use subqueries for ->countQuery(), at least for MySQL.
Diffstat (limited to 'modules/field/tests')
| -rw-r--r-- | modules/field/tests/field.test | 10 | ||||
| -rw-r--r-- | modules/field/tests/field_test.module | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test index 7fbdba694..479b0a966 100644 --- a/modules/field/tests/field.test +++ b/modules/field/tests/field.test @@ -2639,8 +2639,7 @@ class FieldTranslationsTestCase extends FieldTestCase { field_create_instance($instance); $entity = field_test_create_stub_entity(1, 1, $this->instance['bundle']); - list(, , $bundle) = entity_extract_ids($entity_type, $entity); - $instances = field_info_instances($entity_type, $bundle); + $instances = field_info_instances($entity_type, $this->instance['bundle']); $enabled_languages = field_content_languages(); $languages = array(); @@ -2688,6 +2687,13 @@ class FieldTranslationsTestCase extends FieldTestCase { drupal_static_reset('field_language'); $langcode = field_language($entity_type, $entity, $this->field_name, $requested_language); $this->assertTrue(isset($entity->{$this->field_name}[$langcode]) && $langcode != $requested_language, t('The display language for the (single) field %field_name is %language.', array('%field_name' => $field_name, '%language' => $langcode))); + + // Test field_language() basic behavior without language fallback. + variable_set('field_test_language_fallback', FALSE); + $entity->{$this->field_name}[$requested_language] = mt_rand(1, 127); + drupal_static_reset('field_language'); + $display_language = field_language($entity_type, $entity, $this->field_name, $requested_language); + $this->assertEqual($display_language, $requested_language, t('Display language behave correctly when language fallback is disabled')); } /** diff --git a/modules/field/tests/field_test.module b/modules/field/tests/field_test.module index 2eac091e2..f615129ff 100644 --- a/modules/field/tests/field_test.module +++ b/modules/field/tests/field_test.module @@ -103,7 +103,9 @@ function field_test_field_available_languages_alter(&$languages, $context) { * Implements hook_field_language_alter(). */ function field_test_field_language_alter(&$display_language, $context) { - locale_field_language_fallback($display_language, $context['entity'], $context['language']); + if (variable_get('field_test_language_fallback', TRUE)) { + locale_field_language_fallback($display_language, $context['entity'], $context['language']); + } } /** |