Adds final print and gets bussproofs tests to run.

zorkow · zorkow · commit 12c3cfc0d5ed · 2020-10-08T01:54:22.000+01:00
diff --git a/tests/parser-action-tests.js b/tests/parser-action-tests.js
@@ -163,3 +163,5 @@ parserTest.runTest(
       "isInferred": true}]}
 );
   
+
+parserTest.printTime();
diff --git a/tests/parser-amscd-tests.js b/tests/parser-amscd-tests.js
@@ -5806,3 +5806,5 @@ parserTest.runTest(
                       "isInferred": true}]}]}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-bbox-tests.js b/tests/parser-bbox-tests.js
@@ -540,3 +540,5 @@ parserTest.runTest(
               "isSpacelike": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-braket-tests.js b/tests/parser-braket-tests.js
@@ -3751,3 +3751,5 @@ parserTest.runTest(
               "isEmbellished": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-bussproofs-reginf-tests.js b/tests/parser-bussproofs-reginf-tests.js
@@ -3804,3 +3804,5 @@ parserTest.runTest(
               "isSpacelike": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-bussproofs-regproofs-tests.js b/tests/parser-bussproofs-regproofs-tests.js
diff --git a/tests/parser-cancel-tests.js b/tests/parser-cancel-tests.js
@@ -441,3 +441,5 @@ parserTest.runTest(
                   "isInferred": true}]}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-colorv2-tests.js b/tests/parser-colorv2-tests.js
@@ -232,3 +232,5 @@ parserTest.runTest(
                "isInferred":true}]}]}],
       "isInferred":true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-enclose-tests.js b/tests/parser-enclose-tests.js
@@ -285,3 +285,5 @@ parserTest.runTest(
               "isInferred": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-extpfeil-tests.js b/tests/parser-extpfeil-tests.js
@@ -701,3 +701,5 @@ parserTest.runTest(
       "isEmbellished": true}],
   "isEmbellished": true}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-html-tests.js b/tests/parser-html-tests.js
@@ -497,3 +497,5 @@ parserTest.runTest(
                   "text": "b"}]}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-macros-tests.js b/tests/parser-macros-tests.js
@@ -285,3 +285,5 @@ parserTest.runTest(
               "text": "e"}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-mhchem-0-tests.js b/tests/parser-mhchem-0-tests.js
@@ -3760,3 +3760,5 @@ parserTest.runTest(
 );
 
 
+
+parserTest.printTime();
diff --git a/tests/parser-mhchem-1-tests.js b/tests/parser-mhchem-1-tests.js
@@ -4027,3 +4027,5 @@ parserTest.runTest(
             "isInferred": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-mhchem-2-tests.js b/tests/parser-mhchem-2-tests.js
@@ -4054,3 +4054,5 @@ parserTest.runTest(
               "isInferred": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-mhchem-3-tests.js b/tests/parser-mhchem-3-tests.js
@@ -3711,3 +3711,5 @@ parserTest.runTest(
             "isInferred": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-mhchem-4-tests.js b/tests/parser-mhchem-4-tests.js
@@ -4517,3 +4517,5 @@ parserTest.runTest(
             "isInferred": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-mhchem-5-tests.js b/tests/parser-mhchem-5-tests.js
@@ -3476,3 +3476,5 @@ parserTest.runTest(
               "isInferred": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-mhchem-6-tests.js b/tests/parser-mhchem-6-tests.js
@@ -5495,3 +5495,5 @@ parserTest.runTest(
             "isInferred": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-mhchem-7-tests.js b/tests/parser-mhchem-7-tests.js
@@ -3018,3 +3018,5 @@ parserTest.runTest(
               "isInferred": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-mhchem-8-tests.js b/tests/parser-mhchem-8-tests.js
@@ -4512,3 +4512,5 @@ parserTest.runTest(
               "isInferred": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-mhchem-9-tests.js b/tests/parser-mhchem-9-tests.js
@@ -3847,3 +3847,5 @@ parserTest.runTest(
               "isInferred": true}]}],
       "isInferred": true}]}
 );
+
+parserTest.printTime();
diff --git a/tests/parser-test.js b/tests/parser-test.js
@@ -1,6 +1,7 @@
 import {mathjax} from './node_modules/mathjax-full/js/mathjax.js';
 
 import {TeX} from './node_modules/mathjax-full/js/input/tex.js';
+import {SVG} from './node_modules/mathjax-full/js/output/svg.js';
 import {RegisterHTMLHandler} from "./node_modules/mathjax-full/js/handlers/html.js";
 import {chooseAdaptor} from "./node_modules/mathjax-full/js/adaptors/chooseAdaptor.js";
 import {JsonMmlVisitor} from './node_modules/mathjax-full/js/core/MmlTree/JsonMmlVisitor.js';
@@ -9,27 +10,106 @@ import {STATE} from './node_modules/mathjax-full/js/core/MathItem.js';
 import {TagsFactory} from './node_modules/mathjax-full/js/input/tex/Tags.js';
 import {MapHandler} from "./node_modules/mathjax-full/js/input/tex/MapHandler.js";
 
-import {Test} from './test.js';
+import {JsonTest, Test} from './test.js';
 import './node_modules/mathjax-full/js/input/tex/base/BaseConfiguration.js';
 import './node_modules/mathjax-full/js/input/tex/ams/AmsConfiguration.js';
 
+let fs = require('fs');
 
 RegisterHTMLHandler(chooseAdaptor());
 
 export class ParserTest extends Test {
 
-  
+  json = {};
+  packages = ['ams', 'base'];
+  settings = {tags: 'none'};
+
   constructor() {
     super();
-    this.packages = ['ams', 'base'];
-    this.settings = {tags: 'none'};
     console.log('\u001B\u005B\u0033\u0034\u006D' +
                 'Running tests from ' + this.constructor.name +
                 '\u001B\u005B\u0033\u0037\u006D');
+    this.json.name = this.constructor.name;
+    this.json.packages = this.packages;
+    this.json.settings = this.settings;
+    this.json.tests = {};
+  }
+
+  outTest(name, tex, expected) {
+    this.json.tests[name] = {input: tex, expected: expected};
+  }
+
+  printTime() {
+    super.printTime();
+    if (!Object.keys(this.runningTests).length) {
+      console.log('Out: ' + this.json.name);
+      fs.writeFileSync('json3/' + this.json.name + '.json', JSON.stringify(this.json, null, 2));
+    }
+  }
+  
+  // Tests exclusively the timing of the Translate method.
+  runTest(name, tex, expected) {
+    this.outTest(name, tex,expected);
+    this.test(
+      name,
+      t => {
+        mathjax.handleRetriesFor(function() {
+          let options = {packages: this.packages};
+          Object.assign(options, this.settings);
+          let html = mathjax.document('<html></html>', {
+            InputJax: new TeX(options), OutputJax: new SVG()
+          });
+          let root = html.convert(tex, {end: STATE.CONVERT});
+          let jv = new JsonMmlVisitor();
+          root.setTeXclass(null);
+          let actual = jv.visitTree(root);
+          t.deepEqual(actual, expected, name);
+        }.bind(this)).catch(err => {
+          console.log(err.message);
+          console.log(err.stack.replace(/\n.*\/system\.js:(.|\n)*/, ''));
+        });
+      }
+    );
+  }
+  
+  ignoreTest(name, tex, expected) {
+  }
+  
+}
+
+
+export class ParserJsonTest extends JsonTest {
+
+  packages = ['ams', 'base'];
+  settings = {tags: 'none'};
+
+  constructor(file) {
+    super(file);
+    this.packages = this.json['packages'] || this.packages;
+    this.settings = this.json['settings'] || this.settings;
+    console.log('\u001B\u005B\u0033\u0034\u006D' +
+                'Running tests from ' + this.constructor.name +
+                '\u001B\u005B\u0033\u0037\u006D');
+    // this.json.name = this.constructor.name;
+    // this.json.packages = this.packages;
+    // this.json.settings = this.settings;
+    // this.json.tests = {};
   }
 
+  // outTest(name, tex, expected) {
+  //   this.json.tests[name] = {input: tex, expected: expected};
+  // }
+
+  // printTime() {
+  //   super.printTime();
+  //   if (!Object.keys(this.runningTests).length) {
+  //     fs.writeFileSync('json2/' + this.json.name + '.json', JSON.stringify(this.json, null, 2));
+  //   }
+  // }
+  
   // Tests exclusively the timing of the Translate method.
   runTest(name, tex, expected) {
+    // this.outTest(name, tex,expected);
     this.test(
       name,
       t => {
@@ -56,3 +136,16 @@ export class ParserTest extends Test {
   }
   
 }
+
+let testDir = 'json2';
+
+let allParserTests = function() {
+  let files = [];
+  if (fs.lstatSync(testDir).isDirectory()) {
+    files = fs.readdirSync(testDir).filter(x => x.match(/\.json$/));
+  }
+  files.forEach(file =>
+                (new ParserJsonTest(testDir + '/' + file)).runTests());
+};
+
+// allParserTests();
diff --git a/tests/parser-unicode-tests.js b/tests/parser-unicode-tests.js
@@ -436,3 +436,5 @@ parserTest.runTest(
 );
 
 
+
+parserTest.printTime();
diff --git a/tests/parser-verb-tests.js b/tests/parser-verb-tests.js
@@ -339,3 +339,5 @@ parserTest.runTest(
               "isSpacelike": true}]}],
       "isInferred": true}]}  
 );
+
+parserTest.printTime();
diff --git a/tests/test.js b/tests/test.js
@@ -1,9 +1,14 @@
 /* globals System: true */
 
 let test = require('tape');
+let fs = require('fs');
 
 export class Test {
 
+  failedTests = [];
+  failed = false;
+  time = 0;
+  
   constructor() {
     /**
      * @type {Object.<string, number>}
@@ -24,12 +29,20 @@ export class Test {
    * @private
    */
   startTest(name) {
-    this.runningTests[name] = (new Date()).getTime();
+    this.concludedTests[name] = (new Date()).getTime();
+  }
+
+  /**
+   * @param {string} name The name of the test.
+   * @private
+   */
+  registerTest(name) {
+    this.runningTests[name] = true;
   }
 
   stopTest(name) {
     this.concludedTests[name] =
-        (new Date()).getTime() - this.runningTests[name];
+        (new Date()).getTime() - this.concludedTests[name];
     delete this.runningTests[name];
   }
 
@@ -39,17 +52,17 @@ export class Test {
       setTimeout(this.printTime.bind(this), 100);
       return;
     }
-    let time = 0;
     for (var test in this.concludedTests) {
-      time += this.concludedTests[test];
+      this.time += this.concludedTests[test];
       delete this.concludedTests[test];
     }
-    process.stdout.write(this.constructor.name + ': ' + time + 'ms\n');
+    process.stdout.write(this.constructor.name + ': ' + this.time + 'ms\n');
   }
 
   test(name, func) {
-    this.startTest(name);
+    this.registerTest(name);
     test(name, function(t) {
+      this.startTest(name);
       t.plan(1);
       func(t);
       this.stopTest(name);
@@ -67,6 +80,8 @@ export class Test {
                              '\u001B\u005B\u0033\u0037\u006D')) +
                            '\n');
       if (result.ok) return;
+      this.failed = true;
+      this.failedTests.push(result.name);
       process.stdout.write('Actual: \n');
       process.stdout.write(JSON.stringify(result.actual) + '\n');
       process.stdout.write('Expected: \n');
@@ -77,3 +92,31 @@ export class Test {
   runTest(name, input, expected) {}
 
 }
+
+
+export class JsonTest extends Test { 
+
+  json = {};
+  name = '';
+  tests = {};
+  
+  constructor(file) {
+    super();
+    this.file = file;
+    this.parseJson();
+  }
+  
+  parseJson()  {
+    this.json = JSON.parse(fs.readFileSync(this.file));
+    this.name = this.json.name || '';
+    this.tests = this.json.tests || {};
+  }
+
+  runTests() {
+    for (const [name, {input: input, expected: expected}] of Object.entries(this.tests)) {
+      this.runTest(name, input, expected);
+    }
+    this.printTime();
+  }
+  
+}
diff --git a/tests/tests.sh b/tests/tests.sh
@@ -120,6 +120,10 @@ if [ $# -eq 0 ]; then
     $NODE $DIR/parser-physics-7-10-tests.js
     $NODE $DIR/parser-physics-7-11-tests.js
 
+    # bussproofs
+    $NODE $DIR/parser-bussproofs-reginf-tests.js
+    $NODE $DIR/parser-bussproofs-regproofs-tests.js
+
     exit 0
 else
     repeat=$1
