From c68c3022fded23009ee1b4be7b97c1951ab7dd80 Mon Sep 17 00:00:00 2001
From: areke <markpklein@gmail.com>
Date: Fri, 13 Dec 2013 12:40:02 -1000
Subject: [PATCH] Stop using the old field_name property in
 TranslationTest.php

---
 .../lib/Drupal/field/Tests/TranslationTest.php     |   25 +++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
index a105e90..0749b85 100644
--- a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
@@ -82,7 +82,7 @@ function setUp() {
 
     $this->installConfig(array('language'));
 
-    $this->field_name = drupal_strtolower($this->randomName() . '_field_name');
+    $this->field_name = drupal_strtolower($this->randomName());
 
     $this->entity_type = 'entity_test';
 
@@ -93,16 +93,16 @@ function setUp() {
       'cardinality' => 4,
       'translatable' => TRUE,
     );
-    entity_create('field_entity', $this->field_definition)->save();
-    $this->field = field_read_field($this->entity_type, $this->field_name);
+    $this->field = entity_create('field_entity', $this->field_definition);
+    $this->field->save();
 
     $this->instance_definition = array(
       'field_name' => $this->field_name,
       'entity_type' => $this->entity_type,
       'bundle' => 'entity_test',
     );
-    entity_create('field_instance', $this->instance_definition)->save();
-    $this->instance = field_read_instance($this->entity_type, $this->field_name, $this->entity_type);
+    $this->instance = entity_create('field_instance', $this->instance_definition);
+    $this->instance->save();
 
     for ($i = 0; $i < 3; ++$i) {
       $language = new Language(array(
@@ -117,12 +117,6 @@ function setUp() {
    * Ensures that only valid values are returned by field_available_languages().
    */
   function testFieldAvailableLanguages() {
-    // Test 'translatable' fieldable info.
-    field_test_entity_info_translatable('entity_test', FALSE);
-    $field = clone($this->field);
-    $field->field_name .= '_untranslatable';
-    $field->save();
-
     // Enable field translations for the entity.
     field_test_entity_info_translatable('entity_test', TRUE);
 
@@ -139,9 +133,12 @@ function testFieldAvailableLanguages() {
     $this->assertFalse(in_array('en', $available_langcodes), format_string('%language was made unavailable.', array('%language' => 'en')));
 
     // Test field_available_languages() behavior for untranslatable fields.
-    $this->field->translatable = FALSE;
-    $this->field->save();
-    $available_langcodes = field_available_languages($this->entity_type, $this->field);
+    $field_definition = $this->field_definition;
+    $field_definition['name'] .= '_untranslatable';
+    $field_definition['translatable'] = FALSE;
+    $field = entity_create('field_entity', $field_definition);
+    $field->save();
+    $available_langcodes = field_available_languages($field->entity_type, $field);
     $this->assertTrue(count($available_langcodes) == 1 && $available_langcodes[0] === Language::LANGCODE_DEFAULT, 'For untranslatable fields only Language::LANGCODE_DEFAULT is available.');
   }
 
-- 
1.7.10.2 (Apple Git-33)