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

fix unit tests

Browse source
This commit is contained in:
Fabian Jakobs 2011-12-01 16:08:31 +01:00
commit 0c14c86c94
5 changed files with 39 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ace/mode/coffee_tokenizer_test.js
View file

@ -55,7 +55,8 @@ module.exports = {
assert.equal(tokens[0].type, "keyword");
},
"test tokenize string with interpolation": function() {
// TODO: disable. not yet implemented
"!test tokenize string with interpolation": function() {
var tokens = this.tokenizer.getLineTokens('"#{ 22 / 7 } is a decent approximation of π"', "start").tokens;
console.log(tokens);
assert.equal(tokens.length, 12);
@ -66,5 +67,5 @@ module.exports = {
});
if (typeof module !== "undefined" && module === require.main) {
require("asyncjs").test.testcase(module.exports).exec()
require("asyncjs").test.testcase(module.exports).exec();
}

21
lib/ace/mode/html_tokenizer_test.js
View file

@ -50,22 +50,19 @@ module.exports = {
},
"test: tokenize embedded script" : function() {
var line = "<script a='a'>var</script>'123'";
var tokens = this.tokenizer.getLineTokens(line, "start").tokens;
//assert.equal(10, tokens.length);
assert.equal("text", tokens[0].type);
assert.equal("meta.tag", tokens[1].type);
assert.equal("text", tokens[2].type);
assert.equal("entity.other.attribute-name", tokens[3].type);
assert.equal("text", tokens[4].type);
assert.equal("string", tokens[5].type);
assert.equal("text", tokens[6].type);
assert.equal("keyword.definition", tokens[7].type);
assert.equal(9, tokens.length);
assert.equal("meta.tag", tokens[0].type);
assert.equal("text", tokens[1].type);
assert.equal("entity.other.attribute-name", tokens[2].type);
assert.equal("keyword.operator", tokens[3].type);
assert.equal("string", tokens[4].type);
assert.equal("meta.tag", tokens[5].type);
assert.equal("keyword.definition", tokens[6].type);
assert.equal("meta.tag", tokens[7].type);
assert.equal("text", tokens[8].type);
assert.equal("meta.tag", tokens[9].type);
assert.equal("text", tokens[10].type);
},
"test: tokenize multiline attribute value with double quotes": function() {

6
lib/ace/mode/xml_test.js
View file

@ -57,13 +57,13 @@ module.exports = {
assert.ok(tokenizer instanceof Tokenizer);
var tokens = tokenizer.getLineTokens("<juhu>", "start").tokens;
assert.equal("keyword", tokens[1].type);
assert.equal("meta.tag", tokens[0].type);
},
"test: toggle comment lines should not do anything" : function() {
var session = new EditSession([" abc", "cde", "fg"]);
var comment = this.mode.toggleCommentLines("start", session, 0, 1);
this.mode.toggleCommentLines("start", session, 0, 1);
assert.equal([" abc", "cde", "fg"].join("\n"), session.toString());
},
@ -77,5 +77,5 @@ module.exports = {
});
if (typeof module !== "undefined" && module === require.main) {
require("asyncjs").test.testcase(module.exports).exec()
require("asyncjs").test.testcase(module.exports).exec();
}

26
lib/ace/mode/xml_tokenizer_test.js
View file

@ -56,12 +56,22 @@ module.exports = {
var line = "<Juhu>//Juhu Kinners</Kinners>";
var tokens = this.tokenizer.getLineTokens(line, "start").tokens;
assert.equal(5, tokens.length);
assert.equal("text", tokens[0].type);
assert.equal("keyword", tokens[1].type);
assert.equal("text", tokens[2].type);
assert.equal("keyword", tokens[3].type);
assert.equal("text", tokens[4].type);
assert.equal(3, tokens.length);
assert.equal("meta.tag", tokens[0].type);
assert.equal("text", tokens[1].type);
assert.equal("meta.tag", tokens[2].type);
},
"test: two tags in the same lines should be in separate tokens" : function() {
var line = "<Juhu><Kinners>";
var tokens = this.tokenizer.getLineTokens(line, "start").tokens;
assert.equal(2, tokens.length);
assert.equal("meta.tag", tokens[0].type);
assert.equal("meta.tag", tokens[1].type);
assert.equal("<Juhu>", tokens[0].value);
assert.equal("<Kinners>", tokens[1].value);
},
"test: multiline attributes": function() {
@ -74,11 +84,11 @@ module.exports = {
return tokens.tokens;
}, this);
assert.equal(multiLineTokens[0].length, 6);
assert.equal(multiLineTokens[0].length, 5);
assert.equal(multiLineTokens[1].length, 5);
assert.equal(multiLineTokens[2].length, 2);
assert.equal(multiLineTokens[0][5].type, "string");
assert.equal(multiLineTokens[0][4].type, "string");
assert.equal(multiLineTokens[1][0].type, "string");
assert.equal(multiLineTokens[1][4].type, "string");
assert.equal(multiLineTokens[2][0].type, "string");

11
lib/ace/mode/xml_util.js
View file

@ -44,7 +44,7 @@ function string(state) {
}, {
token : "string", // multi line string start
merge : true,
regex : '["].*$',
regex : '["].*',
next : state + "-qqstring"
}, {
token : "string",
@ -52,7 +52,7 @@ function string(state) {
}, {
token : "string", // multi line string start
merge : true,
regex : "['].*$",
regex : "['].*",
next : state + "-qstring"
}];
}
@ -61,7 +61,7 @@ function multiLineString(quote, state) {
return [{
token : "string",
merge : true,
regex : ".*" + quote,
regex : ".*?" + quote,
next : state
}, {
token : "string",
@ -85,11 +85,12 @@ exports.tag = function(states, name, nextState) {
next : name + "embed-attribute-list"
}];
states[name + "-qstring"] = multiLineString("'", name);
states[name + "-qqstring"] = multiLineString("\"", name);
states[name + "-qstring"] = multiLineString("'", name + "embed-attribute-list");
states[name + "-qqstring"] = multiLineString("\"", name + "embed-attribute-list");
states[name + "embed-attribute-list"] = [{
token : "meta.tag",
merge : true,
regex : "\/?>",
next : nextState
}, {