From 6bc1b33e8a836d0a88f374d8285cbf82367db63f Mon Sep 17 00:00:00 2001
From: Viktor Kovacs <viktorkovacs@gmail.com>
Date: Tue, 30 Mar 2021 18:34:00 +0200
Subject: [PATCH] Use rewire to import non-module files, and use nyc for test
 coverage.

---
 package.json                    |  5 ++++-
 test/framework/native_import.js | 14 --------------
 test/utils/importall.js         |  4 ++--
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 test/framework/native_import.js

diff --git a/package.json b/package.json
index 21c403c..76eac77 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,13 @@
 		"google-closure-compiler": "^20210302.0.0",
 		"jshint": "^2.12.0",
 		"mocha": "^8.3.2",
-		"svgo": "^2.2.2"
+		"rewire": "^5.0.0",
+		"svgo": "^2.2.2",
+		"nyc": "^15.1.0"
 	},
 	"scripts": {
 		"test": "mocha test",
+		"coverage": "nyc mocha test",
 		"build": "python tools/create_package.py",
 		"update": "python tools/update_includes.py",
 		"svg": "python tools/optimize_svg_files.py"
diff --git a/test/framework/native_import.js b/test/framework/native_import.js
deleted file mode 100644
index 214ff73..0000000
--- a/test/framework/native_import.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports =
-{
-	AddNativeSourceFile : function (fileName)
-	{
-		var path = require ('path');
-		var rootDir = path.join (__dirname, '..');
-		var fullPath = path.resolve (rootDir, fileName);
-
-		var fs = require ('fs');
-		var content = fs.readFileSync (fullPath).toString ();
-
-		eval.apply (global, [content]);
-	}
-}
diff --git a/test/utils/importall.js b/test/utils/importall.js
index 0f0421e..64c38c7 100644
--- a/test/utils/importall.js
+++ b/test/utils/importall.js
@@ -1,10 +1,10 @@
 var path = require ('path');
-var nativeImport = require ('../framework/native_import.js');
+var rewire = require ('rewire');
 
 var config = require ('../../tools/config.json')
 var importerFiles = config['importer_files'];
 var fileIndex, filePath;
 for (fileIndex = 0; fileIndex < importerFiles.length; fileIndex++) {
     filePath = importerFiles[fileIndex];
-    nativeImport.AddNativeSourceFile (path.join ('..', filePath));
+    rewire (path.join ('..', '..', filePath));
 }