diff options
Diffstat (limited to 'modules/simpletest/tests')
-rw-r--r-- | modules/simpletest/tests/bootstrap.test | 8 | ||||
-rw-r--r-- | modules/simpletest/tests/database_test.test | 2 | ||||
-rw-r--r-- | modules/simpletest/tests/file.test | 18 | ||||
-rw-r--r-- | modules/simpletest/tests/form.test | 6 | ||||
-rw-r--r-- | modules/simpletest/tests/form_test.module | 2 | ||||
-rw-r--r-- | modules/simpletest/tests/menu.test | 2 | ||||
-rw-r--r-- | modules/simpletest/tests/path.test | 2 | ||||
-rw-r--r-- | modules/simpletest/tests/upgrade/upgrade.test | 2 |
8 files changed, 21 insertions, 21 deletions
diff --git a/modules/simpletest/tests/bootstrap.test b/modules/simpletest/tests/bootstrap.test index 14c16a95b..cb4fe8e2a 100644 --- a/modules/simpletest/tests/bootstrap.test +++ b/modules/simpletest/tests/bootstrap.test @@ -308,15 +308,15 @@ class HookBootExitTestCase extends DrupalWebTestCase { variable_set('page_cache_invoke_hooks', FALSE); $this->assertTrue(cache_get(url('', array('absolute' => TRUE)), 'cache_page'), t('Page has been cached.')); $this->drupalGet(''); - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot not called with agressive cache and a cached page.')); - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit not called with agressive cache and a cached page.')); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot not called with aggressive cache and a cached page.')); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit not called with aggressive cache and a cached page.')); // Test with page cache cleared, boot and exit should be called. $this->assertTrue(db_delete('cache_page')->execute(), t('Page cache cleared.')); $this->drupalGet(''); $calls++; - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot called with agressive cache and no cached page.')); - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit called with agressive cache and no cached page.')); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot called with aggressive cache and no cached page.')); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit called with aggressive cache and no cached page.')); } } diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test index 2a3d4c416..87d386aa7 100644 --- a/modules/simpletest/tests/database_test.test +++ b/modules/simpletest/tests/database_test.test @@ -2096,7 +2096,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase { */ function testCountQueryFieldRemovals() { // countQuery should remove all fields and expressions, so this can be - // tested by adding a non-existant field and expression: if it ends + // tested by adding a non-existent field and expression: if it ends // up in the query, an error will be thrown. If not, it will return the // number of records, which in this case happens to be 4 (there are four // records in the {test} table). diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test index 3633bae11..0e8c639e7 100644 --- a/modules/simpletest/tests/file.test +++ b/modules/simpletest/tests/file.test @@ -1606,7 +1606,7 @@ class FileMoveTest extends FileHookTestCase { $result = file_move(clone $source, $desired_filepath, FILE_EXISTS_ERROR); // Check the return status and that the contents changed. - $this->assertTrue($result, t('File moved sucessfully.')); + $this->assertTrue($result, t('File moved successfully.')); $this->assertFalse(file_exists($source->uri)); $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file correctly written.')); @@ -1638,7 +1638,7 @@ class FileMoveTest extends FileHookTestCase { $result = file_move(clone $source, $target->uri, FILE_EXISTS_RENAME); // Check the return status and that the contents changed. - $this->assertTrue($result, t('File moved sucessfully.')); + $this->assertTrue($result, t('File moved successfully.')); $this->assertFalse(file_exists($source->uri)); $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file correctly written.')); @@ -1675,7 +1675,7 @@ class FileMoveTest extends FileHookTestCase { // Look at the results. $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were overwritten.')); $this->assertFalse(file_exists($source->uri)); - $this->assertTrue($result, t('File moved sucessfully.')); + $this->assertTrue($result, t('File moved successfully.')); // Check that the correct hooks were called. $this->assertFileHooksCalled(array('move', 'update', 'delete', 'load')); @@ -1767,7 +1767,7 @@ class FileCopyTest extends FileHookTestCase { $result = file_copy(clone $source, $desired_uri, FILE_EXISTS_ERROR); // Check the return status and that the contents changed. - $this->assertTrue($result, t('File copied sucessfully.')); + $this->assertTrue($result, t('File copied successfully.')); $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were copied correctly.')); // Check that the correct hooks were called. @@ -1798,7 +1798,7 @@ class FileCopyTest extends FileHookTestCase { $result = file_copy(clone $source, $target->uri, FILE_EXISTS_RENAME); // Check the return status and that the contents changed. - $this->assertTrue($result, t('File copied sucessfully.')); + $this->assertTrue($result, t('File copied successfully.')); $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were copied correctly.')); $this->assertNotEqual($result->uri, $source->uri, t('Returned file path has changed from the original.')); @@ -1838,7 +1838,7 @@ class FileCopyTest extends FileHookTestCase { $result = file_copy(clone $source, $target->uri, FILE_EXISTS_REPLACE); // Check the return status and that the contents changed. - $this->assertTrue($result, t('File copied sucessfully.')); + $this->assertTrue($result, t('File copied successfully.')); $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were overwritten.')); $this->assertDifferentFile($source, $result); @@ -2160,7 +2160,7 @@ class FileValidateTest extends FileHookTestCase { $file = $this->createFile(); // Empty validators. - $this->assertEqual(file_validate($file, array()), array(), t('Validating an empty array works succesfully.')); + $this->assertEqual(file_validate($file, array()), array(), t('Validating an empty array works successfully.')); $this->assertFileHooksCalled(array('validate')); // Use the file_test.module's test validator to ensure that passing tests @@ -2245,7 +2245,7 @@ class FileSaveDataTest extends FileHookTestCase { $contents = $this->randomName(8); $result = file_save_data($contents, $existing->uri, FILE_EXISTS_RENAME); - $this->assertTrue($result, t("File saved sucessfully.")); + $this->assertTrue($result, t("File saved successfully.")); $this->assertEqual('public', file_uri_scheme($result->uri), t("File was placed in Drupal's files directory.")); $this->assertEqual($result->filename, $existing->filename, t("Filename was set to the basename of the source, rather than that of the renamed file.")); @@ -2273,7 +2273,7 @@ class FileSaveDataTest extends FileHookTestCase { $contents = $this->randomName(8); $result = file_save_data($contents, $existing->uri, FILE_EXISTS_REPLACE); - $this->assertTrue($result, t('File saved sucessfully.')); + $this->assertTrue($result, t('File saved successfully.')); $this->assertEqual('public', file_uri_scheme($result->uri), t("File was placed in Drupal's files directory.")); $this->assertEqual($result->filename, $existing->filename, t('Filename was set to the basename of the existing file, rather than preserving the original name.')); diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test index e7ae9de3f..fe2c1bbfb 100644 --- a/modules/simpletest/tests/form.test +++ b/modules/simpletest/tests/form.test @@ -599,13 +599,13 @@ class FormsElementsLabelsTestCase extends DrupalWebTestCase { // Exercise various defaults for textboxes and modifications to ensure // appropriate override and correct behaviour. $elements = $this->xpath('//label[@for="edit-form-textfield-test-title-and-required"]/child::span[@class="form-required"]/parent::*/following-sibling::input[@id="edit-form-textfield-test-title-and-required"]'); - $this->assertTrue(isset($elements[0]), t("Label preceeds textfield, with required marker inside label.")); + $this->assertTrue(isset($elements[0]), t("Label precedes textfield, with required marker inside label.")); $elements = $this->xpath('//input[@id="edit-form-textfield-test-no-title-required"]/preceding-sibling::label[@for="edit-form-textfield-test-no-title-required"]/span[@class="form-required"]'); - $this->assertTrue(isset($elements[0]), t("Label tag with required marker preceeds required textfield with no title.")); + $this->assertTrue(isset($elements[0]), t("Label tag with required marker precedes required textfield with no title.")); $elements = $this->xpath('//input[@id="edit-form-textfield-test-title-invisible"]/preceding-sibling::label[@for="edit-form-textfield-test-title-invisible" and @class="element-invisible"]'); - $this->assertTrue(isset($elements[0]), t("Label preceeding field and label class is element-invisible.")); + $this->assertTrue(isset($elements[0]), t("Label preceding field and label class is element-invisible.")); $elements = $this->xpath('//input[@id="edit-form-textfield-test-title"]/preceding-sibling::span[@class="form-required"]'); $this->assertFalse(isset($elements[0]), t("No required marker on non-required field.")); diff --git a/modules/simpletest/tests/form_test.module b/modules/simpletest/tests/form_test.module index 00be7d2e6..23aca244b 100644 --- a/modules/simpletest/tests/form_test.module +++ b/modules/simpletest/tests/form_test.module @@ -713,7 +713,7 @@ function form_label_test_form() { ); $form['form_textfield_test_no_title_required'] = array( '#type' => 'textfield', - // We use an empty title, since not setting #title supresses the label + // We use an empty title, since not setting #title suppresses the label // and required marker. '#title' => '', '#required' => TRUE, diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test index 0ec61dccf..5b4847f75 100644 --- a/modules/simpletest/tests/menu.test +++ b/modules/simpletest/tests/menu.test @@ -536,7 +536,7 @@ class MenuRouterTestCase extends DrupalWebTestCase { } /** - * Test menu maintainance hooks. + * Test menu maintenance hooks. */ function testMenuItemHooks() { // Create an item. diff --git a/modules/simpletest/tests/path.test b/modules/simpletest/tests/path.test index 0c8ecdac4..4998ffa38 100644 --- a/modules/simpletest/tests/path.test +++ b/modules/simpletest/tests/path.test @@ -171,7 +171,7 @@ class UrlAlterFunctionalTest extends DrupalWebTestCase { $this->assertUrlInboundAlter('alias/test2', "user/$uid/edit"); $this->assertUrlOutboundAlter("user/$uid/edit", 'alias/test2'); - // Test a non-existant user is not altered. + // Test a non-existent user is not altered. $uid++; $this->assertUrlInboundAlter("user/$uid", "user/$uid"); $this->assertUrlOutboundAlter("user/$uid", "user/$uid"); diff --git a/modules/simpletest/tests/upgrade/upgrade.test b/modules/simpletest/tests/upgrade/upgrade.test index 6aadee379..7f934fe7b 100644 --- a/modules/simpletest/tests/upgrade/upgrade.test +++ b/modules/simpletest/tests/upgrade/upgrade.test @@ -137,7 +137,7 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase { protected function tearDown() { global $user, $language; - // In case a fatal error occured that was not in the test process read the + // In case a fatal error occurred that was not in the test process read the // log to pick up any fatal errors. simpletest_log_read($this->testId, $this->databasePrefix, get_class($this), TRUE); |