From 7ce9cee99043a6c308093d40c2aa5055c84ed89c Mon Sep 17 00:00:00 2001 From: Eddy Bruel Date: Tue, 15 Feb 2011 13:17:26 +0100 Subject: [PATCH] Reverted some breaking changes with the tests --- lib/ace/test/all.js | 10 +++---- lib/ace/test/document_test.js | 51 +++++++++++++++++------------------ 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/lib/ace/test/all.js b/lib/ace/test/all.js index d591534e..81140835 100644 --- a/lib/ace/test/all.js +++ b/lib/ace/test/all.js @@ -37,14 +37,13 @@ require("../../../support/paths"); -// require("./mockdom"); +require("./mockdom"); var async = require("asyncjs"); async.concat( - // require("./anchor_test"), - // require("./change_document_test"), - require("./document_test") - /* + require("./anchor_test"), + require("./change_document_test"), + require("./document_test"), require("./edit_session_test"), require("./event_emitter_test"), require("./navigation_test"), @@ -61,5 +60,4 @@ async.concat( require("./mode/text_test"), require("./mode/xml_test"), require("./mode/xml_tokenizer_test") - */ ).exec(); diff --git a/lib/ace/test/document_test.js b/lib/ace/test/document_test.js index c4566331..b9249e8f 100644 --- a/lib/ace/test/document_test.js +++ b/lib/ace/test/document_test.js @@ -38,8 +38,7 @@ define(function(require, exports, module) { -var Document = require("../../../../../lib/concorde/Document"), - AceAdapter = require("../../../../../lib/concorde/AceAdapter"), +var Document = require("../document").Document, Range = require("../range").Range, assert = require("./assertions"), async = require("asyncjs"); @@ -47,7 +46,7 @@ var Document = require("../../../../../lib/concorde/Document"), var Test = { "test: insert text in line" : function() { - var doc = new AceAdapter(new Document(["12", "34"])); + var doc = new Document(["12", "34"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -64,7 +63,7 @@ var Test = { }, "test: insert new line" : function() { - var doc = new AceAdapter(new Document(["12", "34"])); + var doc = new Document(["12", "34"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -81,7 +80,7 @@ var Test = { }, "test: insert lines at the beginning" : function() { - var doc = new AceAdapter(new Document(["12", "34"])); + var doc = new Document(["12", "34"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -98,7 +97,7 @@ var Test = { }, "test: insert lines at the end" : function() { - var doc = new AceAdapter(new Document(["12", "34"])); + var doc = new Document(["12", "34"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -108,7 +107,7 @@ var Test = { }, "test: insert lines in the middle" : function() { - var doc = new AceAdapter(new Document(["12", "34"])); + var doc = new Document(["12", "34"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -125,7 +124,7 @@ var Test = { }, "test: insert multi line string at the start" : function() { - var doc = new AceAdapter(new Document(["12", "34"])); + var doc = new Document(["12", "34"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -142,7 +141,7 @@ var Test = { }, "test: insert multi line string at the end" : function() { - var doc = new AceAdapter(new Document(["12", "34"])); + var doc = new Document(["12", "34"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -159,7 +158,7 @@ var Test = { }, "test: insert multi line string in the middle" : function() { - var doc = new AceAdapter(new Document(["12", "34"])); + var doc = new Document(["12", "34"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -176,7 +175,7 @@ var Test = { }, "test: delete in line" : function() { - var doc = new AceAdapter(new Document(["1234", "5678"])); + var doc = new Document(["1234", "5678"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -193,7 +192,7 @@ var Test = { }, "test: delete new line" : function() { - var doc = new AceAdapter(new Document(["1234", "5678"])); + var doc = new Document(["1234", "5678"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -210,7 +209,7 @@ var Test = { }, "test: delete multi line range line" : function() { - var doc = new AceAdapter(new Document(["1234", "5678", "abcd"])); + var doc = new Document(["1234", "5678", "abcd"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -221,13 +220,13 @@ var Test = { var d = deltas.concat(); doc.revertDeltas(d); assert.equal(doc.getValue(), ["1234", "5678", "abcd"].join("\n")); - + doc.applyDeltas(d); assert.equal(doc.getValue(), ["12cd"].join("\n")); }, "test: delete full lines" : function() { - var doc = new AceAdapter(new Document(["1234", "5678", "abcd"])); + var doc = new Document(["1234", "5678", "abcd"]); var deltas = []; doc.on("change", function(e) { deltas.push(e.data); }); @@ -237,44 +236,44 @@ var Test = { }, "test: remove lines should return the removed lines" : function() { - var doc = new AceAdapter(new Document(["1234", "5678", "abcd"])); + var doc = new Document(["1234", "5678", "abcd"]); var removed = doc.removeLines(1, 2); assert.equal(removed.join("\n"), ["5678", "abcd"].join("\n")); }, "test: should handle unix style new lines" : function() { - var doc = new AceAdapter(new Document(["1", "2", "3"])); + var doc = new Document(["1", "2", "3"]); assert.equal(doc.getValue(), ["1", "2", "3"].join("\n")); }, "test: should handle windows style new lines" : function() { - var doc = new AceAdapter(new Document(["1", "2", "3"].join("\r\n"))); + var doc = new Document(["1", "2", "3"].join("\r\n")); doc.setNewLineMode("unix"); assert.equal(doc.getValue(), ["1", "2", "3"].join("\n")); }, "test: set new line mode to 'windows' should use '\r\n' as new lines": function() { - var doc = new AceAdapter(new Document(["1", "2", "3"].join("\n"))); + var doc = new Document(["1", "2", "3"].join("\n")); doc.setNewLineMode("windows"); assert.equal(doc.getValue(), ["1", "2", "3"].join("\r\n")); }, "test: set new line mode to 'unix' should use '\n' as new lines": function() { - var doc = new AceAdapter(new Document(["1", "2", "3"].join("\r\n"))); + var doc = new Document(["1", "2", "3"].join("\r\n")); doc.setNewLineMode("unix"); assert.equal(doc.getValue(), ["1", "2", "3"].join("\n")); }, "test: set new line mode to 'auto' should detect the incoming nl type": function() { - var doc = new AceAdapter(new Document(["1", "2", "3"].join("\n"))); + var doc = new Document(["1", "2", "3"].join("\n")); doc.setNewLineMode("auto"); assert.equal(doc.getValue(), ["1", "2", "3"].join("\n")); - var doc = new AceAdapter(new Document(["1", "2", "3"].join("\r\n"))); + var doc = new Document(["1", "2", "3"].join("\r\n")); doc.setNewLineMode("auto"); assert.equal(doc.getValue(), ["1", "2", "3"].join("\r\n")); @@ -284,13 +283,13 @@ var Test = { }, "test: set value": function() { - var doc = new AceAdapter(new Document("1")); + var doc = new Document("1"); assert.equal("1", doc.getValue()); doc.setValue(doc.getValue()); assert.equal("1", doc.getValue()); - var doc = new AceAdapter(new Document("1\n2")); + var doc = new Document("1\n2"); assert.equal("1\n2", doc.getValue()); doc.setValue(doc.getValue()); @@ -298,8 +297,8 @@ var Test = { }, "test: empty document has to contain one line": function() { - var doc = new AceAdapter(new Document("")); - assert.equal(doc.getLength(), 1); + var doc = new Document(""); + assert.equal(doc.$lines.length, 1); } };