Index: modules/field/modules/field_sql_storage/field_sql_storage.test =================================================================== RCS file: /cvs/drupal/drupal/modules/field/modules/field_sql_storage/field_sql_storage.test,v retrieving revision 1.2 diff -u -p -r1.2 field_sql_storage.test --- modules/field/modules/field_sql_storage/field_sql_storage.test 31 Mar 2009 01:49:51 -0000 1.2 +++ modules/field/modules/field_sql_storage/field_sql_storage.test 14 Apr 2009 17:57:26 -0000 @@ -12,6 +12,29 @@ class FieldSqlStorageTestCase extends Dr function setUp() { parent::setUp('field_sql_storage', 'field', 'field_test'); + $this->field_name = drupal_strtolower($this->randomName() . '_field_name'); + $this->table = _field_sql_storage_tablename($this->field_name); + $this->revision_table = _field_sql_storage_revision_tablename($this->field_name); + $this->field = array('field_name' => $this->field_name, 'type' => 'test_field', 'cardinality' => 4); + field_create_field($this->field); + $this->instance = array( + 'field_name' => $this->field_name, + 'bundle' => 'test_bundle', + 'label' => $this->randomName() . '_label', + 'description' => $this->randomName() . '_description', + 'weight' => mt_rand(0, 127), + 'settings' => array( + 'test_instance_setting' => $this->randomName(), + ), + 'widget' => array( + 'type' => 'test_field_widget', + 'label' => 'Test Field', + 'settings' => array( + 'test_widget_setting' => $this->randomName(), + ) + ) + ); + field_create_instance($this->instance); } function testEntityTypeId() { @@ -26,4 +49,170 @@ class FieldSqlStorageTestCase extends Dr $this->assertEqual($t1, _field_sql_storage_etid('t1'), '_field_sql_storage_etid returns the same value for the first entity type'); $this->assertEqual($t2, _field_sql_storage_etid('t2'), '_field_sql_storage_etid returns the same value for the second entity type'); } + function testFieldAttachLoad() { + $entity_type = 'test_entity'; + $eid = 0; + + $etid = _field_sql_storage_etid($entity_type); + $columns = array('etid', 'entity_id', 'revision_id', 'delta', $this->field_name . '_value'); + + // Insert data for four revisions to the field revisions table + $query = db_insert($this->revision_table)->fields($columns); + for ($evid = 0; $evid < 4; ++$evid) { + $values[$evid] = array(); + // Note: we insert one extra value ('<=' instead of '<'). + for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { + $value = mt_rand(1, 127); + $values[$evid][] = $value; + $query->values(array($etid, $eid, $evid, $delta, $value)); + } + } + $query->execute(); + + // Insert data for the "most current revision" into the field table + $query = db_insert($this->table)->fields($columns); + foreach ($values[0] as $delta => $value) { + $query->values(array($etid, $eid, 0, $delta, $value)); + } + $query->execute(); + + // Load the "most current revision" + $entity = field_test_create_stub_entity($eid, 0, $this->instance['bundle']); + field_attach_load($entity_type, array($eid => $entity)); + foreach ($values[0] as $delta => $value) { + if ($delta < $this->field['cardinality']) { + $this->assertEqual($entity->{$this->field_name}[$delta]['value'], $value, "Value $delta is loaded correctly for current revision"); + } + else { + $this->assertFalse(array_key_exists($delta, $entity->{$this->field_name}), "No extraneous value gets loaded for current revision."); + } + } + + // Load every revision + for ($evid = 0; $evid < 4; ++$evid) { + $entity = field_test_create_stub_entity($eid, $evid, $this->instance['bundle']); + field_attach_load_revision($entity_type, array($eid => $entity)); + foreach ($values[$evid] as $delta => $value) { + if ($delta < $this->field['cardinality']) { + $this->assertEqual($entity->{$this->field_name}[$delta]['value'], $value, "Value $delta for revision $evid is loaded correctly"); + } + else { + $this->assertFalse(array_key_exists($delta, $entity->{$this->field_name}), "No extraneous value gets loaded for revision $evid."); + } + } + } + } + function testFieldAttachInsertAndUpdate() { + $entity_type = 'test_entity'; + $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); + + // Test insert. + $values = array(); + // Note: we try to insert one extra value ('<=' instead of '<'). + // TODO : test empty values filtering and "compression" (store consecutive deltas). + for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { + $values[$delta]['value'] = mt_rand(1, 127); + } + $entity->{$this->field_name} = $rev_values[0] = $values; + field_attach_insert($entity_type, $entity); + + $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); + foreach ($values as $delta => $value) { + if ($delta < $this->field['cardinality']) { + $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Value $delta is inserted correctly")); + } + else { + $this->assertFalse(array_key_exists($delta, $rows), "No extraneous value gets inserted."); + } + } + + // Test update. + $entity = field_test_create_stub_entity(0, 1, $this->instance['bundle']); + $values = array(); + // Note: we try to update one extra value ('<=' instead of '<'). + for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { + $values[$delta]['value'] = mt_rand(1, 127); + } + $entity->{$this->field_name} = $rev_values[1] = $values; + field_attach_update($entity_type, $entity); + $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); + foreach ($values as $delta => $value) { + if ($delta < $this->field['cardinality']) { + $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Value $delta is updated correctly")); + } + else { + $this->assertFalse(array_key_exists($delta, $rows), "No extraneous value gets updated."); + } + } + + // Check that data for both revisions are in the revision table. + // We make sure each value is stored correctly, then unset it. + // When an entire revision's values are unset (remembering that we + // put one extra value in $values per revision), unset the entire + // revision. Then, if $rev_values is empty at the end, all + // revision data was found. + $results = db_select($this->revision_table, 't')->fields('t')->execute(); + foreach ($results as $row) { + $this->assertEqual($row->{$this->field_name . '_value'}, $rev_values[$row->revision_id][$row->delta]['value'], "Value {$row->delta} for revision {$row->revision_id} stored correctly"); + unset($rev_values[$row->revision_id][$row->delta]); + if (count($rev_values[$row->revision_id]) == 1) { + unset($rev_values[$row->revision_id]); + } + } + $this->assertTrue(empty($rev_values), "All values for all revisions are stored in revision table {$this->revision_table}"); + + // Check that update leaves the field data untouched if $object has no + // $field_name key. + unset($entity->{$this->field_name}); + field_attach_update($entity_type, $entity); + $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); + foreach ($values as $delta => $value) { + if ($delta < $this->field['cardinality']) { + $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Update with no field_name entry leaves value $delta untouched")); + } + } + + // Check that update with an empty $object->$field_name empties the field. + $entity->{$this->field_name} = NULL; + field_attach_update($entity_type, $entity); + $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); + $this->assertEqual(count($rows), 0, t("Update with an empty field_name entry empties the field.")); + } + + // Test insert and update with missing or invalid fields. For the + // most part, these tests pass by not crashing or causing exceptions. + function testFieldAttachSaveMissingData() { + $entity_type = 'test_entity'; + $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); + + // Insert: Field is missing + field_attach_insert($entity_type, $entity); + $count = db_result(db_query("SELECT COUNT(*) FROM {{$this->table}}")); + $this->assertEqual($count, 0, 'Missing field results in no inserts'); + + // Insert: Field is NULL + $entity->{$this->field_name} = NULL; + field_attach_insert($entity_type, $entity); + $count = db_result(db_query("SELECT COUNT(*) FROM {{$this->table}}")); + $this->assertEqual($count, 0, 'NULL field results in no inserts'); + + // Add some real data + $entity->{$this->field_name} = array(0 => array('value' => 1)); + field_attach_insert($entity_type, $entity); + $count = db_result(db_query("SELECT COUNT(*) FROM {{$this->table}}")); + $this->assertEqual($count, 1, 'Field data saved'); + + // Update: Field is missing. Data should survive. + unset($entity->{$this->field_name}); + field_attach_update($entity_type, $entity); + $count = db_result(db_query("SELECT COUNT(*) FROM {{$this->table}}")); + $this->assertEqual($count, 1, 'Missing field leaves data in table'); + + // Update: Field is NULL. Data should be wiped. + $entity->{$this->field_name} = NULL; + field_attach_update($entity_type, $entity); + $count = db_result(db_query("SELECT COUNT(*) FROM {{$this->table}}")); + $this->assertEqual($count, 0, 'NULL field leaves no data in table'); +15 + } } Index: modules/field/field.test =================================================================== RCS file: /cvs/drupal/drupal/modules/field/field.test,v retrieving revision 1.10 diff -u -p -r1.10 field.test --- modules/field/field.test 13 Apr 2009 05:18:17 -0000 1.10 +++ modules/field/field.test 14 Apr 2009 17:44:03 -0000 @@ -1,8 +1,6 @@ field_name = drupal_strtolower($this->randomName(). '_field_name'); - $this->table = _field_sql_storage_tablename($this->field_name); - $this->revision_table = _field_sql_storage_revision_tablename($this->field_name); + parent::setUp(variable_get('field_storage_module', 'field_sql_storage'), 'field', 'field_test'); + $this->field_name = drupal_strtolower($this->randomName() . '_field_name'); $this->field = array('field_name' => $this->field_name, 'type' => 'test_field', 'cardinality' => 4); field_create_field($this->field); $this->instance = array( 'field_name' => $this->field_name, 'bundle' => 'test_bundle', - 'label' => $this->randomName(). '_label', - 'description' => $this->randomName(). '_description', + 'label' => $this->randomName() . '_label', + 'description' => $this->randomName() . '_description', 'weight' => mt_rand(0, 127), 'settings' => array( 'test_instance_setting' => $this->randomName(), @@ -38,71 +33,79 @@ class FieldAttachTestCase extends Drupal ) ); field_create_instance($this->instance); + $this->test_data = 5; } +// function testFieldAttachLoadMultiple() { + // TODO : test the 'multiple' aspect of load: + // define 2 bundles, 3 fields + // bundle1 gets instances of field1, field2 + // bundle2 gets instances of field1, field3 + // load 2 entities (one for each bundle) in a single load + // check that everything gets loaded ok. +// } function testFieldAttachLoad() { $entity_type = 'test_entity'; - $eid = 0; + $rev[0] = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - $etid = _field_sql_storage_etid($entity_type); - $columns = array('etid', 'entity_id', 'revision_id', 'delta', $this->field_name . '_value'); + // Create revision 0 + $values = array(); + for ($delta = 0; $delta < $this->field['cardinality']; $delta++) { + $values[$delta]['value'] = mt_rand(1, 127); + } + try { + $rev[0]->{$this->field_name} = $values; + field_attach_insert($entity_type, $rev[0]); + $this->pass('created revision 0'); + } + catch (PDOException $e) { + $this->fail($e->getMessage()); + } - // Insert data for four revisions to the field revisions table - $query = db_insert($this->revision_table)->fields($columns); - for ($evid = 0; $evid < 4; ++$evid) { - $values[$evid] = array(); - // Note: we insert one extra value ('<=' instead of '<'). - for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { - $value = mt_rand(1, 127); - $values[$evid][] = $value; - $query->values(array($etid, $eid, $evid, $delta, $value)); - } + // Create revision 1 + $rev[1] = field_test_create_stub_entity(0, 1, $this->instance['bundle']); + try { + $rev[1]->{$this->field_name} = $values; + field_attach_update($entity_type, $rev[1]); + $this->pass('created revision 1'); + } + catch (PDOException $e) { + $this->fail($e->getMessage()); + } + + // Create revision 2 + $rev[2] = field_test_create_stub_entity(0, 2, $this->instance['bundle']); + try { + $rev[2]->{$this->field_name} = $values; + field_attach_update($entity_type, $rev[2]); + $this->pass('created revision 2'); + } + catch (PDOException $e) { + $this->fail($e->getMessage()); } - $query->execute(); - // Insert data for the "most current revision" into the field table - $query = db_insert($this->table)->fields($columns); - foreach ($values[0] as $delta => $value) { - $query->values(array($etid, $eid, 0, $delta, $value)); - } - $query->execute(); - - // Load the "most current revision" - $entity = field_test_create_stub_entity($eid, 0, $this->instance['bundle']); - field_attach_load($entity_type, array($eid => $entity)); - foreach ($values[0] as $delta => $value) { - if ($delta < $this->field['cardinality']) { - $this->assertEqual($entity->{$this->field_name}[$delta]['value'], $value, "Value $delta is loaded correctly for current revision"); - } - else { - $this->assertFalse(array_key_exists($delta, $entity->{$this->field_name}), "No extraneous value gets loaded for current revision."); - } + // Confirm current revision loads + $load = field_test_create_stub_entity(0, 0, $this->instance['bundle']); + try { + field_attach_load($entity_type, array(0 => $load)); + $this->assertEqual(count($load->{$this->field_name}), $this->field['cardinality'], "The test object revision currrent has {$this->field['cardinality']} values."); + } + catch (PDOException $e) { + $this->fail($e->getMessage()); } - // Load every revision - for ($evid = 0; $evid < 4; ++$evid) { - $entity = field_test_create_stub_entity($eid, $evid, $this->instance['bundle']); - field_attach_load_revision($entity_type, array($eid => $entity)); - foreach ($values[$evid] as $delta => $value) { - if ($delta < $this->field['cardinality']) { - $this->assertEqual($entity->{$this->field_name}[$delta]['value'], $value, "Value $delta for revision $evid is loaded correctly"); - } - else { - $this->assertFalse(array_key_exists($delta, $entity->{$this->field_name}), "No extraneous value gets loaded for revision $evid."); - } + // Confirm each revision loads + foreach (array_keys($rev) as $vid) { + $load = field_test_create_stub_entity(0, $vid, $this->instance['bundle']); + try { + field_attach_load_revision($entity_type, array(0 => $load)); + $this->assertEqual(count($load->{$this->field_name}), $this->field['cardinality'], "The test object revision $vid has {$this->field['cardinality']} values."); + } + catch (PDOException $e) { + $this->fail($e->getMessage()); } } - } - -// function testFieldAttachLoadMultiple() { - // TODO : test the 'multiple' aspect of load: - // define 2 bundles, 3 fields - // bundle1 gets instances of field1, field2 - // bundle2 gets instances of field1, field3 - // load 2 entities (one for each bundle) in a single load - // check that everything gets loaded ok. -// } - + } function testFieldAttachInsertAndUpdate() { $entity_type = 'test_entity'; $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); @@ -112,19 +115,18 @@ class FieldAttachTestCase extends Drupal // Note: we try to insert one extra value ('<=' instead of '<'). // TODO : test empty values filtering and "compression" (store consecutive deltas). for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { - $values[$delta]['value'] = mt_rand(1, 127); + $values[$delta]['value'] = $delta; } - $entity->{$this->field_name} = $rev_values[0] = $values; + $entity->{$this->field_name} = $values; field_attach_insert($entity_type, $entity); - - $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); - foreach ($values as $delta => $value) { - if ($delta < $this->field['cardinality']) { - $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Value $delta is inserted correctly")); - } - else { - $this->assertFalse(array_key_exists($delta, $rows), "No extraneous value gets inserted."); - } + + $load = field_test_create_stub_entity(0, 0, $this->instance['bundle']); + try { + field_attach_load($entity_type, array(0 => $load)); + $this->assertEqual(count($load->{$this->field_name}), $this->field['cardinality'], "The test object revision 0 has {$this->field['cardinality']} values."); + } + catch (PDOException $e) { + $this->fail($e->getMessage()); } // Test update. @@ -132,90 +134,98 @@ class FieldAttachTestCase extends Drupal $values = array(); // Note: we try to update one extra value ('<=' instead of '<'). for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { - $values[$delta]['value'] = mt_rand(1, 127); - } - $entity->{$this->field_name} = $rev_values[1] = $values; - field_attach_update($entity_type, $entity); - $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); - foreach ($values as $delta => $value) { - if ($delta < $this->field['cardinality']) { - $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Value $delta is updated correctly")); - } - else { - $this->assertFalse(array_key_exists($delta, $rows), "No extraneous value gets updated."); - } - } - - // Check that data for both revisions are in the revision table. - // We make sure each value is stored correctly, then unset it. - // When an entire revision's values are unset (remembering that we - // put one extra value in $values per revision), unset the entire - // revision. Then, if $rev_values is empty at the end, all - // revision data was found. - $results = db_select($this->revision_table, 't')->fields('t')->execute(); - foreach ($results as $row) { - $this->assertEqual($row->{$this->field_name . '_value'}, $rev_values[$row->revision_id][$row->delta]['value'], "Value {$row->delta} for revision {$row->revision_id} stored correctly"); - unset($rev_values[$row->revision_id][$row->delta]); - if (count($rev_values[$row->revision_id]) == 1) { - unset($rev_values[$row->revision_id]); - } - } - $this->assertTrue(empty($rev_values), "All values for all revisions are stored in revision table {$this->revision_table}"); - - // Check that update leaves the field data untouched if $object has no - // $field_name key. - unset($entity->{$this->field_name}); - field_attach_update($entity_type, $entity); - $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); - foreach ($values as $delta => $value) { - if ($delta < $this->field['cardinality']) { - $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Update with no field_name entry leaves value $delta untouched")); - } + $values[$delta]['value'] = $delta; //mt_rand(1, 127); } - - // Check that update with an empty $object->$field_name empties the field. - $entity->{$this->field_name} = NULL; + $entity->{$this->field_name} = $values; field_attach_update($entity_type, $entity); - $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); - $this->assertEqual(count($rows), 0, t("Update with an empty field_name entry empties the field.")); } // Test insert and update with missing or invalid fields. For the // most part, these tests pass by not crashing or causing exceptions. - function testFieldAttachSaveMissingData() { + function testFieldAttachISaveMissingData() { $entity_type = 'test_entity'; $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); // Insert: Field is missing - field_attach_insert($entity_type, $entity); - $count = db_result(db_query("SELECT COUNT(*) FROM {{$this->table}}")); - $this->assertEqual($count, 0, 'Missing field results in no inserts'); - + + try { + field_attach_insert($entity_type, $entity); + $this->assertTrue(TRUE, 'Missing field in insert ok'); + $entity->{$this->field_name} = NULL; + } + catch (PDOException $e) { + $this->fail($e->getMessage()); + } // Insert: Field is NULL + $entity->{$this->field_name} = NULL; - field_attach_insert($entity_type, $entity); - $count = db_result(db_query("SELECT COUNT(*) FROM {{$this->table}}")); - $this->assertEqual($count, 0, 'NULL field results in no inserts'); + try { + field_attach_insert($entity_type, $entity); + $this->assertTrue(TRUE, 'NULL field in insert ok'); + field_attach_load($entity_type, array(0 => $entity)); + $this->assertTrue($entity->{$this->field_name} == NULL, 'NULL field in insert ok'); + } + catch (PDOException $e) { + $this->fail($e->getMessage()); + } // Add some real data - $entity->{$this->field_name} = array(0 => array('value' => 1)); - field_attach_insert($entity_type, $entity); - $count = db_result(db_query("SELECT COUNT(*) FROM {{$this->table}}")); - $this->assertEqual($count, 1, 'Field data saved'); + $entity->{$this->field_name} = array(0 => array('value' => $this->test_data)); + try { + field_attach_insert($entity_type, $entity); + $this->assertTrue(TRUE, 'with data insert ok'); + $entity->{$this->field_name} = NULL; + field_attach_load($entity_type, array(0 => $entity)); + $this->assertTrue($entity->{$this->field_name}[0]['value'] == $this->test_data, 'with data ok'); + } + catch (PDOException $e) { + $this->fail(getMessage()); + } + $values = array(array()); + for ($delta = 0;$delta < $this->field['cardinality'];$delta++) { + $values[$delta]['value'] = $delta ; + } + $entity->{$this->field_name} = $values; + try { + field_attach_update($entity_type, $entity); + $this->assertTrue(TRUE, 'with data insert ok'); + $entity->{$this->field_name} = NULL; + field_attach_load($entity_type, array(0 => $entity)); + for ($delta = 0;$delta < $this->field['cardinality'] ;$delta++) { + $this->assertEqual($entity->{$this->field_name}[$delta]['value'], $delta, 'with data ok'); + }; + } + catch (PDOException $e) { + $this->fail($e->getMessage()); + } // Update: Field is missing. Data should survive. unset($entity->{$this->field_name}); - field_attach_update($entity_type, $entity); - $count = db_result(db_query("SELECT COUNT(*) FROM {{$this->table}}")); - $this->assertEqual($count, 1, 'Missing field leaves data in table'); + try { + field_attach_update($entity_type, $entity); + $this->assertTrue(TRUE, 'Missing field update'); + $entity->{$this->field_name} = NULL; + field_attach_load($entity_type, array(0 => $entity)); + $this->assertTrue($entity->{$this->field_name}[0]['value'] == 0, 'Missing field update'); + } + catch (PDOException $e) { + $this->fail($e->getMessage()); + } // Update: Field is NULL. Data should be wiped. $entity->{$this->field_name} = NULL; - field_attach_update($entity_type, $entity); - $count = db_result(db_query("SELECT COUNT(*) FROM {{$this->table}}")); - $this->assertEqual($count, 0, 'NULL field leaves no data in table'); + try { + field_attach_update($entity_type, $entity); + $this->pass('NULL field update'); + //todo is this correct + field_attach_load($entity_type, array(0 => $entity)); + $this->assertTrue($entity->{$this->field_name} == NULL, 'NULL field update'); + } + catch (PDOException $e) { + $this->fail($e->getMessage()); + } } - + function testFieldAttachViewAndPreprocess() { $entity_type = 'test_entity'; $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); @@ -419,16 +429,14 @@ class FieldAttachTestCase extends Drupal field_create_instance($this->instance); // Create a second field for the test bundle - $field_name = drupal_strtolower($this->randomName(). '_field_name'); - $table = _field_sql_storage_tablename($field_name); - $revision_table = _field_sql_storage_revision_tablename($field_name); + $field_name = drupal_strtolower($this->randomName() . '_field_name'); $field = array('field_name' => $field_name, 'type' => 'test_field', 'cardinality' => 1); field_create_field($field); $instance = array( 'field_name' => $field_name, 'bundle' => $this->instance['bundle'], - 'label' => $this->randomName(). '_label', - 'description' => $this->randomName(). '_description', + 'label' => $this->randomName() . '_label', + 'description' => $this->randomName() . '_description', 'weight' => mt_rand(0, 127), // test_field has no instance settings 'widget' => array( @@ -726,14 +734,14 @@ class FieldFormTestCase extends DrupalWe $web_user = $this->drupalCreateUser(array('access field_test content', 'administer field_test content')); $this->drupalLogin($web_user); - $this->field_single = array('field_name' => drupal_strtolower($this->randomName(). '_field_name'), 'type' => 'test_field'); - $this->field_multiple = array('field_name' => drupal_strtolower($this->randomName(). '_field_name'), 'type' => 'test_field', 'cardinality' => 4); - $this->field_unlimited = array('field_name' => drupal_strtolower($this->randomName(). '_field_name'), 'type' => 'test_field', 'cardinality' => FIELD_CARDINALITY_UNLIMITED); + $this->field_single = array('field_name' => drupal_strtolower($this->randomName() . '_field_name'), 'type' => 'test_field'); + $this->field_multiple = array('field_name' => drupal_strtolower($this->randomName() . '_field_name'), 'type' => 'test_field', 'cardinality' => 4); + $this->field_unlimited = array('field_name' => drupal_strtolower($this->randomName() . '_field_name'), 'type' => 'test_field', 'cardinality' => FIELD_CARDINALITY_UNLIMITED); $this->instance = array( 'bundle' => 'test_bundle', - 'label' => $this->randomName(). '_label', - 'description' => $this->randomName(). '_description', + 'label' => $this->randomName() . '_label', + 'description' => $this->randomName() . '_description', 'weight' => mt_rand(0, 127), 'settings' => array( 'test_instance_setting' => $this->randomName(), @@ -892,7 +900,7 @@ class FieldFormTestCase extends DrupalWe $this->assertPattern("|$pattern|s", 'Widgets are displayed in the correct order'); $this->assertFieldByName("$this->field_name[$delta][value]", '', "New widget is displayed"); $this->assertFieldByName("$this->field_name[$delta][_weight]", $delta, "New widget has the right weight"); - $this->assertNoField("$this->field_name[". ($delta + 1) . '][value]', 'No extraneous widget is displayed'); + $this->assertNoField("$this->field_name[" . ($delta + 1) . '][value]', 'No extraneous widget is displayed'); // Submit the form and create the entity. $this->drupalPost(NULL, $edit, t('Save')); @@ -946,7 +954,8 @@ class FieldTestCase extends DrupalWebTes ); field_create_field($field_definition); $this->fail(t('Cannot create a field with no type.')); - } catch (FieldException $e) { + } + catch (FieldException $e) { $this->pass(t('Cannot create a field with no type.')); } @@ -955,7 +964,8 @@ class FieldTestCase extends DrupalWebTes $field_definition = array('type' => 'test_field'); field_create_field($field_definition); $this->fail(t('Cannot create an unnamed field.')); - } catch (FieldException $e) { + } + catch (FieldException $e) { $this->pass(t('Cannot create an unnamed field.')); } @@ -979,14 +989,12 @@ class FieldTestCase extends DrupalWebTes $settings = $info['settings']; $this->assertIdentical($settings, $field['settings'] , t('Default field settings have been written.')); - // Check that a table has been created for the field. - $this->assertTrue(db_table_exists('field_data_' . $field_definition['field_name']), t('A table has been created for the field.')); - // Guarantee that the name is unique. try { field_create_field($field_definition); $this->fail(t('Cannot create two fields with the same name.')); - } catch (FieldException $e) { + } + catch (FieldException $e) { $this->pass(t('Cannot create two fields with the same name.')); } @@ -995,7 +1003,8 @@ class FieldTestCase extends DrupalWebTes try { field_create_field($field_definition); $this->fail(t('Cannot create a field with an invalid name.')); - } catch (FieldException $e) { + } + catch (FieldException $e) { $this->pass(t('Cannot create a field with an invalid name.')); } @@ -1013,8 +1022,10 @@ class FieldTestCase extends DrupalWebTes // TODO: Also test deletion of the data stored in the field ? // Create two fields (so we can test that only one is deleted). - $this->field = $this->drupalCreateField('test_field', 'test_field_name'); - $this->another_field = $this->drupalCreateField('test_field', 'another_test_field_name'); + $this->field = array('field_name' => 'test_field_name', 'type' => 'test_field'); + field_create_field($this->field); + $this->another_field = array('field_name' => 'another_test_field_name', 'type' => 'test_field'); + field_create_field($this->another_field); // Create instances for each. $this->instance_definition = array( @@ -1073,8 +1084,11 @@ class FieldInstanceTestCase extends Drup function setUp() { parent::setUp('field_sql_storage', 'field', 'field_test'); - - $this->field = $this->drupalCreateField('test_field'); + $this->field = array( + 'field_name' => drupal_strtolower($this->randomName()), + 'type' => 'test_field', + ); + field_create_field($this->field); $this->instance_definition = array( 'field_name' => $this->field['field_name'], 'bundle' => FIELD_TEST_BUNDLE, Index: modules/field/modules/text/text.test =================================================================== RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.test,v retrieving revision 1.4 diff -u -p -r1.4 text.test --- modules/field/modules/text/text.test 12 Apr 2009 02:18:51 -0000 1.4 +++ modules/field/modules/text/text.test 14 Apr 2009 17:45:08 -0000 @@ -1,6 +1,11 @@ drupalCreateField('text', NULL, array('settings' => array('max_length' => $max_length))); - $this->instance = $this->drupalCreateFieldInstance($field['field_name'], 'text_textfield', 'text_default', FIELD_TEST_BUNDLE); - + $this->field = array( + 'field_name' => drupal_strtolower($this->randomName()), + 'max_length' => $max_length, + 'type' => 'text', + 'settings' => array( + 'max_length' => $max_length, + ) + ); + field_create_field($this->field); + $this->instance = array( + 'field_name' => $this->field['field_name'], + 'bundle' => FIELD_TEST_BUNDLE, + 'widget' => array( + 'type' => 'text_textfield', + ), + 'display' => array( + 'full' => array( + 'type' => 'text_default', + ), + ), + ); + field_create_instance($this->instance); // Test valid and invalid values with field_attach_validate(). $entity = field_test_create_stub_entity(0, 0, FIELD_TEST_BUNDLE); for ($i = 0; $i <= $max_length + 2; $i++) { - $entity->{$field['field_name']}[0]['value'] = str_repeat('x', $i); + $entity->{$this->field['field_name']}[0]['value'] = str_repeat('x', $i); try { field_attach_validate('test_entity', $entity); $this->assertTrue($i <= $max_length, "Length $i does not cause validation error when max_length is $max_length"); @@ -65,8 +89,7 @@ class TextFieldTestCase extends DrupalWe 'field_name' => $this->field_name, 'bundle' => FIELD_TEST_BUNDLE, 'label' => $this->randomName() . '_label', - 'settings' => array( - 'text_processing' => TRUE, + 'settings' => array('text_processing' => TRUE, ), 'widget' => array( 'type' => $widget_type,