From 16b12da3e38b6222026bffebc7a87bdf4052cef4 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Sat, 18 Dec 2010 15:45:23 +0100 Subject: [PATCH] make test definitions async --- lib/ace/test/change_document_test.js | 10 +++++++--- lib/ace/test/document_test.js | 12 +++++++----- lib/ace/test/mode/css_test.js | 9 ++++++--- lib/ace/test/mode/css_tokenizer_test.js | 12 ++++++++---- lib/ace/test/mode/html_test.js | 11 +++++++---- lib/ace/test/mode/html_tokenizer_test.js | 11 +++++++---- lib/ace/test/mode/javascript_test.js | 11 +++++++---- lib/ace/test/mode/javascript_tokenizer_test.js | 11 +++++++---- lib/ace/test/mode/text_test.js | 9 ++++++--- lib/ace/test/mode/xml_test.js | 9 ++++++--- lib/ace/test/mode/xml_tokenizer_test.js | 11 +++++++---- lib/ace/test/navigation_test.js | 10 +++++++--- lib/ace/test/range_test.js | 9 ++++++--- lib/ace/test/search_test.js | 9 ++++++--- lib/ace/test/selection_test.js | 9 ++++++--- lib/ace/test/text_edit_test.js | 9 ++++++--- lib/ace/test/virtual_renderer_test.js | 9 ++++++--- 17 files changed, 112 insertions(+), 59 deletions(-) diff --git a/lib/ace/test/change_document_test.js b/lib/ace/test/change_document_test.js index 24561d9b..88a9591d 100644 --- a/lib/ace/test/change_document_test.js +++ b/lib/ace/test/change_document_test.js @@ -35,7 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../support/paths"); +define(function(require, exports, module) { + require("./mockdom"); var Document = require("../document").Document, @@ -153,6 +154,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} diff --git a/lib/ace/test/document_test.js b/lib/ace/test/document_test.js index 9b24c404..253ecbb8 100644 --- a/lib/ace/test/document_test.js +++ b/lib/ace/test/document_test.js @@ -35,8 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../support/paths"); -require("./mockdom"); +define(function(require, exports, module) { var Document = require("../document").Document, UndoManager = require("../undomanager").UndoManager, @@ -221,7 +220,10 @@ var Test = { } }; -module.exports = require("async/test").testcase(Test) +module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} \ No newline at end of file diff --git a/lib/ace/test/mode/css_test.js b/lib/ace/test/mode/css_test.js index 7251fb1c..845192de 100644 --- a/lib/ace/test/mode/css_test.js +++ b/lib/ace/test/mode/css_test.js @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../../support/paths"); +define(function(require, exports, module) { var Document = require("ace/document").Document; var CssMode = require("ace/mode/css").Mode; @@ -71,6 +71,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() \ No newline at end of file +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} \ No newline at end of file diff --git a/lib/ace/test/mode/css_tokenizer_test.js b/lib/ace/test/mode/css_tokenizer_test.js index 96f71159..bb6c29a9 100644 --- a/lib/ace/test/mode/css_tokenizer_test.js +++ b/lib/ace/test/mode/css_tokenizer_test.js @@ -35,8 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../../support/paths"); - +define(function(require, exports, module) { + var CssMode = require("ace/mode/css").Mode; var assert = require("../assertions"); @@ -86,5 +86,9 @@ var Test = { module.exports = require("async/test").testcase(Test, "css tokenizer"); -if (module === require.main) - module.exports.exec() \ No newline at end of file +}); + +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} \ No newline at end of file diff --git a/lib/ace/test/mode/html_test.js b/lib/ace/test/mode/html_test.js index 9e28d32f..ba1da6bc 100644 --- a/lib/ace/test/mode/html_test.js +++ b/lib/ace/test/mode/html_test.js @@ -35,8 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../../support/paths"); - +define(function(require, exports, module) { + var Document = require("ace/document").Document; var Range = require("ace/range").Range; var HtmlMode = require("ace/mode/html").Mode; @@ -63,6 +63,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() \ No newline at end of file +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} \ No newline at end of file diff --git a/lib/ace/test/mode/html_tokenizer_test.js b/lib/ace/test/mode/html_tokenizer_test.js index 2aebe38e..03dfeced 100644 --- a/lib/ace/test/mode/html_tokenizer_test.js +++ b/lib/ace/test/mode/html_tokenizer_test.js @@ -35,8 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../../support/paths"); - +define(function(require, exports, module) { + var HtmlMode = require("ace/mode/html").Mode; var assert = require("../assertions"); @@ -66,6 +66,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() \ No newline at end of file +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} \ No newline at end of file diff --git a/lib/ace/test/mode/javascript_test.js b/lib/ace/test/mode/javascript_test.js index 75844151..55ede1b8 100644 --- a/lib/ace/test/mode/javascript_test.js +++ b/lib/ace/test/mode/javascript_test.js @@ -35,8 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../../support/paths"); - +define(function(require, exports, module) { + var Document = require("ace/document").Document; var Tokenizer = require("ace/tokenizer").Tokenizer; var JavaScriptMode = require("ace/mode/javascript").Mode; @@ -145,6 +145,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() \ No newline at end of file +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} \ No newline at end of file diff --git a/lib/ace/test/mode/javascript_tokenizer_test.js b/lib/ace/test/mode/javascript_tokenizer_test.js index 404f1a0f..1b343163 100644 --- a/lib/ace/test/mode/javascript_tokenizer_test.js +++ b/lib/ace/test/mode/javascript_tokenizer_test.js @@ -35,8 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../../support/paths"); - +define(function(require, exports, module) { + var JavaScriptMode = require("ace/mode/javascript").Mode; var assert = require("../assertions"); @@ -102,6 +102,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() \ No newline at end of file +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} \ No newline at end of file diff --git a/lib/ace/test/mode/text_test.js b/lib/ace/test/mode/text_test.js index 79dc35aa..66b2b612 100644 --- a/lib/ace/test/mode/text_test.js +++ b/lib/ace/test/mode/text_test.js @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../../support/paths"); +define(function(require, exports, module) { var Document = require("ace/document").Document; var TextMode = require("ace/mode/text").Mode; @@ -60,6 +60,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() \ No newline at end of file +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} \ No newline at end of file diff --git a/lib/ace/test/mode/xml_test.js b/lib/ace/test/mode/xml_test.js index 11ca111a..63ae5fb9 100644 --- a/lib/ace/test/mode/xml_test.js +++ b/lib/ace/test/mode/xml_test.js @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../../support/paths"); +define(function(require, exports, module) { var Document = require("ace/document").Document; var Tokenizer = require("ace/tokenizer").Tokenizer; @@ -71,6 +71,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() \ No newline at end of file +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} \ No newline at end of file diff --git a/lib/ace/test/mode/xml_tokenizer_test.js b/lib/ace/test/mode/xml_tokenizer_test.js index d1e16bc2..fa8c3301 100644 --- a/lib/ace/test/mode/xml_tokenizer_test.js +++ b/lib/ace/test/mode/xml_tokenizer_test.js @@ -36,8 +36,8 @@ * ***** END LICENSE BLOCK ***** */ -require("../../../../support/paths"); - +define(function(require, exports, module) { + var XmlMode = require("ace/mode/xml").Mode; var assert = require("../assertions"); @@ -61,6 +61,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() \ No newline at end of file +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} \ No newline at end of file diff --git a/lib/ace/test/navigation_test.js b/lib/ace/test/navigation_test.js index 907650a5..ae69119e 100644 --- a/lib/ace/test/navigation_test.js +++ b/lib/ace/test/navigation_test.js @@ -35,7 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../support/paths"); +define(function(require, exports, module) { + require("./mockdom"); var Document = require("../Document").Document, @@ -150,6 +151,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test) +}); -if (module === require.main) - module.exports.exec() +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} diff --git a/lib/ace/test/range_test.js b/lib/ace/test/range_test.js index 471c6857..f09d6112 100644 --- a/lib/ace/test/range_test.js +++ b/lib/ace/test/range_test.js @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../support/paths"); +define(function(require, exports, module) { var Range = require("../range").Range, assert = require("./assertions"); @@ -162,6 +162,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} diff --git a/lib/ace/test/search_test.js b/lib/ace/test/search_test.js index d86d59e0..3b94e296 100644 --- a/lib/ace/test/search_test.js +++ b/lib/ace/test/search_test.js @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../support/paths"); +define(function(require, exports, module) { var Document = require("../document").Document, Search = require("../search").Search, @@ -345,6 +345,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test) +}); -if (module === require.main) - module.exports.exec(); +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} diff --git a/lib/ace/test/selection_test.js b/lib/ace/test/selection_test.js index 571117dd..96544443 100644 --- a/lib/ace/test/selection_test.js +++ b/lib/ace/test/selection_test.js @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../support/paths"); +define(function(require, exports, module) { var Document = require("../document").Document, assert = require("./assertions"); @@ -291,6 +291,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} diff --git a/lib/ace/test/text_edit_test.js b/lib/ace/test/text_edit_test.js index d917b363..85807405 100644 --- a/lib/ace/test/text_edit_test.js +++ b/lib/ace/test/text_edit_test.js @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../support/paths"); +define(function(require, exports, module) { require("./mockdom"); var Document = require("../document").Document, @@ -412,6 +412,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +} diff --git a/lib/ace/test/virtual_renderer_test.js b/lib/ace/test/virtual_renderer_test.js index 088dcb28..a0473b87 100644 --- a/lib/ace/test/virtual_renderer_test.js +++ b/lib/ace/test/virtual_renderer_test.js @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../support/paths"); +define(function(require, exports, module) { require("./mockdom"); var Document = require("../document").Document, @@ -73,6 +73,9 @@ var Test = { }; module.exports = require("async/test").testcase(Test); +}); -if (module === require.main) - module.exports.exec() +if (module === require.main) { + require("../../../support/paths"); + exports.exec() +}