Code cleanup.

Author: zorkow

tests/json/ParserBaseTest.json

@@ -1,13 +1,6 @@
 {
   "name": "ParserBaseTest",
   "factory": "parserTest",
-  "packages": [
-    "ams",
-    "base"
-  ],
-  "settings": {
-    "tags": "none"
-  },
   "tests": {
     "Identifier": {
       "input": "x",
@@ -10771,4 +10764,4 @@
       }
     }
   }
-}
+}

tests/json/ParserDigitsTest.json

@@ -6,8 +6,7 @@
     "base"
   ],
   "settings": {
-    "tags": "none",
-    "digits": {}
+    "tags": "none"
   },
   "tests": {
     "Integer": {
@@ -381,4 +380,4 @@
       }
     }
   }
-}
+}

tests/json/ParserPhysicsTest1_1.json

@@ -2006,4 +2006,4 @@
       }
     }
   }
-}
+}

tests/src/base-test.js

@@ -17,101 +17,15 @@
 
 
 /**
- * @fileoverview Basic test classes.
+ * @fileoverview Basic abstract test classes.
  *
  * @author [email protected] (Volker Sorge)
  */
 
 /* globals System: true */
 
-let fs = require('fs');
-
 export class Test {
 
-  failedTests = [];
-  failed = false;
-  time = 0;
-  
-  constructor() {
-    /**
-     * @type {Object.<string, number>}
-     */
-    this.runningTests = {};
-
-    /**
-     * @type {Object.<string, number>}
-     */
-    this.concludedTests = {};
-
-    // this.createStream();
-  }
-
-
-  /**
-   * @param {string} name The name of the test.
-   * @private
-   */
-  startTest(name) {
-    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.concludedTests[name];
-    delete this.runningTests[name];
-  }
-
-
-  printTime() {
-    if (Object.keys(this.runningTests).length) {
-      setTimeout(this.printTime.bind(this), 100);
-      return;
-    }
-    for (var test in this.concludedTests) {
-      this.time += this.concludedTests[test];
-      delete this.concludedTests[test];
-    }
-    process.stdout.write(this.name + ': ' + this.time + 'ms\n');
-  }
-
-  test(name, func) {
-    this.registerTest(name);
-    test(name, function(t) {
-      this.startTest(name);
-      t.plan(1);
-      func(t);
-      this.stopTest(name);
-    }.bind(this));
-  }
-
-  createStream() {
-    test.createStream({ objectMode: true }).on('data', result => {
-      if (result.type !== 'assert') return;
-      process.stdout.write('Running test ' + result.name + '\t' +
-                           (result.ok ?
-                            ('\u001B\u005B\u0033\u0032\u006D' + 'PASS' +
-                             '\u001B\u005B\u0033\u0037\u006D') :
-                            ('\u001B\u005B\u0033\u0031\u006D' + 'FAIL' +
-                             '\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');
-      process.stdout.write(JSON.stringify(result.expected) + '\n');
-    });
-  }
-
   runTest(name, input, expected, rest) {}
 
 }
@@ -141,7 +55,6 @@ export class JsonTest extends Test {
           for (const [name, {input, expected, ...rest}] of Object.entries(this.tests)) {
             this.runTest(name, input, expected, rest);
           }});
-    // this.printTime();
   }
 
 }

tests/src/parser-test.js

@@ -36,8 +36,6 @@ import {AllPackages} from '../node_modules/mathjax-full/js/input/tex/AllPackages
 
 import {JsonTest, Test} from './base-test.js';
 
-let fs = require('fs');
-
 RegisterHTMLHandler(chooseAdaptor());
 
 
@@ -59,14 +57,11 @@ export class ParserJsonTest extends JsonTest {
     this.name = this.json['name'] || this.name;
     this.settings = this.json['settings'] || this.settings;
     this.processSettings();
-    // console.log('\u001B\u005B\u0033\u0034\u006D' +
-    //             'Running tests from ' + (this.name || this.constructor.name) +
-    //             '\u001B\u005B\u0033\u0037\u006D');
   }
 
   processSettings() {
     // Processing regular expressions.
-    for (let set of ['digit', 'letter', 'special']) {
+    for (let set of ['digits', 'letter', 'special']) {
       if (this.settings[set]) {
         this.settings[set] = RegExp(this.settings[set]);
       }
@@ -166,4 +161,3 @@ export class ParserConfigMacrosTest extends ParserJsonTest {
   }
 
 }
-