Added more unit tests. Changed the unit test code to be formatted with leading spaces instead of tabs.

This commit is contained in:
dgeorge 2011-10-31 16:08:21 -07:00
commit 017d6dc96e
2 changed files with 197 additions and 144 deletions

View file

@ -80,17 +80,7 @@ module.exports = {
assert.equal(session.findMatchingBracket({row: 1, column: 5}), null); assert.equal(session.findMatchingBracket({row: 1, column: 5}), null);
}, },
"test: find matching opening bracket in JavaScript mode" : function() { "test: find matching closing bracket in Text mode" : function() {
var session = new EditSession(["(()(", "", "())))"], new JavaScriptMode());
assert.position(session.findMatchingBracket({row: 0, column: 3}), 0, 1);
assert.position(session.findMatchingBracket({row: 2, column: 2}), 2, 0);
assert.position(session.findMatchingBracket({row: 2, column: 3}), 0, 3);
assert.position(session.findMatchingBracket({row: 2, column: 4}), 0, 0);
assert.equal(session.findMatchingBracket({row: 2, column: 5}), null);
},
"test: find matching closing bracket" : function() {
var session = new EditSession(["(()(", "())))"]); var session = new EditSession(["(()(", "())))"]);
assert.position(session.findMatchingBracket({row: 1, column: 1}), 1, 1); assert.position(session.findMatchingBracket({row: 1, column: 1}), 1, 1);
@ -101,6 +91,49 @@ module.exports = {
assert.equal(session.findMatchingBracket({row: 0, column: 0}), null); assert.equal(session.findMatchingBracket({row: 0, column: 0}), null);
}, },
"test: find matching opening bracket in JavaScript mode" : function() {
var lines = [
"function foo() {",
" var str = \"{ foo()\";",
" if (debug) {",
" // write str (a string) to the console",
" console.log(str);",
" }",
" str += \" bar() }\";",
"}"
];
var session = new EditSession(lines.join("\n"), new JavaScriptMode());
assert.position(session.findMatchingBracket({row: 0, column: 14}), 0, 12);
assert.position(session.findMatchingBracket({row: 7, column: 1}), 0, 15);
assert.position(session.findMatchingBracket({row: 6, column: 20}), 1, 15);
assert.position(session.findMatchingBracket({row: 1, column: 22}), 1, 20);
assert.position(session.findMatchingBracket({row: 3, column: 31}), 3, 21);
assert.position(session.findMatchingBracket({row: 4, column: 24}), 4, 19);
assert.equal(session.findMatchingBracket({row: 0, column: 1}), null);
},
"test: find matching closing bracket in JavaScript mode" : function() {
var lines = [
"function foo() {",
" var str = \"{ foo()\";",
" if (debug) {",
" // write str (a string) to the console",
" console.log(str);",
" }",
" str += \" bar() }\";",
"}"
];
var session = new EditSession(lines.join("\n"), new JavaScriptMode());
assert.position(session.findMatchingBracket({row: 0, column: 13}), 0, 13);
assert.position(session.findMatchingBracket({row: 0, column: 16}), 7, 0);
assert.position(session.findMatchingBracket({row: 1, column: 16}), 6, 19);
assert.position(session.findMatchingBracket({row: 1, column: 21}), 1, 21);
assert.position(session.findMatchingBracket({row: 3, column: 22}), 3, 30);
assert.position(session.findMatchingBracket({row: 4, column: 20}), 4, 23);
},
"test: match different bracket types" : function() { "test: match different bracket types" : function() {
var session = new EditSession(["({[", ")]}"]); var session = new EditSession(["({[", ")]}"]);

View file

@ -62,21 +62,41 @@ module.exports = {
assert.equal(iterator.getCurrentTokenRow(), 0); assert.equal(iterator.getCurrentTokenRow(), 0);
assert.equal(iterator.getCurrentTokenColumn(), 0); assert.equal(iterator.getCurrentTokenColumn(), 0);
iterator.stepForward();
assert.equal(iterator.getCurrentToken().value, " ");
assert.equal(iterator.getCurrentTokenRow(), 0);
assert.equal(iterator.getCurrentTokenColumn(), 8);
var iterator = new TokenIterator(session, 0, 4); var iterator = new TokenIterator(session, 0, 4);
assert.equal(iterator.getCurrentToken().value, "function"); assert.equal(iterator.getCurrentToken().value, "function");
assert.equal(iterator.getCurrentTokenRow(), 0); assert.equal(iterator.getCurrentTokenRow(), 0);
assert.equal(iterator.getCurrentTokenColumn(), 0); assert.equal(iterator.getCurrentTokenColumn(), 0);
iterator.stepForward();
assert.equal(iterator.getCurrentToken().value, " ");
assert.equal(iterator.getCurrentTokenRow(), 0);
assert.equal(iterator.getCurrentTokenColumn(), 8);
var iterator = new TokenIterator(session, 2, 18); var iterator = new TokenIterator(session, 2, 18);
assert.equal(iterator.getCurrentToken().value, "items"); assert.equal(iterator.getCurrentToken().value, "items");
assert.equal(iterator.getCurrentTokenRow(), 2); assert.equal(iterator.getCurrentTokenRow(), 2);
assert.equal(iterator.getCurrentTokenColumn(), 14); assert.equal(iterator.getCurrentTokenColumn(), 14);
iterator.stepForward();
assert.equal(iterator.getCurrentToken().value, "[");
assert.equal(iterator.getCurrentTokenRow(), 2);
assert.equal(iterator.getCurrentTokenColumn(), 19);
var iterator = new TokenIterator(session, 4, 0); var iterator = new TokenIterator(session, 4, 0);
assert.equal(iterator.getCurrentToken().value, "}"); assert.equal(iterator.getCurrentToken().value, "}");
assert.equal(iterator.getCurrentTokenRow(), 4); assert.equal(iterator.getCurrentTokenRow(), 4);
assert.equal(iterator.getCurrentTokenColumn(), 0); assert.equal(iterator.getCurrentTokenColumn(), 0);
iterator.stepBackward();
assert.equal(iterator.getCurrentToken().value, "// Real Tab.");
assert.equal(iterator.getCurrentTokenRow(), 3);
assert.equal(iterator.getCurrentTokenColumn(), 6);
var iterator = new TokenIterator(session, 5, 0); var iterator = new TokenIterator(session, 5, 0);
assert.equal(iterator.getCurrentToken(), null); assert.equal(iterator.getCurrentToken(), null);
}, },