migrated all tests to mocha+chai (in-browser test mode via tests/index.html is not working yet, but that wasn't available before either, so nothing is lost. Tests should pass in node via make or make test but do NOT YET)

Author: GerHobbelt

Makefile

@@ -38,7 +38,7 @@ deploy: site
 	git checkout master
 
 test:
-	node tests/all-tests.js
+	node_modules/.bin/mocha tests/
 
 web-examples: web/content/assets/js/calculator.js
 

modules/ebnf-parser

@@ -22,7 +22,7 @@
   "preferGlobal": true,
   "repository": {
     "type": "git",
-    "url": "git://github.com/GerHobbelt/jison.git"
+    "url": "https://github.com/GerHobbelt/jison.git"
   },
   "bugs": {
     "email": "[email protected]",
@@ -48,11 +48,12 @@
   "devDependencies": {
     "browserify": "14.0.0",
     "glob": "7.1.1",
-    "test": "0.6.0",
-    "uglify-js": "2.7.5"
+    "uglify-js": "2.7.5",
+    "chai": "3.5.0",
+    "mocha": "3.2.0"
   },
   "scripts": {
-    "test": "node tests/all-tests.js"
+    "test": "make test"
   },
   "homepage": "http://jison.org"
 }

modules/jison-lex

@@ -1,8 +1,10 @@
-var Jison = require("../setup").Jison,
-    RegExpLexer = require("../setup").RegExpLexer,
-    assert = require("assert");
+var assert = require("chai").assert;
+var Jison = require("../setup").Jison;
+var RegExpLexer = require("../setup").RegExpLexer;
 
-exports["test Semantic action basic return"] = function() {
+
+describe("Parser Actions", function () {
+  it("test Semantic action basic return", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"],
@@ -22,9 +24,9 @@ exports["test Semantic action basic return"] = function() {
 
     assert.equal(parser.parse('x'), 0, "semantic action");
     assert.equal(parser.parse('y'), 1, "semantic action");
-};
+  });
 
-exports["test return null"] = function() {
+  it("test return null", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"]
@@ -41,9 +43,9 @@ exports["test return null"] = function() {
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('x'), null, "semantic action");
-};
+  });
 
-exports["test terminal semantic values are not null"] = function() {
+  it("test terminal semantic values are not null", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"],
@@ -63,9 +65,9 @@ exports["test terminal semantic values are not null"] = function() {
 
     assert.deepEqual(parser.parse('x'), [true], "semantic action");
     assert.deepEqual(parser.parse('y'), ['y'], "semantic action");
-};
+  });
 
-exports["test Semantic action stack lookup"] = function() {
+  it("test Semantic action stack lookup", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"],
@@ -86,9 +88,9 @@ exports["test Semantic action stack lookup"] = function() {
 
     assert.equal(parser.parse('x'), "EX", "return first token");
     assert.equal(parser.parse('yx'), "BYEX", "return first after reduction");
-};
+  });
 
-exports["test Semantic actions on nullable grammar"] = function() {
+  it("test Semantic actions on nullable grammar", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"]
@@ -106,9 +108,9 @@ exports["test Semantic actions on nullable grammar"] = function() {
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('xx'), "->xx", "return first after reduction");
-};
+  });
 
-exports["test named semantic value"] = function() {
+  it("test named semantic value", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"]
@@ -126,9 +128,9 @@ exports["test named semantic value"] = function() {
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('xx'), "->xx", "return first after reduction");
-};
+  });
 
-exports["test ambiguous named semantic value"] = function() {
+  it("test ambiguous named semantic value", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"],
@@ -148,9 +150,9 @@ exports["test ambiguous named semantic value"] = function() {
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('xyx'), "xyx", "return first after reduction");
-};
+  });
 
-exports["test vars that look like named semantic values shouldn't be replaced"] = function() {
+  it("test vars that look like named semantic values shouldn't be replaced", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"]
@@ -168,9 +170,9 @@ exports["test vars that look like named semantic values shouldn't be replaced"]
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('xx'), "->xx", "return first after reduction");
-};
+  });
 
-exports["test previous semantic value lookup ($0)"] = function() {
+  it("test previous semantic value lookup ($0)", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"],
@@ -189,10 +191,10 @@ exports["test previous semantic value lookup ($0)"] = function() {
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('xxy'), "xxxx", "return first after reduction");
-};
+  });
 
 
-exports["test negative semantic value lookup ($-1)"] = function() {
+  it("test negative semantic value lookup ($-1)", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"],
@@ -213,9 +215,9 @@ exports["test negative semantic value lookup ($-1)"] = function() {
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('zxy'), "zxz", "return first after reduction");
-};
+  });
 
-exports["test Build AST"] = function() {
+  it("test Build AST", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"]
@@ -239,9 +241,9 @@ exports["test Build AST"] = function() {
 
     var r = parser.parse("xxx");
     assert.deepEqual(r, expectedAST);
-};
+  });
 
-exports["test 0+0 grammar"] = function() {
+  it("test 0+0 grammar", function() {
     var lexData2 = {
         rules: [
            ["0", "return 'ZERO';"],
@@ -264,9 +266,9 @@ exports["test 0+0 grammar"] = function() {
     var expectedAST = ["+", ["+", [0], [0]], [0]];
 
     assert.deepEqual(parser.parse("0+0+0"), expectedAST);
-};
+  });
 
-exports["test implicit $$ = $1 action"] = function() {
+  it("test implicit $$ = $1 action", function() {
     var lexData2 = {
         rules: [
            ["0", "return 'ZERO';"],
@@ -289,9 +291,9 @@ exports["test implicit $$ = $1 action"] = function() {
     var expectedAST = ["+", ["+", [0], [0]], [0]];
 
     assert.deepEqual(parser.parse("0+0+0"), expectedAST);
-};
+  });
 
-exports["test yytext"] = function() {
+  it("test yytext", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"]
@@ -308,9 +310,9 @@ exports["test yytext"] = function() {
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('x'), "x", "return first token");
-};
+  });
 
-exports["test yyleng"] = function() {
+  it("test yyleng", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"]
@@ -327,9 +329,9 @@ exports["test yyleng"] = function() {
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('x'), 1, "return first token");
-};
+  });
 
-exports["test yytext more"] = function() {
+  it("test yytext more", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"],
@@ -348,9 +350,9 @@ exports["test yytext more"] = function() {
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('xy'), "xy", "return first token");
-};
+  });
 
-exports["test action include"] = function() {
+  it("test action include", function() {
     var lexData = {
         rules: [
            ["y", "return 'y';"]
@@ -372,9 +374,9 @@ exports["test action include"] = function() {
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('y'), 1, "semantic action");
-};
+  });
 
-exports["test next token not shifted if only one action"] = function () {
+  it("test next token not shifted if only one action", function () {
     var lexData = {
         rules: [
            ["\\(", "return '(';"],
@@ -393,9 +395,9 @@ exports["test next token not shifted if only one action"] = function () {
     var parser = new Jison.Parser(grammar);
     parser.lexer = new RegExpLexer(lexData);
     assert.ok(parser.parse('(y)y'), "should parse correctly");
-};
+  });
 
-exports["test token array LIFO"] = function() {
+  it("test token array LIFO", function() {
     var lexData = {
         rules: [
            ["a", "return ['b','a'];"],
@@ -415,9 +417,9 @@ exports["test token array LIFO"] = function() {
     var parser = new Jison.Parser(grammar);
     parser.lexer = new RegExpLexer(lexData);
     assert.equal(parser.parse('ac'), "abc", "should return second token");
-};
+  });
 
-exports["test YYACCEPT"] = function() {
+  it("test YYACCEPT", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"],
@@ -438,9 +440,9 @@ exports["test YYACCEPT"] = function() {
 
     assert.equal(parser.parse('x'), "EX", "return first token");
     assert.equal(parser.parse('yx'), true, "return first after reduction");
-};
+  });
 
-exports["test YYABORT"] = function() {
+  it("test YYABORT", function() {
     var lexData = {
         rules: [
            ["x", "return 'x';"],
@@ -461,9 +463,9 @@ exports["test YYABORT"] = function() {
 
     assert.equal(parser.parse('x'), "EX", "return first token");
     assert.equal(parser.parse('yx'), false, "return first after reduction");
-};
+  });
 
-exports["test parse params"] = function() {
+  it("test parse params", function() {
     var lexData = {
         rules: [
            ["y", "return 'y';"]
@@ -481,9 +483,9 @@ exports["test parse params"] = function() {
     parser.lexer = new RegExpLexer(lexData);
 
     assert.equal(parser.parse('y', "foo", "bar"), "foobar", "semantic action");
-};
+  });
 
-exports["test symbol aliases"] = function() {
+  it("test symbol aliases", function() {
     var lexData = {
         rules: [
            ["a", "return 'a';"],
@@ -503,9 +505,9 @@ exports["test symbol aliases"] = function() {
     var parser = new Jison.Parser(grammar);
     parser.lexer = new RegExpLexer(lexData);
     assert.equal(parser.parse('abc'), "abc", "should return original string");
-};
+  });
 
-exports["test symbol aliases in ebnf"] = function() {
+  it("test symbol aliases in ebnf", function() {
     var lexData = {
         rules: [
            ["a", "return 'a';"],
@@ -525,9 +527,9 @@ exports["test symbol aliases in ebnf"] = function() {
     var parser = new Jison.Parser(grammar);
     parser.lexer = new RegExpLexer(lexData);
     assert.equal(parser.parse('abc'), "a[b,c]", "should tolerate aliases in subexpression");
-};
+  });
 
-exports["test symbol aliases for terminals"] = function() {
+  it("test symbol aliases for terminals", function() {
     var lexData = {
         rules: [
            ["a", "return 'a';"],
@@ -544,4 +546,5 @@ exports["test symbol aliases for terminals"] = function() {
     var parser = new Jison.Parser(grammar);
     parser.lexer = new RegExpLexer(lexData);
     assert.equal(parser.parse('abc'), "abc", "should return original string");
-};
+  });
+});