Refactor field tests to utilize DateFieldBasic [#2198807]

Problem/Motivation

At one point when Karen S. refactored tests she reduced the amount of code duplication happening there by creating a base date testcase. There are some really old tests that were not refactored to take advantage of this, though: the basic tests happening in date.test still use its own separate createField() method unnecessarily.

Proposed resolution

Refactor the the test in date.test to use DateFieldBasic, making somewhat easier to maintain the tests in the future.

Also use a loop for most of the testing in testFieldUI(), to make code more concise.

Comment	File	Size	Author
#3	date-refactored-to-use-datefieldbasic-2198807-3-D7.patch	9.33 KB	wwedding
#3
#2	date-refactored-to-use-datefieldbasic-2198807-2-D7.patch	9.3 KB	wwedding
#2

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Comment #1

wwedding CreditAttribution: wwedding commented 17 February 2014 at 20:23

Assigned:

Unassigned

» wwedding

I have a patch on the way, I was writing up some tests to catch some reported issues and thought a little cleaning up would be nice, too.

Comment #2

wwedding CreditAttribution: wwedding commented 17 February 2014 at 20:34

Assigned:	wwedding	» Unassigned
Status:	Active	» Needs review

File	Size
date-refactored-to-use-datefieldbasic-2198807-2-D7.patch	9.3 KB

I almost feel like the test in date.test should be in date_field.test, but here's a patch that just refactors date.test.

Comment #3

wwedding CreditAttribution: wwedding commented 17 February 2014 at 21:09

File	Size
date-refactored-to-use-datefieldbasic-2198807-3-D7.patch	9.33 KB

1 file was hidden/shown/deleted

File	Size
date-refactored-to-use-datefieldbasic-2198807-2-D7.patch	9.3 KB

Formatting issues in the first patch.

Comment #4

vijaycs85

London, UK

CreditAttribution: vijaycs85 commented 18 February 2014 at 11:25

Status:	Needs review	» Reviewed & tested by the community
Issue tags:		+sprint

great cleanup @stickywes. Nothing to complain, just few mentions out of manual review. It is good to go.

+++ b/tests/date.test
@@ -39,83 +31,34 @@ class DateUITestCase extends DrupalWebTestCase {
-    $edit = array();
-    $edit['name'] = 'Story';
-    $edit['type'] = 'story';
-    $this->drupalPost('admin/structure/types/add', $edit, t('Save content type'));
-    $this->assertText('The content type Story has been added.', 'Content type added.');

I see this is now part of DateFieldBasic::setup()

+++ b/tests/date.test
@@ -39,83 +31,34 @@ class DateUITestCase extends DrupalWebTestCase {
-    // Creates select list field stored as a date with default settings.
...
-    // Creates text field stored as a date with default settings.
...
-    // Creates popup field stored as a date with default settings.
...
-    // Creates select list field stored as a datestamp with default settings.
...
-    // Creates text field stored as a datestamp with default settings.
...
-    // Creates popup field stored as a datestamp with default settings.
...
-    // Creates select list field stored as a datetime with default settings.
...
-    // Creates text field stored as a datetime with default settings.
...
-    // Creates popup field stored as a datetime with default settings.

Nice, cleanup and can see all 9 of them covered with 3x3 foreach

+++ b/tests/date.test
@@ -128,44 +71,21 @@ class DateUITestCase extends DrupalWebTestCase {
-
-  /**
-   * @todo.
-   */
-  function createDateField($type, $widget) {
-    $edit = array();
-    $edit['fields[_add_new_field][label]'] = 'Test';
-    $edit['fields[_add_new_field][field_name]'] = 'test';
-    $edit['fields[_add_new_field][weight]'] = '-4';
-    $edit['fields[_add_new_field][type]'] = $type;
-    $edit['fields[_add_new_field][widget_type]'] = $widget;
-    $this->drupalPost('admin/structure/types/manage/story/fields', $edit, t('Save'));
-  }
-
-  /**
-   * @todo.
-   */
-  function deleteDateField() {
-    $this->drupalGet('admin/structure/types/manage/story/fields');
-    $this->clickLink('delete');
-    $this->drupalPost(NULL, NULL, t('Delete'));
-    $this->assertText('The field Test has been deleted from the Story content type.', 'Removed date field.');
-  }
 }

Nice cleanup.