From db4f638aa9ed99fa5e90284b383327eb839b8aab Mon Sep 17 00:00:00 2001 From: Eloy Lafuente Date: Mon, 30 Nov 2009 02:06:43 +0000 Subject: [PATCH] MDL-20826 convert_urls_into_links() - add some test to reveal (side?) problems and allow comparing of alternatives. Merged from 19_STABLE --- lib/simpletest/testweblib.php | 44 +++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/lib/simpletest/testweblib.php b/lib/simpletest/testweblib.php index 94fcaf56cf..bb35e7f9b6 100644 --- a/lib/simpletest/testweblib.php +++ b/lib/simpletest/testweblib.php @@ -88,16 +88,6 @@ class web_test extends UnitTestCase { $this->assertEqual(fix_non_standard_entities('£ä'), '£ä'); } - function test_convert_urls_into_links() { - $string = "visit http://www.moodle.org"; - convert_urls_into_links($string); - $this->assertEqual($string, 'visit http://www.moodle.org'); - - $string = "visit www.moodle.org"; - convert_urls_into_links($string); - $this->assertEqual($string, 'visit www.moodle.org'); - } - function test_prepare_url() { global $CFG, $PAGE; $fullexternalurl = 'http://www.externalsite.com/somepage.php'; @@ -143,6 +133,40 @@ class web_test extends UnitTestCase { $this->assertTrue($url1->compare($url2, URL_MATCH_PARAMS)); $this->assertTrue($url1->compare($url2, URL_MATCH_EXACT)); } + + function test_convert_urls_into_links() { + $texts = array ( + 'URL: http://moodle.org/s/i=1&j=2' => 'URL: http://moodle.org/s/i=1&j=2', + 'URL: www.moodle.org/s/i=1&j=2' => 'URL: www.moodle.org/s/i=1&j=2', + 'URL: https://moodle.org/s/i=1&j=2' => 'URL: https://moodle.org/s/i=1&j=2', + 'URL: http://moodle.org:8080/s/i=1' => 'URL: http://moodle.org:8080/s/i=1', + 'http://moodle.org - URL' => 'http://moodle.org - URL', + 'www.moodle.org - URL' => 'www.moodle.org - URL', + '(http://moodle.org) - URL' => '(http://moodle.org) - URL', + '(www.moodle.org) - URL' => '(www.moodle.org) - URL', + '[http://moodle.org] - URL' => '[http://moodle.org] - URL', + '[www.moodle.org] - URL' => '[www.moodle.org] - URL', + '[http://moodle.org/main#anchor] - URL' => '[http://moodle.org/main#anchor] - URL', + '[www.moodle.org/main#anchor] - URL' => '[www.moodle.org/main#anchor] - URL', + 'URL: http://cc.org/url_(withpar)_go/?i=2' => 'URL: http://cc.org/url_(withpar)_go/?i=2', + 'URL: www.cc.org/url_(withpar)_go/?i=2' => 'URL: www.cc.org/url_(withpar)_go/?i=2', + 'URL: http://cc.org/url_(with)_(par)_go/?i=2' => 'URL: http://cc.org/url_(with)_(par)_go/?i=2', + 'URL: www.cc.org/url_(with)_(par)_go/?i=2' => 'URL: www.cc.org/url_(with)_(par)_go/?i=2', + 'URL: http://moodle.org' => 'URL: http://moodle.org', + 'URL: www.moodle.org' => 'URL: www.moodle.org', + 'URL: http://moodle.org' => 'URL: http://moodle.org', + 'URL: www.moodle.org' => 'URL: www.moodle.org', + 'URL: http://moodle.org/s/i=1&j=2.' => 'URL: http://moodle.org/s/i=1&j=2.', + 'URL: www.moodle.org/s/i=1&j=2.' => 'URL: www.moodle.org/s/i=1&j=2.', + 'URL: http://moodle.org)
' => 'URL: http://moodle.org)
', + 'URL:

text www.moodle.org</p> text' => 'URL:

text www.moodle.org</p> text' + ); + foreach ($texts as $text => $correctresult) { + $failedmsg = "Testing text: \"$text\": %s"; + convert_urls_into_links($text); + $this->assertEqual($text, $correctresult, $failedmsg); + } + } } -- 2.39.5