diff options
Diffstat (limited to 'modules/field')
| -rw-r--r-- | modules/field/field.test | 10 | ||||
| -rw-r--r-- | modules/field/modules/text/text.test | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/modules/field/field.test b/modules/field/field.test index 86983e35b..49f763bfa 100644 --- a/modules/field/field.test +++ b/modules/field/field.test @@ -1373,7 +1373,7 @@ class FieldFormTestCase extends FieldTestCase { preg_match('|test-entity/(\d+)/edit|', $this->url, $match); $id = $match[1]; $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); - $entity = field_test_entity_load($id); + $entity = field_test_entity_test_load($id); $this->assertEqual($entity->{$this->field_name}[$langcode][0]['value'], $value, 'Field value was saved'); // Display edit form. @@ -1386,7 +1386,7 @@ class FieldFormTestCase extends FieldTestCase { $edit = array("{$this->field_name}[$langcode][0][value]" => $value); $this->drupalPost(NULL, $edit, t('Save')); $this->assertRaw(t('test_entity @id has been updated.', array('@id' => $id)), 'Entity was updated'); - $entity = field_test_entity_load($id); + $entity = field_test_entity_test_load($id); $this->assertEqual($entity->{$this->field_name}[$langcode][0]['value'], $value, 'Field value was updated'); // Empty the field. @@ -1394,7 +1394,7 @@ class FieldFormTestCase extends FieldTestCase { $edit = array("{$this->field_name}[$langcode][0][value]" => $value); $this->drupalPost('test-entity/' . $id . '/edit', $edit, t('Save')); $this->assertRaw(t('test_entity @id has been updated.', array('@id' => $id)), 'Entity was updated'); - $entity = field_test_entity_load($id); + $entity = field_test_entity_test_load($id); $this->assertIdentical($entity->{$this->field_name}, array(), 'Field was emptied'); } @@ -1420,7 +1420,7 @@ class FieldFormTestCase extends FieldTestCase { preg_match('|test-entity/(\d+)/edit|', $this->url, $match); $id = $match[1]; $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); - $entity = field_test_entity_load($id); + $entity = field_test_entity_test_load($id); $this->assertEqual($entity->{$this->field_name}[$langcode][0]['value'], $value, 'Field value was saved'); // Edit with missing required value. @@ -1500,7 +1500,7 @@ class FieldFormTestCase extends FieldTestCase { preg_match('|test-entity/(\d+)/edit|', $this->url, $match); $id = $match[1]; $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); - $entity = field_test_entity_load($id); + $entity = field_test_entity_test_load($id); ksort($field_values); $field_values = array_values($field_values); $this->assertIdentical($entity->{$this->field_name}[$langcode], $field_values, 'Field values were saved in the correct order'); diff --git a/modules/field/modules/text/text.test b/modules/field/modules/text/text.test index b4cc4dfef..2f903e201 100644 --- a/modules/field/modules/text/text.test +++ b/modules/field/modules/text/text.test @@ -115,7 +115,7 @@ class TextFieldTestCase extends DrupalWebTestCase { $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), t('Entity was created')); // Display the object. - $entity = field_test_entity_load($id); + $entity = field_test_entity_test_load($id); $entity->content = field_attach_view($entity_type, $entity); $this->content = drupal_render($entity->content); $this->assertText($value, 'Filtered tags are not displayed'); @@ -179,7 +179,7 @@ class TextFieldTestCase extends DrupalWebTestCase { $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), t('Entity was created')); // Display the object. - $entity = field_test_entity_load($id); + $entity = field_test_entity_test_load($id); $entity->content = field_attach_view($entity_type, $entity); $this->content = drupal_render($entity->content); $this->assertNoRaw($value, t('HTML tags are not displayed.')); @@ -212,7 +212,7 @@ class TextFieldTestCase extends DrupalWebTestCase { $this->assertRaw(t('test_entity @id has been updated.', array('@id' => $id)), t('Entity was updated')); // Display the object. - $entity = field_test_entity_load($id); + $entity = field_test_entity_test_load($id); $entity->content = field_attach_view($entity_type, $entity); $this->content = drupal_render($entity->content); $this->assertRaw($value, t('Value is displayed unfiltered')); |