Index: modules/simpletest/tests/mail.test =================================================================== RCS file: modules/simpletest/tests/mail.test diff -N modules/simpletest/tests/mail.test --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/simpletest/tests/mail.test 16 Jun 2009 20:43:53 -0000 @@ -0,0 +1,232 @@ + t('HTML to Text filter'), + 'description' => t('Test drupal_html_to_text() with a wide range of tags, both as single tags and as a full e-mail example.'), + 'group' => t('Mail'), + ); + } + + /** + * Test all supported tags of drupal_html_to_text(). + */ + function testDrupalHtmlToText() { + $drupal_html_to_text_cases = array( + // Tests all supported HTML tags. + 'Drupal.org' => 'Drupal.org [1]' . "\n\n" . '[1] http://drupal.org' . "\n", + 'Drupal' => '/Drupal/' . "\n", + 'Drupal' => '/Drupal/' . "\n", + 'Drupal' => '*Drupal*' . "\n", + 'Drupal' => '*Drupal*' . "\n", + 'Drupal
Drupal' => 'Drupal' . "\n" . 'Drupal' . "\n", + '

Drupal

' => 'Drupal' . "\n\n", + '
Drupal
' => '>Drupal' . "\n", + '' => 'Drupal' . "\n\n", + '' => ' * Drupal' . "\n\n", + '' => ' * Drupal' . "\n" . ' * Drupal' . "\n\n", + '
    Drupal
' => 'Drupal' . "\n" . "\n", + '
  1. Drupal
' => ' 1) Drupal' . "\n" . "\n", + '
  1. Drupal
  2. Drupal
' => ' 1) Drupal' . "\n" . ' 2) Drupal' . "\n\n", + '' => ' * Drupal' . "\n" . ' * 1) Drupal' . "\n" . ' 2) Drupal' . "\n" . ' ' . "\n\n", + '
  1. Drupal
' => ' 1) Drupal' . "\n" . ' 2) * Drupal' . "\n" . ' * Drupal' . "\n" . ' ' . "\n\n", + '
Drupal
' => 'Drupal' . "\n\n", + '
Drupal
' => 'Drupal' . "\n", + '
Drupal
' => 'Drupal' . "\n\n", + '
Drupal
Drupal
' => 'Drupal' . "\n" . ' Drupal' . "\n\n" , + '
Drupal
Drupal
' => 'Drupal' . "\n" . ' Drupal' . "\n\n" , + '

Drupal

' => '======== DRUPAL ' . str_repeat("=", 62) . "\n\n", + '

Drupal

' => '-------- DRUPAL ' . str_repeat("-", 62) . "\n\n", + '

Drupal

' => '.... Drupal' . "\n\n", + '

Drupal

' => '.. Drupal' . "\n\n" , + '
Drupal
' => 'Drupal' . "\n\n", + '
Drupal
' => 'Drupal' . "\n\n", + 'Drupal
' => 'Drupal' . "\n" . str_repeat("-", 78) . "\n", + 'Drupal
Drupal' => 'Drupal' . "\n" . str_repeat("-", 78) . "\n" . 'Drupal' . "\n", + // Tests malformed HTML tags. + 'Drupal
Drupal' => 'Drupal' . "\n" . 'Drupal' . "\n", + '' => ' * Drupal' . "\n" . ' * Drupal' . "\n\n", + '
  1. Drupal
  2. Drupal
' => ' 1) Drupal' . "\n" . ' 2) Drupal' . "\n\n", + // Tests some unsupported HTML tags. + '
Drupal
' => 'Drupal' . "\n", + 'Drupal' => 'Drupal' . "\n", + '' => 'Drupal' . "\n", + ); + + foreach ($drupal_html_to_text_cases as $html_string => $expected_text) { + $result = drupal_html_to_text($html_string); + $this->assertEqual($result, $expected_text, t('drupal_html_to_text(@func_call ...)', array('@func_call' => drupal_substr($html_string, 0, 15)))); + } + } + + /** + * Test drupal_html_to_text() with a full e-mail example. + */ + function testDrupalHtmlToTextFull() { + // HTML code to test. + $html = <<Testing headline + +

Sub-headline

+ +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+ +
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+ + + +
+
    +
  1. Ordered List item
    2. +
  2. List item
    3. +

  3. List item that is really long. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

    +
    +

    Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure

    +
    +

    Dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    +
    +
    4. +
  4. List item
    5. +
+
+
+ +

Testing linked headline

+ +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

+ +

Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+ +
+
Definition list item
+
Definition list body Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
Definition list item
+
Definition list body Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut.
+
+ +

Really really long sub-headline lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam.

+ +

Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+EOS; + // The expected result after drupal_html_to_text($html). + // Trailing white-space is required to match the output of drupal_html_to_text(). + $expected_result =<<< EOS +======== TESTING HEADLINE ==================================================== + +-------- SUB-HEADLINE -------------------------------------------------------- + +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod +tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, +quis nostrud exercitation [1] ullamco laboris nisi ut aliquip ex ea commodo +consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non +proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + +>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod +>tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, +>quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo +>consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +>cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat +>non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +> +> * Unordered List item +> * List item +> * List item that is really long. Lorem ipsum dolor sit amet, consectetur +> adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore +> magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco +> laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in +> reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla +> pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa +> qui officia deserunt mollit anim id est laborum. +> * List item +> +>> 1) Ordered List item +>> 2) List item +>> 3) List item that is really long. Lorem ipsum dolor sit amet, consectetur +>> adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore +>> magna aliqua. +>> +>> "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris +>> nisi ut aliquip ex ea commodo consequat. Duis aute irure +>> +>> ---------------------------------------------------------------------- +>> Dolor in reprehenderit in voluptate velit esse cillum dolore eu +>> fugiat nulla pariatur. Excepteur sint occaecat cupidatat non +>> proident, sunt in culpa qui officia deserunt mollit anim id est +>> laborum." +>> +>> 4) List item +>> +-------- TESTING LINKED HEADLINE [2] ----------------------------------------- + +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod +tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, +quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo +consequat. + +Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore +eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, +sunt in culpa qui officia deserunt mollit anim id est laborum. + +Definition list item + Definition list body Lorem ipsum dolor sit amet, consectetur adipisicing + elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi + ut. +Definition list item + Definition list body Lorem ipsum dolor sit amet, consectetur adipisicing + elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi + ut. + +-------- REALLY REALLY LONG SUB-HEADLINE LOREM IPSUM DOLOR SIT AMET, + CONSECTETUR ADIPISICING ELIT, SED DO EIUSMOD TEMPOR INCIDIDUNT UT + LABORE ET DOLORE MAGNA ALIQUA. UT ENIM AD MINIM VENIAM. ------------- + +Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore +eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, +sunt in culpa qui officia deserunt mollit anim id est laborum. + + +[1] http://drupal.org +[2] http://drupal.org/user + +EOS; + + $result = drupal_html_to_text($html); + $this->assertEqual($result, $expected_result, t('Test drupal_html_to_text() with a long HTML e-mail.')); + } + + /** + * Test $allowed_tags argument of drupal_html_to_text(). + */ + function testDrupalHtmlToTextArgs() { + // The second parameter of drupal_html_to_text() overrules the allowed tags. + $result = drupal_html_to_text('Drupal', array('b')); + $this->assertEqual($result, '*Drupal*' . "\n", t('Tests drupal_html_to_text() basic working of the parameter $allowed_tags.')); + + $result = drupal_html_to_text('

Drupal

', array('b')); + $this->assertEqual($result, 'Drupal' . "\n", t('Tests drupal_html_to_text() basic working of the parameter $allowed_tags.')); + + $result = drupal_html_to_text('Drupal', array('a', 'br', 'h1')); + $this->assertEqual($result, 'Drupal' . "\n", t('Tests drupal_html_to_text() with a limited array of allowed tags.')); + } +} \ No newline at end of file Index: modules/simpletest/simpletest.info =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.info,v retrieving revision 1.6 diff -u -p -r1.6 simpletest.info --- modules/simpletest/simpletest.info 8 Jun 2009 09:23:53 -0000 1.6 +++ modules/simpletest/simpletest.info 16 Jun 2009 20:43:53 -0000 @@ -22,6 +22,7 @@ files[] = tests/file.test files[] = tests/form.test files[] = tests/graph.test files[] = tests/image.test +files[] = tests/mail.test files[] = tests/menu.test files[] = tests/module.test files[] = tests/registry.test