Index: modules/field/field.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.test,v
retrieving revision 1.9
diff -u -p -r1.9 field.test
--- modules/field/field.test	31 Mar 2009 01:49:51 -0000	1.9
+++ modules/field/field.test	1 Apr 2009 22:47:46 -0000
@@ -422,8 +422,7 @@ class FieldAttachTestCase extends Drupal
     $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 = array('field_name' => $field_name, 'type' => 'test_field', 'cardinality' => 1);
-    field_create_field($field);
+	$field = $this->drupalCreateField('test_field', $field_name);
     $instance = array(
       'field_name' => $field_name,
       'bundle' => $this->instance['bundle'],
@@ -655,11 +654,7 @@ class FieldInfoTestCase extends DrupalWe
     $this->assertTrue(empty($instances), t('With no instances, info bundles is empty.'));
 
     // Create a field, verify it shows up.
-    $field = array(
-      'field_name' => drupal_strtolower($this->randomName()),
-      'type' => 'test_field',
-    );
-    field_create_field($field);
+	$field = $this->drupalCreateField('test_field');
     $fields = field_info_fields();
     $this->assertEqual(count($fields), 1, t('One field exists'));
     $this->assertEqual($fields[$field['field_name']]['field_name'], $field['field_name'], t('info fields contains field name'));
@@ -963,7 +958,7 @@ class FieldTestCase extends DrupalWebTes
       'field_name' => drupal_strtolower($this->randomName()),
       'type' => 'test_field',
     );
-    field_create_field($field_definition);
+    $this->drupalCreateField($field_definition['type'], $field_definition['field_name']);
 
     $field = field_read_field($field_definition['field_name']);
 
@@ -984,7 +979,7 @@ class FieldTestCase extends DrupalWebTes
 
     // Guarantee that the name is unique.
     try {
-      field_create_field($field_definition);
+      $this->drupalCreateField($field_definition['type'], $field_definition['field_name']);
       $this->fail(t('Cannot create two fields with the same name.'));
     } catch (FieldException $e) {
       $this->pass(t('Cannot create two fields with the same name.'));
@@ -993,7 +988,7 @@ class FieldTestCase extends DrupalWebTes
     // Check that invalid field names are rejected.
     $field_definition['field_name'] += '_#';
     try {
-      field_create_field($field_definition);
+      $this->drupalCreateField($field_definition['type'], $field_definition['field_name']);
       $this->fail(t('Cannot create a field with an invalid name.'));
     } catch (FieldException $e) {
       $this->pass(t('Cannot create a field with an invalid name.'));
@@ -1024,10 +1019,10 @@ class FieldTestCase extends DrupalWebTes
         'type' => 'test_field_widget',
       ),
     );
-    field_create_instance($this->instance_definition);
-    $this->another_instance_definition = $this->instance_definition;
-    $this->another_instance_definition['field_name'] = $this->another_field['field_name'];
-    field_create_instance($this->another_instance_definition);
+	$this->another_instance_definition = $this->instance_definition;
+    $this->another_instance_definition['field_name'] = $this->another_field['field_name'];	
+	$this->drupalCreateFieldInstance($this->instance_definition['field_name'], $this->instance_definition['widget']['type'], 'field_test_default', $this->instance_definition['bundle']);
+	$this->drupalCreateFieldInstance($this->another_instance_definition['field_name'], $this->another_instance_definition['widget']['type'], 'field_test_default', $this->another_instance_definition['bundle']);
 
     // Test that the first field is not deleted, and then delete it.
     $field = field_read_field($this->field['field_name'], array('include_deleted' => TRUE));