jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix all tests to run with node.js

Browse source
This commit is contained in:
Fabian Jakobs 2010-12-14 15:09:24 +01:00
commit f07745839c
15 changed files with 181 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ace/document.js
View file

@ -47,7 +47,7 @@ var Range = require("ace/range").Range;
var Document = function(text, mode) {
this.modified = true;
this.lines = [""];
this.lines = [];
this.selection = new Selection(this);
this.$breakpoints = [];
@ -623,7 +623,7 @@ var Document = function(text, mode) {
};
this.indentRows = function(range, indentString) {
indentString.replace("\t", this.getTabString());
indentString = indentString.replace("\t", this.getTabString());
for (var row=range.start.row; row<=range.end.row; row++) {
this.$insert({row: row, column:0}, indentString);
}

23
lib/ace/test/all.js
View file

@ -35,14 +35,17 @@
*
* ***** END LICENSE BLOCK ***** */
require({
paths: {
"ace": "../src/ace"
}},
["ace/test/assertions", "ace/test/ChangeDocumentTest"],
function(a) {
console.log(a)
alert("a " + a)
}
);
require("../../../support/paths");
var async = require("async");
async.concat(
require("./change_document_test"),
require("./document_test"),
require("./event_emitter_test"),
require("./navigation_test"),
require("./range_test"),
require("./search_test"),
require("./selection_test"),
require("./text_edit_test")
).exec();

18
lib/ace/test/change_document_test.js
View file

@ -36,20 +36,12 @@
* ***** END LICENSE BLOCK ***** */
require("../../../support/paths");
require("./mockdom");
var dom = require('jsdom/level2/html').dom.level2.html;
var browser = require('jsdom/browser/index').windowAugmentation(dom);
global.document = browser.document;
global.window = browser.window;
global.self = browser.self;
global.navigator = browser.navigator;
global.location = browser.location;
var Document = require("../document"),
Editor = require("../editor"),
Text = require("../mode/text"),
JavaScriptMode = require("../mode/javascript"),
var Document = require("../document").Document,
Editor = require("../editor").Editor,
Text = require("../mode/text").Mode,
JavaScriptMode = require("../mode/javascript").Mode,
MockRenderer = require("./mockrenderer"),
assert = require("./assertions");

57
lib/ace/test/document_test.js
View file

@ -36,12 +36,12 @@
* ***** END LICENSE BLOCK ***** */
require("../../../support/paths");
require("./mockdom");
var Document = require("../document"),
UndoManager = require("../undomanager"),
//Editor = require("../editor"),
var Document = require("../document").Document,
UndoManager = require("../undomanager").UndoManager,
MockRenderer = require("./mockrenderer"),
Range = require("../range"),
Range = require("../range").Range,
assert = require("./assertions"),
async = require("async");
@ -83,9 +83,7 @@ var Test = {
"test: move lines down" : function() {
var doc = new Document(["1", "2", "3", "4"]);
console.log(doc.toString().replace(/\n/g, "\\n"));
doc.moveLinesDown(0, 1);
console.log(doc.toString().replace(/\n/g, "\\n"));
assert.equal(doc.toString(), ["3", "1", "2", "4"].join("\n"));
doc.moveLinesDown(1, 2);
@ -98,12 +96,10 @@ var Test = {
assert.equal(doc.toString(), ["3", "4", "2", "1"].join("\n"));
},
"__test: move lines up" : function() {
"test: move lines up" : function() {
var doc = new Document(["1", "2", "3", "4"]);
console.log(doc.toString().replace(/\n/g, "\\n"));
doc.moveLinesUp(2, 3);
console.log(doc.toString().replace(/\n/g, "\\n"));
assert.equal(doc.toString(), ["1", "3", "4", "2"].join("\n"));
doc.moveLinesUp(1, 2);
@ -178,49 +174,6 @@ var Test = {
assert.equal(["4", "5", "6"].join("\n"), doc.toString());
},
"__test: undo/redo for delete line" : function() {
var doc = new Document(["111", "222", "333"]);
var undoManager = new UndoManager();
doc.setUndoManager(undoManager);
var initialText = doc.toString();
var editor = new Editor(new MockRenderer(), doc);
editor.removeLines();
var step1 = doc.toString();
assert.equal(step1, "222\n333");
doc.$informUndoManager.call();
editor.removeLines();
var step2 = doc.toString();
assert.equal(step2, "333");
doc.$informUndoManager.call();
editor.removeLines();
var step3 = doc.toString();
assert.equal(step3, "");
doc.$informUndoManager.call();
undoManager.undo();
doc.$informUndoManager.call();
assert.equal(doc.toString(), step2);
undoManager.undo();
doc.$informUndoManager.call();
assert.equal(doc.toString(), step1);
undoManager.undo();
doc.$informUndoManager.call();
assert.equal(doc.toString(), initialText);
undoManager.undo();
doc.$informUndoManager.call();
assert.equal(doc.toString(), initialText);
},
"test: convert document to screen coordinates" : function() {
var doc = new Document("01234\t567890\t1234");
doc.setTabSize(4);

12
lib/ace/test/event_emitter_test.js
View file

@ -37,17 +37,17 @@
require("../../../support/paths");
var oop = require("../lib/oop");
MEventEmitter = require("../event_emitter"),
var oop = require("pilot/oop").oop;
EventEmitter = require("pilot/event_emitter").EventEmitter,
assert = require("./assertions");
var EventEmitter = function() {};
var Emitter = function() {};
oop.implement(EventEmitter.prototype, EventEmitter);
oop.implement(Emitter.prototype, EventEmitter);
var Test = {
"test: dispatch event with no data" : function() {
var emitter = new EventEmitter();
var emitter = new Emitter();
var called = false;
emitter.addEventListener("juhu", function(e) {
@ -55,7 +55,7 @@ var Test = {
assert.equal(e.type, "juhu");
});
emitter.$dispatchEvent("juhu");
emitter._dispatchEvent("juhu");
assert.true(called);
}
};

8
lib/ace/test/mockdom.js Normal file
View file

@ -0,0 +1,8 @@
var dom = require('jsdom/level2/html').dom.level2.html;
var browser = require('jsdom/browser/index').windowAugmentation(dom);
global.document = browser.document;
global.window = browser.window;
global.self = browser.self;
global.navigator = browser.navigator;
global.location = browser.location;

3
lib/ace/test/mockrenderer.js
View file

@ -116,6 +116,9 @@ MockRenderer.prototype.setBreakpoints = function() {
MockRenderer.prototype.updateFull = function() {
};
MockRenderer.prototype.updateText = function() {
};
MockRenderer.prototype.showCursor = function() {
};

15
lib/ace/test/navigation_test.js
View file

@ -36,21 +36,12 @@
* ***** END LICENSE BLOCK ***** */
require("../../../support/paths");
require("./mockdom");
var dom = require('jsdom/level2/html').dom.level2.html;
var browser = require('jsdom/browser/index').windowAugmentation(dom);
global.document = browser.document;
global.window = browser.window;
global.self = browser.self;
global.navigator = browser.navigator;
global.location = browser.location;
var Document = require("../Document"),
Editor = require("../Editor"),
var Document = require("../Document").Document,
Editor = require("../Editor").Editor,
MockRenderer = require("./mockrenderer"),
assert = require("./assertions");
var Test = {
createTextDocument : function(rows, cols) {

2
lib/ace/test/range_test.js
View file

@ -37,7 +37,7 @@
require("../../../support/paths");
var Range = require("../range"),
var Range = require("../range").Range,
assert = require("./assertions");
var Test = {

4
lib/ace/test/search_test.js
View file

@ -37,8 +37,8 @@
require("../../../support/paths");
var Document = require("../document"),
Search = require("../search"),
var Document = require("../document").Document,
Search = require("../search").Search,
assert = require("./assertions");
var Test = {

2
lib/ace/test/selection_test.js
View file

@ -37,7 +37,7 @@
require("../../../support/paths");
var Document = require("../document"),
var Document = require("../document").Document,
assert = require("./assertions");
var Test = {

73
lib/ace/test/text_edit_test.js
View file

@ -36,19 +36,12 @@
* ***** END LICENSE BLOCK ***** */
require("../../../support/paths");
require("./mockdom");
var dom = require('jsdom/level2/html').dom.level2.html;
var browser = require('jsdom/browser/index').windowAugmentation(dom);
global.document = browser.document;
global.window = browser.window;
global.self = browser.self;
global.navigator = browser.navigator;
global.location = browser.location;
var Document = require("../document"),
Editor = require("../editor"),
var Document = require("../document").Document,
Editor = require("../editor").Editor,
JavaScriptMode = require("../mode/javascript").Mode,
UndoManager = require("../undomanager").UndoManager,
MockRenderer = require("./mockrenderer"),
assert = require("./assertions");
@ -119,7 +112,7 @@ var Test = {
editor.moveCursorTo(1, 3);
editor.getSelection().selectDown();
editor.blockIndent(" ");
editor.indent();
assert.equal(["a12345", " b12345", " c12345"].join("\n"),
doc.toString());
@ -135,26 +128,25 @@ var Test = {
var doc = new Document([" a12345", " b12345", " c12345"].join("\n"));
var editor = new Editor(new MockRenderer(), doc);
editor.moveCursorTo(0, 3);
editor.moveCursorTo(0, 5);
editor.getSelection().selectDown();
editor.getSelection().selectDown();
editor.blockOutdent(" ");
editor.blockOutdent();
assert.equal(doc.toString(), [" a12345", "b12345", " c12345"].join("\n"));
assert.position(editor.getCursorPosition(), 2, 0);
assert.position(editor.getCursorPosition(), 2, 1);
var range = editor.getSelectionRange();
assert.position(range.start, 0, 1);
assert.position(range.end, 2, 1);
editor.blockOutdent(" ");
editor.blockOutdent();
assert.equal(doc.toString(), ["a12345", "b12345", "c12345"].join("\n"));
var range = editor.getSelectionRange();
assert.position(range.start, 0, 1);
assert.position(range.end, 2, 1);
assert.position(range.start, 0, 0);
assert.position(range.end, 2, 0);
},
"test: outent without a selection should update cursor" : function() {
@ -340,6 +332,49 @@ var Test = {
editor.onTextInput("\t");
assert.equal(doc.toString(), "\t");
},
"test: undo/redo for delete line" : function() {
var doc = new Document(["111", "222", "333"]);
var undoManager = new UndoManager();
doc.setUndoManager(undoManager);
var initialText = doc.toString();
var editor = new Editor(new MockRenderer(), doc);
editor.removeLines();
var step1 = doc.toString();
assert.equal(step1, "222\n333");
doc.$informUndoManager.call();
editor.removeLines();
var step2 = doc.toString();
assert.equal(step2, "333");
doc.$informUndoManager.call();
editor.removeLines();
var step3 = doc.toString();
assert.equal(step3, "");
doc.$informUndoManager.call();
undoManager.undo();
doc.$informUndoManager.call();
assert.equal(doc.toString(), step2);
undoManager.undo();
doc.$informUndoManager.call();
assert.equal(doc.toString(), step1);
undoManager.undo();
doc.$informUndoManager.call();
assert.equal(doc.toString(), initialText);
undoManager.undo();
doc.$informUndoManager.call();
assert.equal(doc.toString(), initialText);
}
};

7
lib/ace/test/virtual_renderer_test.js
View file

@ -36,10 +36,11 @@
* ***** END LICENSE BLOCK ***** */
require("../../../support/paths");
require("./mockdom");
var Document = "../document",
VirtualRenderer = "../virtual_renderer",
assert = "../assertions";
var Document = require("../document").Document,
VirtualRenderer = require("../virtual_renderer").VirtualRenderer,
assert = require("./assertions");
var Test = {
"test: screen2text the column should be rounded to the next character edge" : function() {