Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1825568 by alexpott, fago, Berdir: Fixed Random test failure in Drupal\system\Tests\Entity\EntityFormTest.

8.0.x
webchick 2012-10-29 12:38:10 -07:00
parent 933b67c4f8
commit 3b4548f90a
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/lib/Drupal/Core/Entity/Field/Type/Field.php
View File

@ -68,16 +68,12 @@ class Field extends TypedData implements IteratorAggregate, FieldInterface {
* An array of values of the field items.
*/
public function setValue($values) {
// Support passing in only the value of the first item.
if (!is_array($values) || (!empty($values) && !is_numeric(current(array_keys($values))))) {
$values = array(0 => $values);
}
if (isset($values) && $values !== array()) {
// Support passing in only the value of the first item.
if (!is_array($values) || !is_numeric(current(array_keys($values)))) {
$values = array(0 => $values);
}
if (!is_array($values)) {
throw new InvalidArgumentException("An entity field requires a numerically indexed array of items as value.");
}
if (!empty($values)) {
if (!is_array($values)) {
throw new InvalidArgumentException("An entity field requires a numerically indexed array of items as value.");
}

19
core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php
View File

@ -210,6 +210,16 @@ class EntityFieldTest extends WebTestBase {
$this->assertEqual(count(iterator_to_array($entity->name->getIterator())), count($entity->name), 'Count matches iterator count.');
$this->assertTrue($entity->name->getValue() === array(0 => NULL), 'Name field value contains a NULL value.');
// Test removing all list items by assigning an empty array.
$entity->name = array();
$this->assertIdentical(count($entity->name), 0, 'Name field contains no items.');
$this->assertIdentical($entity->name->getValue(), array(), 'Name field value is an empty array.');
// Test removing all list items by setting it to NULL.
$entity->name = NULL;
$this->assertIdentical(count($entity->name), 0, 'Name field contains no items.');
$this->assertIdentical($entity->name->getValue(), array(), 'Name field value is an empty array.');
// Test get and set field values.
$entity->name = 'foo';
$this->assertEqual($entity->name[0]->getPropertyValues(), array('value' => 'foo'), 'Field value has been retrieved via getPropertyValue()');
@ -230,6 +240,15 @@ class EntityFieldTest extends WebTestBase {
));
$this->assertNotNull($entity->user_id->value, 'User id is not NULL');
$this->assertIdentical($entity->user_id->value, 0, 'User id has been set to 0');
// Test setting the ID with the value only.
$entity = entity_create('entity_test', array(
'name' => $name_item,
'user_id' => 0,
'field_test_text' => $text_item,
));
$this->assertNotNull($entity->user_id->value, 'User id is not NULL');
$this->assertIdentical($entity->user_id->value, 0, 'User id has been set to 0');
}
/**

9
core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php
View File

@ -171,15 +171,6 @@ class EntityTranslationTest extends WebTestBase {
$entity->getTranslation($this->langcodes[1], FALSE)->set($field_name, array(0 => array('value' => 'default value2')));
// Get the value.
$this->assertEqual($entity->get($field_name)->value, 'default value2', 'Untranslated value set into a translation in non-strict mode.');
// Test setting the user_id to 0 using setValue method.
$entity = entity_create('entity_test', array(
'name' => 'test',
'user_id' => $GLOBALS['user']->uid,
));
$translation = $entity->getTranslation($this->langcodes[1], FALSE);
$translation->user_id->setValue(0);
$this->assertIdentical($entity->get('user_id')->value, 0);
}
/**