Index: chrome/test/data/webui/test_api.js |
diff --git a/chrome/test/data/webui/test_api.js b/chrome/test/data/webui/test_api.js |
index 140efe7d4b5d9c1743d9ac1f96e095b6b39ba325..c9f23135417eedd4c9101eba9421270a25e8e8ff 100644 |
--- a/chrome/test/data/webui/test_api.js |
+++ b/chrome/test/data/webui/test_api.js |
@@ -11,7 +11,7 @@ |
* @type {Object} |
*/ |
var testing = {}; |
-(function(window) { |
+(function(exports) { |
/** |
* Hold the currentTestCase across between preLoad and run. |
* @type {TestCase} |
@@ -110,6 +110,12 @@ var testing = {}; |
testShouldFail: false, |
/** |
+ * Extra libraries to add before loading this test file. |
+ * @type {Array.<string>} |
+ */ |
+ extraLibraries: [], |
+ |
+ /** |
* Override this method to perform initialization during preload (such as |
* creating mocks and registering handlers). |
* @type {Function} |
@@ -829,7 +835,7 @@ var testing = {}; |
function preloadJavascriptLibraries(testFixture, testName) { |
deferGlobalOverrides = true; |
- window.addEventListener('DOMContentLoaded', function() { |
+ exports.addEventListener('DOMContentLoaded', function() { |
var oldChrome = chrome; |
chrome = { |
__proto__: oldChrome, |
@@ -852,6 +858,11 @@ var testing = {}; |
function GEN() {} |
/** |
+ * During generation phase, this outputs; do nothing at runtime. |
+ */ |
+ function GEN_INCLUDE() {} |
+ |
+ /** |
* At runtime, register the testName with a test fixture. Since this method |
* doesn't have a test fixture, create a dummy fixture to hold its |name| |
* and |testCaseBodies|. |
@@ -1268,44 +1279,45 @@ var testing = {}; |
// Exports. |
testing.Test = Test; |
- window.testDone = testDone; |
- window.assertTrue = assertTrue; |
- window.assertFalse = assertFalse; |
- window.assertGE = assertGE; |
- window.assertGT = assertGT; |
- window.assertEquals = assertEquals; |
- window.assertLE = assertLE; |
- window.assertLT = assertLT; |
- window.assertNotEquals = assertNotEquals; |
- window.assertNotReached = assertNotReached; |
- window.callFunction = callFunction; |
- window.callFunctionWithSavedArgs = callFunctionWithSavedArgs; |
- window.callGlobalWithSavedArgs = callGlobalWithSavedArgs; |
- window.expectTrue = createExpect(assertTrue); |
- window.expectFalse = createExpect(assertFalse); |
- window.expectGE = createExpect(assertGE); |
- window.expectGT = createExpect(assertGT); |
- window.expectEquals = createExpect(assertEquals); |
- window.expectLE = createExpect(assertLE); |
- window.expectLT = createExpect(assertLT); |
- window.expectNotEquals = createExpect(assertNotEquals); |
- window.expectNotReached = createExpect(assertNotReached); |
- window.preloadJavascriptLibraries = preloadJavascriptLibraries; |
- window.registerMessageCallback = registerMessageCallback; |
- window.registerMockGlobals = registerMockGlobals; |
- window.registerMockMessageCallbacks = registerMockMessageCallbacks; |
- window.resetTestState = resetTestState; |
- window.runAllActions = runAllActions; |
- window.runAllActionsAsync = runAllActionsAsync; |
- window.runTest = runTest; |
- window.runTestFunction = runTestFunction; |
- window.SaveMockArguments = SaveMockArguments; |
- window.DUMMY_URL = DUMMY_URL; |
- window.TEST = TEST; |
- window.TEST_F = TEST_F; |
- window.GEN = GEN; |
- window.WhenTestDone = WhenTestDone; |
+ exports.testDone = testDone; |
+ exports.assertTrue = assertTrue; |
+ exports.assertFalse = assertFalse; |
+ exports.assertGE = assertGE; |
+ exports.assertGT = assertGT; |
+ exports.assertEquals = assertEquals; |
+ exports.assertLE = assertLE; |
+ exports.assertLT = assertLT; |
+ exports.assertNotEquals = assertNotEquals; |
+ exports.assertNotReached = assertNotReached; |
+ exports.callFunction = callFunction; |
+ exports.callFunctionWithSavedArgs = callFunctionWithSavedArgs; |
+ exports.callGlobalWithSavedArgs = callGlobalWithSavedArgs; |
+ exports.expectTrue = createExpect(assertTrue); |
+ exports.expectFalse = createExpect(assertFalse); |
+ exports.expectGE = createExpect(assertGE); |
+ exports.expectGT = createExpect(assertGT); |
+ exports.expectEquals = createExpect(assertEquals); |
+ exports.expectLE = createExpect(assertLE); |
+ exports.expectLT = createExpect(assertLT); |
+ exports.expectNotEquals = createExpect(assertNotEquals); |
+ exports.expectNotReached = createExpect(assertNotReached); |
+ exports.preloadJavascriptLibraries = preloadJavascriptLibraries; |
+ exports.registerMessageCallback = registerMessageCallback; |
+ exports.registerMockGlobals = registerMockGlobals; |
+ exports.registerMockMessageCallbacks = registerMockMessageCallbacks; |
+ exports.resetTestState = resetTestState; |
+ exports.runAllActions = runAllActions; |
+ exports.runAllActionsAsync = runAllActionsAsync; |
+ exports.runTest = runTest; |
+ exports.runTestFunction = runTestFunction; |
+ exports.SaveMockArguments = SaveMockArguments; |
+ exports.DUMMY_URL = DUMMY_URL; |
+ exports.TEST = TEST; |
+ exports.TEST_F = TEST_F; |
+ exports.GEN = GEN; |
+ exports.GEN_INCLUDE = GEN_INCLUDE; |
+ exports.WhenTestDone = WhenTestDone; |
// Import the Mock4JS helpers. |
- Mock4JS.addMockSupport(window); |
-})(('window' in this) ? window : this); |
+ Mock4JS.addMockSupport(exports); |
+})(this); |