From 8eeb0bcbe43551450c92e705d4a34ed748d32fa1 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 27 Oct 2020 11:15:06 +0100
Subject: [PATCH 1/3] Import the `TestReporter`, in the unit and font tests

This way it's no longer necessary to load it as a script in the html-files.
---
 test/font/font_test.html  | 1 -
 test/font/jasmine-boot.js | 4 +++-
 test/unit/jasmine-boot.js | 4 +++-
 test/unit/testreporter.js | 5 ++---
 test/unit/unit_test.html  | 1 -
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/test/font/font_test.html b/test/font/font_test.html
index e5bacf0c740e5..6d1bd0d3fed37 100644
--- a/test/font/font_test.html
+++ b/test/font/font_test.html
@@ -7,7 +7,6 @@
 
   <script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
   <script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
-  <script src="../unit/testreporter.js"></script>
 
   <script defer src="../../node_modules/es-module-shims/dist/es-module-shims.js"></script>
   <script type="importmap-shim">
diff --git a/test/font/jasmine-boot.js b/test/font/jasmine-boot.js
index 460c461f9aa24..b449af1cc3346 100644
--- a/test/font/jasmine-boot.js
+++ b/test/font/jasmine-boot.js
@@ -34,12 +34,14 @@
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* globals jasmineRequire, TestReporter */
+/* globals jasmineRequire */
 
 // Modified jasmine's boot.js file to load PDF.js libraries async.
 
 "use strict";
 
+import { TestReporter } from "../unit/testreporter.js";
+
 async function initializePDFJS(callback) {
   await Promise.all(
     [
diff --git a/test/unit/jasmine-boot.js b/test/unit/jasmine-boot.js
index 2faa022b7bfad..3f9fd9c683c3c 100644
--- a/test/unit/jasmine-boot.js
+++ b/test/unit/jasmine-boot.js
@@ -34,12 +34,14 @@
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* globals jasmineRequire, TestReporter */
+/* globals jasmineRequire */
 
 // Modified jasmine's boot.js file to load PDF.js libraries async.
 
 "use strict";
 
+import { TestReporter } from "./testreporter.js";
+
 async function initializePDFJS(callback) {
   const modules = await Promise.all(
     [
diff --git a/test/unit/testreporter.js b/test/unit/testreporter.js
index ff9fb9b294316..4a7e26466275e 100644
--- a/test/unit/testreporter.js
+++ b/test/unit/testreporter.js
@@ -1,6 +1,3 @@
-"use strict";
-
-// eslint-disable-next-line no-unused-vars
 const TestReporter = function (browser) {
   function send(action, json, cb) {
     const r = new XMLHttpRequest();
@@ -91,3 +88,5 @@ const TestReporter = function (browser) {
     setTimeout(sendQuitRequest, 500);
   };
 };
+
+export { TestReporter };
diff --git a/test/unit/unit_test.html b/test/unit/unit_test.html
index befddc1e4e71a..6d1bd0d3fed37 100644
--- a/test/unit/unit_test.html
+++ b/test/unit/unit_test.html
@@ -7,7 +7,6 @@
 
   <script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
   <script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
-  <script src="testreporter.js"></script>
 
   <script defer src="../../node_modules/es-module-shims/dist/es-module-shims.js"></script>
   <script type="importmap-shim">

From 92477333f66b0828977e8f4224ac03b604bee1c9 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 27 Oct 2020 11:41:54 +0100
Subject: [PATCH 2/3] Load the non-test files with standard `import` statements
 when running the unit-tests

The unit-test files themselves shouldn't be loaded until Jasmine has been setup/configured, however that doesn't matter for the "normal" PDF.js library files. Hence we can simply `import` them in the standard way.
---
 test/unit/.eslintrc       |  3 +++
 test/unit/jasmine-boot.js | 19 ++++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/test/unit/.eslintrc b/test/unit/.eslintrc
index 4a0b538f60890..c78c8b2d8f492 100644
--- a/test/unit/.eslintrc
+++ b/test/unit/.eslintrc
@@ -4,6 +4,9 @@
   ],
 
   "rules": {
+    // Plugins
+    "import/no-unresolved": ["error", { "ignore": ["pdfjs/"] }],
+
     // ECMAScript 6
     "no-var": "error",
   },
diff --git a/test/unit/jasmine-boot.js b/test/unit/jasmine-boot.js
index 3f9fd9c683c3c..13e358eed45a5 100644
--- a/test/unit/jasmine-boot.js
+++ b/test/unit/jasmine-boot.js
@@ -40,16 +40,16 @@
 
 "use strict";
 
+import { GlobalWorkerOptions } from "pdfjs/display/worker_options.js";
+import { isNodeJS } from "pdfjs/shared/is_node.js";
+import { PDFFetchStream } from "pdfjs/display/fetch_stream.js";
+import { PDFNetworkStream } from "pdfjs/display/network.js";
+import { setPDFNetworkStreamFactory } from "pdfjs/display/api.js";
 import { TestReporter } from "./testreporter.js";
 
 async function initializePDFJS(callback) {
-  const modules = await Promise.all(
+  await Promise.all(
     [
-      "pdfjs/display/api.js",
-      "pdfjs/display/worker_options.js",
-      "pdfjs/display/network.js",
-      "pdfjs/display/fetch_stream.js",
-      "pdfjs/shared/is_node.js",
       "pdfjs-test/unit/annotation_spec.js",
       "pdfjs-test/unit/annotation_storage_spec.js",
       "pdfjs-test/unit/api_spec.js",
@@ -89,13 +89,6 @@ async function initializePDFJS(callback) {
       return import(moduleName);
     })
   );
-  const [
-    { setPDFNetworkStreamFactory },
-    { GlobalWorkerOptions },
-    { PDFNetworkStream },
-    { PDFFetchStream },
-    { isNodeJS },
-  ] = modules;
 
   if (isNodeJS) {
     throw new Error(

From d8da6afa4c5d937ed19ace88685e56bcbe6e6267 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 27 Oct 2020 11:24:25 +0100
Subject: [PATCH 3/3] Update the description of the test-case used in the
 `escapeString` unit-test

The description *itself* didn't escape the control characters correctly, leading to line-breaks being inserted in the test logs.
---
 test/unit/util_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/util_spec.js b/test/unit/util_spec.js
index 752c03ddbbe2e..b462ee744c92f 100644
--- a/test/unit/util_spec.js
+++ b/test/unit/util_spec.js
@@ -319,7 +319,7 @@ describe("util", function () {
   });
 
   describe("escapeString", function () {
-    it("should escape (, ), \n, \r and \\", function () {
+    it("should escape (, ), \\n, \\r, and \\", function () {
       expect(escapeString("((a\\a))\n(b(b\\b)\rb)")).toEqual(
         "\\(\\(a\\\\a\\)\\)\\n\\(b\\(b\\\\b\\)\\rb\\)"
       );