#329226 by drewish and c960657: Remove ugly GLOBALS from file tests to fix file tests.

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test
index ae8d35882..97014962e 100644
--- a/modules/simpletest/tests/file.test
+++ b/modules/simpletest/tests/file.test
@@ -1018,14 +1018,14 @@ class FileValidateTest extends FileHookTestCase {
     // Use the file_test.module's test validator to ensure that passing tests
     // return correctly.
     file_test_reset();
-    $GLOBALS['file_test_hook_return']['validate'] = array();
+    file_test_set_return('validate', array());
     $passing = array('file_test_validator' => array(array()));
     $this->assertEqual(file_validate($file, $passing), array(), t('Validating passes.'));
     $this->assertFileHookCalled('validate', 1);
 
     // Now test for failures in validators passed in and by hook_validate.
     file_test_reset();
-    $GLOBALS['file_test_hook_return']['validate'] = array('Epic fail');
+    file_test_set_return('validate', array('Epic fail'));
     $failing = array('file_test_validator' => array(array('Failed', 'Badly')));
     $this->assertEqual(file_validate($file, $failing), array('Failed', 'Badly', 'Epic fail'), t('Validating returns errors.'));
     $this->assertFileHookCalled('validate', 1);