Reverted some breaking changes with the tests

This commit is contained in:
Eddy Bruel 2011-02-15 13:17:26 +01:00
commit 7ce9cee990
2 changed files with 29 additions and 32 deletions

View file

@ -37,14 +37,13 @@
require("../../../support/paths"); require("../../../support/paths");
// require("./mockdom"); require("./mockdom");
var async = require("asyncjs"); var async = require("asyncjs");
async.concat( async.concat(
// require("./anchor_test"), require("./anchor_test"),
// require("./change_document_test"), require("./change_document_test"),
require("./document_test") require("./document_test"),
/*
require("./edit_session_test"), require("./edit_session_test"),
require("./event_emitter_test"), require("./event_emitter_test"),
require("./navigation_test"), require("./navigation_test"),
@ -61,5 +60,4 @@ async.concat(
require("./mode/text_test"), require("./mode/text_test"),
require("./mode/xml_test"), require("./mode/xml_test"),
require("./mode/xml_tokenizer_test") require("./mode/xml_tokenizer_test")
*/
).exec(); ).exec();

View file

@ -38,8 +38,7 @@
define(function(require, exports, module) { define(function(require, exports, module) {
var Document = require("../../../../../lib/concorde/Document"), var Document = require("../document").Document,
AceAdapter = require("../../../../../lib/concorde/AceAdapter"),
Range = require("../range").Range, Range = require("../range").Range,
assert = require("./assertions"), assert = require("./assertions"),
async = require("asyncjs"); async = require("asyncjs");
@ -47,7 +46,7 @@ var Document = require("../../../../../lib/concorde/Document"),
var Test = { var Test = {
"test: insert text in line" : function() { "test: insert text in line" : function() {
var doc = new AceAdapter(new Document(["12", "34"])); var doc = new Document(["12", "34"]);
var deltas = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -64,7 +63,7 @@ var Test = {
}, },
"test: insert new line" : function() { "test: insert new line" : function() {
var doc = new AceAdapter(new Document(["12", "34"])); var doc = new Document(["12", "34"]);
var deltas = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -81,7 +80,7 @@ var Test = {
}, },
"test: insert lines at the beginning" : function() { "test: insert lines at the beginning" : function() {
var doc = new AceAdapter(new Document(["12", "34"])); var doc = new Document(["12", "34"]);
var deltas = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -98,7 +97,7 @@ var Test = {
}, },
"test: insert lines at the end" : function() { "test: insert lines at the end" : function() {
var doc = new AceAdapter(new Document(["12", "34"])); var doc = new Document(["12", "34"]);
var deltas = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -108,7 +107,7 @@ var Test = {
}, },
"test: insert lines in the middle" : function() { "test: insert lines in the middle" : function() {
var doc = new AceAdapter(new Document(["12", "34"])); var doc = new Document(["12", "34"]);
var deltas = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -125,7 +124,7 @@ var Test = {
}, },
"test: insert multi line string at the start" : function() { "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 = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -142,7 +141,7 @@ var Test = {
}, },
"test: insert multi line string at the end" : function() { "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 = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -159,7 +158,7 @@ var Test = {
}, },
"test: insert multi line string in the middle" : function() { "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 = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -176,7 +175,7 @@ var Test = {
}, },
"test: delete in line" : function() { "test: delete in line" : function() {
var doc = new AceAdapter(new Document(["1234", "5678"])); var doc = new Document(["1234", "5678"]);
var deltas = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -193,7 +192,7 @@ var Test = {
}, },
"test: delete new line" : function() { "test: delete new line" : function() {
var doc = new AceAdapter(new Document(["1234", "5678"])); var doc = new Document(["1234", "5678"]);
var deltas = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -210,7 +209,7 @@ var Test = {
}, },
"test: delete multi line range line" : function() { "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 = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -227,7 +226,7 @@ var Test = {
}, },
"test: delete full lines" : function() { "test: delete full lines" : function() {
var doc = new AceAdapter(new Document(["1234", "5678", "abcd"])); var doc = new Document(["1234", "5678", "abcd"]);
var deltas = []; var deltas = [];
doc.on("change", function(e) { deltas.push(e.data); }); doc.on("change", function(e) { deltas.push(e.data); });
@ -237,44 +236,44 @@ var Test = {
}, },
"test: remove lines should return the removed lines" : function() { "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); var removed = doc.removeLines(1, 2);
assert.equal(removed.join("\n"), ["5678", "abcd"].join("\n")); assert.equal(removed.join("\n"), ["5678", "abcd"].join("\n"));
}, },
"test: should handle unix style new lines" : function() { "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")); assert.equal(doc.getValue(), ["1", "2", "3"].join("\n"));
}, },
"test: should handle windows style new lines" : function() { "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"); doc.setNewLineMode("unix");
assert.equal(doc.getValue(), ["1", "2", "3"].join("\n")); assert.equal(doc.getValue(), ["1", "2", "3"].join("\n"));
}, },
"test: set new line mode to 'windows' should use '\r\n' as new lines": function() { "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"); doc.setNewLineMode("windows");
assert.equal(doc.getValue(), ["1", "2", "3"].join("\r\n")); assert.equal(doc.getValue(), ["1", "2", "3"].join("\r\n"));
}, },
"test: set new line mode to 'unix' should use '\n' as new lines": function() { "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"); doc.setNewLineMode("unix");
assert.equal(doc.getValue(), ["1", "2", "3"].join("\n")); assert.equal(doc.getValue(), ["1", "2", "3"].join("\n"));
}, },
"test: set new line mode to 'auto' should detect the incoming nl type": function() { "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"); doc.setNewLineMode("auto");
assert.equal(doc.getValue(), ["1", "2", "3"].join("\n")); 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"); doc.setNewLineMode("auto");
assert.equal(doc.getValue(), ["1", "2", "3"].join("\r\n")); assert.equal(doc.getValue(), ["1", "2", "3"].join("\r\n"));
@ -284,13 +283,13 @@ var Test = {
}, },
"test: set value": function() { "test: set value": function() {
var doc = new AceAdapter(new Document("1")); var doc = new Document("1");
assert.equal("1", doc.getValue()); assert.equal("1", doc.getValue());
doc.setValue(doc.getValue()); doc.setValue(doc.getValue());
assert.equal("1", 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()); assert.equal("1\n2", doc.getValue());
doc.setValue(doc.getValue()); doc.setValue(doc.getValue());
@ -298,8 +297,8 @@ var Test = {
}, },
"test: empty document has to contain one line": function() { "test: empty document has to contain one line": function() {
var doc = new AceAdapter(new Document("")); var doc = new Document("");
assert.equal(doc.getLength(), 1); assert.equal(doc.$lines.length, 1);
} }
}; };