diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php index 54fed49..90706f3 100644 --- a/core/modules/field/src/Tests/Number/NumberFieldTest.php +++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php @@ -464,24 +464,24 @@ function testNumberFormatter() { */ function testCreateNumberFloatField() { // Create a float field. - $field_type = 'float'; $field_name = Unicode::strtolower($this->randomMachineName()); entity_create('field_storage_config', array( 'field_name' => $field_name, 'entity_type' => 'entity_test', - 'type' => $field_type, + 'type' => 'float', ))->save(); - entity_create('field_config', array( + $field = entity_create('field_config', array( 'field_name' => $field_name, 'entity_type' => 'entity_test', 'bundle' => 'entity_test', - ))->save(); + )); + $field->save(); - // Set the minimum value to an decimal value. - $this->setMinimumValue($field_type, $field_name, 0.1); + // Set the minimum value to a float value. + $this->assertSetMinimumValue($field, 0.0001); // Set the minimum value to an integer value. - $this->setMinimumValue($field_type, $field_name, 1); + $this->assertSetMinimumValue($field, 1); } /** @@ -489,31 +489,31 @@ function testCreateNumberFloatField() { */ function testCreateNumberDecimalField() { // Create a decimal field. - $field_type = 'decimal'; $field_name = Unicode::strtolower($this->randomMachineName()); entity_create('field_storage_config', array( 'field_name' => $field_name, 'entity_type' => 'entity_test', - 'type' => $field_type, + 'type' => 'decimal', ))->save(); - entity_create('field_config', array( + $field = entity_create('field_config', array( 'field_name' => $field_name, 'entity_type' => 'entity_test', 'bundle' => 'entity_test', - ))->save(); + )); + $field->save(); - // Set the minimum value to an decimal value. - $this->setMinimumValue($field_type, $field_name, 0.1); + // Set the minimum value to a decimal value. + $this->assertSetMinimumValue($field, 0.1); // Set the minimum value to an integer value. - $this->setMinimumValue($field_type, $field_name, 1); + $this->assertSetMinimumValue($field, 1); } /** * Helper function to set the minimum value of a field. */ - function setMinimumValue($field_type, $field_name, $minimum_value) { - $field_configuration_url = 'entity_test/structure/entity_test/fields/entity_test.entity_test.' . $field_name; + function assertSetMinimumValue($field, $minimum_value) { + $field_configuration_url = 'entity_test/structure/entity_test/fields/entity_test.entity_test.' . $field->getName(); // Set the minimum value. $edit = array( @@ -521,9 +521,11 @@ function setMinimumValue($field_type, $field_name, $minimum_value) { ); $this->drupalPostForm($field_configuration_url, $edit, t('Save settings')); // Check if an error message is shown. - $this->assertNoRaw(t('%name is not a valid number.', array('%name' => t('Minimum'))), 'Saved ' . gettype($minimum_value) .' value as minimal value on a ' . $field_type . ' field'); + $this->assertNoRaw(t('%name is not a valid number.', array('%name' => t('Minimum'))), 'Saved ' . gettype($minimum_value) .' value as minimal value on a ' . $field->getType() . ' field'); + // Check if a success message is shown. + $this->assertRaw(t('Saved %label configuration.', array('%label' => $field->getLabel()))); // Check if the minimum value was actually set. $this->drupalGet($field_configuration_url); - $this->assertFieldById('edit-field-settings-min', $minimum_value, 'Minimal ' . gettype($minimum_value) .' value was set on a ' . $field_type . ' field.'); + $this->assertFieldById('edit-field-settings-min', $minimum_value, 'Minimal ' . gettype($minimum_value) .' value was set on a ' . $field->getType() . ' field.'); } }