From 409db6b29916ee8099b5165d327c538c488967f6 Mon Sep 17 00:00:00 2001 From: Jennifer Hodgdon Date: Mon, 17 Sep 2012 12:12:26 -0700 Subject: Issue #1742958 by DamienMcKenna: Fix capitalization of URL and other acronyms --- modules/simpletest/tests/common.test | 22 +++++++++++----------- modules/simpletest/tests/https.php | 4 ++-- modules/simpletest/tests/mail.test | 4 ++-- modules/simpletest/tests/menu.test | 2 +- modules/simpletest/tests/session.test | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'modules/simpletest/tests') diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test index 8848b5c26..e8e403330 100644 --- a/modules/simpletest/tests/common.test +++ b/modules/simpletest/tests/common.test @@ -1847,14 +1847,14 @@ class DrupalRenderTestCase extends DrupalWebTestCase { class ValidUrlTestCase extends DrupalUnitTestCase { public static function getInfo() { return array( - 'name' => 'Valid Url', - 'description' => "Performs tests on Drupal's valid url function.", + 'name' => 'Valid URL', + 'description' => "Performs tests on Drupal's valid URL function.", 'group' => 'System' ); } /** - * Test valid absolute urls. + * Test valid absolute URLs. */ function testValidAbsolute() { $url_schemes = array('http', 'https', 'ftp'); @@ -1889,7 +1889,7 @@ class ValidUrlTestCase extends DrupalUnitTestCase { } /** - * Test invalid absolute urls. + * Test invalid absolute URLs. */ function testInvalidAbsolute() { $url_schemes = array('http', 'https', 'ftp'); @@ -1909,7 +1909,7 @@ class ValidUrlTestCase extends DrupalUnitTestCase { } /** - * Test valid relative urls. + * Test valid relative URLs. */ function testValidRelative() { $valid_relative_urls = array( @@ -1930,7 +1930,7 @@ class ValidUrlTestCase extends DrupalUnitTestCase { } /** - * Test invalid relative urls. + * Test invalid relative URLs. */ function testInvalidRelative() { $invalid_relative_urls = array( @@ -2540,12 +2540,12 @@ class DrupalAddFeedTestCase extends DrupalWebTestCase { 'output_url' => url($path, array('absolute' => TRUE)), 'title' => '', ), - 'external url without title' => array( + 'external URL without title' => array( 'input_url' => $external_url, 'output_url' => $external_url, 'title' => '', ), - 'local url without title' => array( + 'local URL without title' => array( 'input_url' => $fully_qualified_local_url, 'output_url' => $fully_qualified_local_url, 'title' => '', @@ -2555,12 +2555,12 @@ class DrupalAddFeedTestCase extends DrupalWebTestCase { 'output_url' => url($path_for_title, array('absolute' => TRUE)), 'title' => $this->randomName(12), ), - 'external url with title' => array( + 'external URL with title' => array( 'input_url' => $external_for_title, 'output_url' => $external_for_title, 'title' => $this->randomName(12), ), - 'local url with title' => array( + 'local URL with title' => array( 'input_url' => $fully_qualified_for_title, 'output_url' => $fully_qualified_for_title, 'title' => $this->randomName(12), @@ -2581,7 +2581,7 @@ class DrupalAddFeedTestCase extends DrupalWebTestCase { * Create a pattern representing the RSS feed in the page. */ function urlToRSSLinkPattern($url, $title = '') { - // Escape any regular expression characters in the url ('?' is the worst). + // Escape any regular expression characters in the URL ('?' is the worst). $url = preg_replace('/([+?.*])/', '[$0]', $url); $generated_pattern = '%%'; return $generated_pattern; diff --git a/modules/simpletest/tests/https.php b/modules/simpletest/tests/https.php index b5ffab693..0e1a4edeb 100644 --- a/modules/simpletest/tests/https.php +++ b/modules/simpletest/tests/https.php @@ -2,13 +2,13 @@ /** * @file - * Fake an https request, for use during testing. + * Fake an HTTPS request, for use during testing. */ // Set a global variable to indicate a mock HTTPS request. $is_https_mock = empty($_SERVER['HTTPS']); -// Change to https. +// Change to HTTPS. $_SERVER['HTTPS'] = 'on'; foreach ($_SERVER as $key => $value) { $_SERVER[$key] = str_replace('modules/simpletest/tests/https.php', 'index.php', $value); diff --git a/modules/simpletest/tests/mail.test b/modules/simpletest/tests/mail.test index 09dcde60c..b7ce68544 100644 --- a/modules/simpletest/tests/mail.test +++ b/modules/simpletest/tests/mail.test @@ -150,7 +150,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase { $tests = array( // @todo Trailing linefeeds should be trimmed. 'Drupal.org' => "Drupal.org [1]\n\n[1] http://drupal.org\n", - // @todo Footer urls should be absolute. + // @todo Footer URLs should be absolute. "Homepage" => "Homepage [1]\n\n[1] $base_url/\n", '
Drupal
' => "Drupal\n", // @todo The
tag is currently not supported. @@ -367,7 +367,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase { . '
Host, no path' . '
Path, no host' . '
Relative path'; - // @todo Footnote urls should be absolute. + // @todo Footnote URLs should be absolute. $tt = "Host and path [1]" . "\nHost, no path [2]" // @todo The following two references should be combined. diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test index b31fee6e3..1ecc1b1c1 100644 --- a/modules/simpletest/tests/menu.test +++ b/modules/simpletest/tests/menu.test @@ -599,7 +599,7 @@ class MenuRouterTestCase extends DrupalWebTestCase { } /** - * Get a url and assert the title given a case number. If override is true, + * Get a URL and assert the title given a case number. If override is true, * the title is asserted to begin with "Alternative". */ private function menuItemTitlesCasesHelper($case_no, $override = FALSE) { diff --git a/modules/simpletest/tests/session.test b/modules/simpletest/tests/session.test index e5ceb7538..a0feffbb0 100644 --- a/modules/simpletest/tests/session.test +++ b/modules/simpletest/tests/session.test @@ -289,14 +289,14 @@ class SessionTestCase extends DrupalWebTestCase { } /** - * Ensure that when running under https two session cookies are generated. + * Ensure that when running under HTTPS two session cookies are generated. */ class SessionHttpsTestCase extends DrupalWebTestCase { public static function getInfo() { return array( - 'name' => 'Session https handling', - 'description' => 'Ensure that when running under https two session cookies are generated.', + 'name' => 'Session HTTPS handling', + 'description' => 'Ensure that when running under HTTPS two session cookies are generated.', 'group' => 'Session' ); } @@ -384,7 +384,7 @@ class SessionHttpsTestCase extends DrupalWebTestCase { $this->cookies = array(); if ($is_https) { - // The functionality does not make sense when running on https. + // The functionality does not make sense when running on HTTPS. return; } -- cgit v1.2.3