diff --git a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php index 9a26aca..8e4b50e 100644 --- a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php +++ b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php @@ -105,7 +105,7 @@ protected function assertFormatterRdfa($formatter, $property, $expected_rdf_valu /** * Creates the field for testing. */ - protected function createTestField() { + protected function createTestField($field_settings = array()) { entity_create('field_storage_config', array( 'name' => $this->fieldName, 'entity_type' => 'entity_test', @@ -115,6 +115,7 @@ protected function createTestField() { 'entity_type' => 'entity_test', 'field_name' => $this->fieldName, 'bundle' => 'entity_test', + 'settings' => $field_settings, ))->save(); } diff --git a/core/modules/rdf/src/Tests/Field/NumberFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/NumberFieldRdfaTest.php index 434d634..f38a106 100644 --- a/core/modules/rdf/src/Tests/Field/NumberFieldRdfaTest.php +++ b/core/modules/rdf/src/Tests/Field/NumberFieldRdfaTest.php @@ -92,10 +92,6 @@ protected function createMapping($field_settings = array()) { 'properties' => array('schema:baseSalary'), ))->save(); - $mapping->setFieldMapping('field_with_separator', array( - 'properties' => array('schema:baseSalary'), - ))->save(); - // Set up test entity. $this->entity = entity_create('entity_test', array()); $this->entity->{$this->fieldName}->value = $this->testValue; @@ -103,22 +99,18 @@ protected function createMapping($field_settings = array()) { /** * Creates the field for testing. - * - * @param array - * The field settings. */ - protected function createTestField($settings) { - parent::createTestField(); + protected function createTestField($field_settings = array()) { entity_create('field_storage_config', array( - 'name' => 'field_with_separator', + 'name' => $this->fieldName, 'entity_type' => 'entity_test', - 'type' => 'decimal', + 'type' => $this->fieldType, ))->save(); entity_create('field_instance_config', array( 'entity_type' => 'entity_test', - 'field_name' => 'field_with_separator', + 'field_name' => $this->fieldName, 'bundle' => 'entity_test', - 'settings' => $settings, + 'settings' => $field_settings, ))->save(); } }