From a205dcdc09ef87be90e0e6d6a7720fd8a22a63ed Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Tue, 6 Mar 2007 05:05:45 +0000 Subject: [PATCH] Upgraded weblib::format_string() so it accepts unicode htmlentities. Also added more unit tests, including a stub for an integration web-based test. --- lib/simpletest/testajaxlib.php | 60 ++++++++++++++++++++++---------- lib/simpletest/testmoodlelib.php | 35 +++++++++++++++---- lib/simpletest/testweblib.php | 9 +++++ lib/simpletestlib.php | 1 + lib/weblib.php | 2 +- 5 files changed, 81 insertions(+), 26 deletions(-) diff --git a/lib/simpletest/testajaxlib.php b/lib/simpletest/testajaxlib.php index 2e0ff2ff61..74d5f9abfe 100644 --- a/lib/simpletest/testajaxlib.php +++ b/lib/simpletest/testajaxlib.php @@ -42,6 +42,30 @@ require_once($CFG->libdir . '/ajax/ajaxlib.php'); class ajaxlib_test extends UnitTestCase { + var $user_agents = array( + 'MSIE' => array( + '5.5' => array('Windows 2000' => 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)'), + '6.0' => array('Windows XP SP2' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)'), + '7.0' => array('Windows XP SP2' => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; YPC 3.0.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)') + ), + 'Firefox' => array( + '1.0.6' => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.10) Gecko/20050716 Firefox/1.0.6'), + '1.5' => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; nl; rv:1.8) Gecko/20051107 Firefox/1.5'), + '1.5.0.1' => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.0.1) Gecko/20060111 Firefox/1.5.0.1'), + '2.0' => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.1) Gecko/20061204 Firefox/2.0.0.1', + 'Ubuntu Linux AMD64' => 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.1) Gecko/20060601 Firefox/2.0 (Ubuntu-edgy)') + ), + 'Safari' => array( + '312' => array('Mac OS X' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/312.1 (KHTML, like Gecko) Safari/312'), + '2.0' => array('Mac OS X' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/412 (KHTML, like Gecko) Safari/412') + ), + 'Opera' => array( + '8.51' => array('Windows XP' => 'Opera/8.51 (Windows NT 5.1; U; en)'), + '9.0' => array('Windows XP' => 'Opera/9.0 (Windows NT 5.1; U; en)', + 'Debian Linux' => 'Opera/9.01 (X11; Linux i686; U; en)') + ) + ); + function setUp() { } @@ -57,62 +81,60 @@ class ajaxlib_test extends UnitTestCase { $CFG->enableajax = true; $USER->ajax = true; - require_once($CFG->libdir . '/simpletest/fixtures/user_agents.php'); - // Should be true - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Firefox']['2.0']['Windows XP']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['2.0']['Windows XP']; $this->assertTrue(ajaxenabled()); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Firefox']['1.5']['Windows XP']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['1.5']['Windows XP']; $this->assertTrue(ajaxenabled()); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Safari']['2.0']['Mac OS X']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Safari']['2.0']['Mac OS X']; $this->assertTrue(ajaxenabled()); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Opera']['9.0']['Windows XP']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Opera']['9.0']['Windows XP']; $this->assertTrue(ajaxenabled()); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['MSIE']['6.0']['Windows XP SP2']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['MSIE']['6.0']['Windows XP SP2']; $this->assertTrue(ajaxenabled()); // Should be false - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Firefox']['1.0.6']['Windows XP']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['1.0.6']['Windows XP']; $this->assertFalse(ajaxenabled()); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Safari']['312']['Mac OS X']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Safari']['312']['Mac OS X']; $this->assertFalse(ajaxenabled()); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Opera']['8.51']['Windows XP']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Opera']['8.51']['Windows XP']; $this->assertFalse(ajaxenabled()); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['MSIE']['5.5']['Windows 2000']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['MSIE']['5.5']['Windows 2000']; $this->assertFalse(ajaxenabled()); // Test array of tested browsers $tested_browsers = array('MSIE' => 6.0, 'Gecko' => 20061111); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Firefox']['2.0']['Windows XP']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['2.0']['Windows XP']; $this->assertTrue(ajaxenabled($tested_browsers)); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['MSIE']['7.0']['Windows XP SP2']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['MSIE']['7.0']['Windows XP SP2']; $this->assertTrue(ajaxenabled($tested_browsers)); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Safari']['2.0']['Mac OS X']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Safari']['2.0']['Mac OS X']; $this->assertFalse(ajaxenabled($tested_browsers)); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Opera']['9.0']['Windows XP']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Opera']['9.0']['Windows XP']; $this->assertFalse(ajaxenabled($tested_browsers)); $tested_browsers = array('Safari' => 412, 'Opera' => 9.0); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Firefox']['2.0']['Windows XP']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['2.0']['Windows XP']; $this->assertFalse(ajaxenabled($tested_browsers)); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['MSIE']['7.0']['Windows XP SP2']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['MSIE']['7.0']['Windows XP SP2']; $this->assertFalse(ajaxenabled($tested_browsers)); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Safari']['2.0']['Mac OS X']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Safari']['2.0']['Mac OS X']; $this->assertTrue(ajaxenabled($tested_browsers)); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Opera']['9.0']['Windows XP']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Opera']['9.0']['Windows XP']; $this->assertTrue(ajaxenabled($tested_browsers)); } } diff --git a/lib/simpletest/testmoodlelib.php b/lib/simpletest/testmoodlelib.php index c7b019297d..14bd707f18 100644 --- a/lib/simpletest/testmoodlelib.php +++ b/lib/simpletest/testmoodlelib.php @@ -42,6 +42,30 @@ require_once($CFG->libdir . '/moodlelib.php'); class moodlelib_test extends UnitTestCase { + var $user_agents = array( + 'MSIE' => array( + '5.5' => array('Windows 2000' => 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)'), + '6.0' => array('Windows XP SP2' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)'), + '7.0' => array('Windows XP SP2' => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; YPC 3.0.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)') + ), + 'Firefox' => array( + '1.0.6' => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.10) Gecko/20050716 Firefox/1.0.6'), + '1.5' => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; nl; rv:1.8) Gecko/20051107 Firefox/1.5'), + '1.5.0.1' => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.0.1) Gecko/20060111 Firefox/1.5.0.1'), + '2.0' => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.1) Gecko/20061204 Firefox/2.0.0.1', + 'Ubuntu Linux AMD64' => 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.1) Gecko/20060601 Firefox/2.0 (Ubuntu-edgy)') + ), + 'Safari' => array( + '312' => array('Mac OS X' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/312.1 (KHTML, like Gecko) Safari/312'), + '2.0' => array('Mac OS X' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/412 (KHTML, like Gecko) Safari/412') + ), + 'Opera' => array( + '8.51' => array('Windows XP' => 'Opera/8.51 (Windows NT 5.1; U; en)'), + '9.0' => array('Windows XP' => 'Opera/9.0 (Windows NT 5.1; U; en)', + 'Debian Linux' => 'Opera/9.01 (X11; Linux i686; U; en)') + ) + ); + function setUp() { } @@ -81,22 +105,21 @@ class moodlelib_test extends UnitTestCase { */ function test_check_browser_version() { - require_once($CFG->libdir . '/simpletest/fixtures/user_agents.php'); + global $CFG; - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Safari']['2.0']['Mac OS X']; - var_dump($_SERVER['HTTP_USER_AGENT']); + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Safari']['2.0']['Mac OS X']; $this->assertTrue(check_browser_version('Safari', '312')); $this->assertFalse(check_browser_version('Safari', '500')); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Opera']['9.0']['Windows XP']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Opera']['9.0']['Windows XP']; $this->assertTrue(check_browser_version('Opera', '8.0')); $this->assertFalse(check_browser_version('Opera', '10.0')); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['MSIE']['6.0']['Windows XP SP2']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['MSIE']['6.0']['Windows XP SP2']; $this->assertTrue(check_browser_version('MSIE', '5.0')); $this->assertFalse(check_browser_version('MSIE', '7.0')); - $_SERVER['HTTP_USER_AGENT'] = $user_agents['Firefox']['2.0']['Windows XP']; + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['2.0']['Windows XP']; $this->assertTrue(check_browser_version('Firefox', '1.5')); $this->assertFalse(check_browser_version('Firefox', '3.0')); } diff --git a/lib/simpletest/testweblib.php b/lib/simpletest/testweblib.php index 214d23111b..025209ee5f 100644 --- a/lib/simpletest/testweblib.php +++ b/lib/simpletest/testweblib.php @@ -24,11 +24,20 @@ class web_test extends UnitTestCase { } function test_format_string() { + // Ampersands $this->assertEqual(format_string("& &&&&& &&"), "& &&&&& &&"); $this->assertEqual(format_string("ANother & &&&&& Category"), "ANother & &&&&& Category"); $this->assertEqual(format_string("ANother & &&&&& Category", true), "ANother & &&&&& Category"); $this->assertEqual(format_string("Nick's Test Site & Other things", true), "Nick's Test Site & Other things"); + // String entities + $this->assertEqual(format_string("""), """); + + // Digital entities + $this->assertEqual(format_string("&11234;"), "&11234;"); + + // Unicode entities + $this->assertEqual(format_string("ᅻ"), "ᅻ"); } function test_s() { diff --git a/lib/simpletestlib.php b/lib/simpletestlib.php index 3bf1ba0eaa..7793878df9 100644 --- a/lib/simpletestlib.php +++ b/lib/simpletestlib.php @@ -18,6 +18,7 @@ require_once($CFG->libdir . '/simpletestlib/simpletest.php'); require_once($CFG->libdir . '/simpletestlib/unit_tester.php'); require_once($CFG->libdir . '/simpletestlib/expectation.php'); require_once($CFG->libdir . '/simpletestlib/reporter.php'); +require_once($CFG->libdir . '/simpletestlib/web_tester.php'); /** * Recursively visit all the files in the source tree. Calls the callback diff --git a/lib/weblib.php b/lib/weblib.php index db42b43bcf..654b3383c5 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -1432,7 +1432,7 @@ function format_string ($string, $striplinks = false, $courseid=NULL ) { } // First replace all ampersands not followed by html entity code - $string = preg_replace("/\&(?![a-z0-9]{1,8};)/", "&", $string); + $string = preg_replace("/\&(?![a-z0-9#]{1,8};)/", "&", $string); if (!empty($CFG->filterall)) { $string = filter_text($string, $courseid); -- 2.39.5