summaryrefslogtreecommitdiff
path: root/modules/field/tests/field.test
diff options
context:
space:
mode:
Diffstat (limited to 'modules/field/tests/field.test')
-rw-r--r--modules/field/tests/field.test10
1 files changed, 8 insertions, 2 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'));
}
/**