fix(pencil): adding must package and minor test changes

Author: ladeirarodolfo

package.json

@@ -8,7 +8,13 @@
   },
   "devDependencies": {
     "jest": "^27.5.1",
-    "lerna": "^4.0.0"
+    "lerna": "^4.0.0",
+    "must": "^0.13.4",
+    "prettier": "^2.5.1"
+  },
+  "dependencies": {
+    "commander": "^9.0.0",
+    "husky": "^7.0.4"
   },
   "workspaces": [
     "packages/*"
@@ -17,13 +23,7 @@
     "test": "lerna run test --parallel --stream",
     "build": "lerna run build --stream",
     "link:exec": "lerna run link:exec --stream",
-    "lint": "lerna run lint --parallel --stream -- ./lib/**/*.js ./__tests__/**/*.js",
-    "lint:fix": "lerna run lint:fix --parallel --stream -- ./lib/**/*.js ./__tests__/**/*.js"
-  },
-  "dependencies": {
-    "commander": "^9.0.0",
-    "husky": "^7.0.4",
-    "jest-runner-mocha": "^0.6.0",
-    "prettier": "^2.5.1"
+    "lint": "lerna run lint --parallel --stream -- ./lib/**/*.js ./tests/**/*.js",
+    "lint:fix": "lerna run lint:fix --parallel --stream -- ./lib/**/*.js ./tests/**/*.js"
   }
 }

packages/static-wado-creator/jest.config.js

@@ -1,9 +1,19 @@
+const path = require("path");
+
+const packageRoot = path.resolve(__dirname, './');
+const parentPackageRoot = path.resolve(__dirname, "../../");
+
 module.exports = {
   verbose: true,
-  runner: "jest-runner-mocha",
+  globals: {
+    TEST_DATA_PATH: path.join(parentPackageRoot, "/testdata"),
+    OUTPUT_TEMP_PATH: path.join(packageRoot, "/tmp/dicomweb"),
+  },
+  setupFilesAfterEnv: [path.join(packageRoot, '/jest.setup.js')],
+  globalTeardown: path.join(packageRoot, '/jest.global.teardown.js'),
   // just does not yet support subpath export from node
   moduleNameMapper: {
-    "(.*)-(charls|openjpeg)\/wasmjs": "<rootDir>/node_modules/$1-$2/dist/$2wasm.js",
-    "(.*)-(libjpeg)-(turbo)-(8bit)\/wasmjs": "<rootDir>/node_modules/$1-$2-$3-$4/dist/$2$3wasm.js",
+    "(.*)-(charls|openjpeg)\/wasmjs": "$1-$2/dist/$2wasm.js",
+    "(.*)-(libjpeg)-(turbo)-(8bit)\/wasmjs": "$1-$2-$3-$4/dist/$2$3wasm.js",
   },
 }

packages/static-wado-creator/jest.global.teardown.js

@@ -0,0 +1,10 @@
+
+const path = require('path');
+const deleteDir = require("./lib/util/deleteDir");
+
+const packageRoot = path.resolve(__dirname, './');
+
+module.exports = async (globals) => {
+  console.log('removing temp folder', globals);
+  await deleteDir(path.join(packageRoot, "/tmp"), true);
+};

packages/static-wado-creator/jest.setup.js

@@ -0,0 +1,3 @@
+
+// turn must package global
+require("must/register");

packages/static-wado-creator/package.json

@@ -45,7 +45,7 @@
     "mkdicomwebstudy": "bin/mkdicomwebstudy.js"
   },
   "scripts": {
-    "test": "jest --config ./jest.config.js __test__/**/*.js",
+    "test": "jest --config ./jest.config.js tests/**/*.js",
     "build": "echo \"No build yet\" && exit 0",
     "link:exec": "npm link",
     "lint": "npx prettier",

packages/static-wado-creator/__tests__/e2e/index.js renamed to packages/static-wado-creator/tests/e2e/index.js

@@ -1,15 +1,11 @@
 const fs = require("fs");
-const path = require("path");
-const assert = require("assert");
 const { execSync } = require("child_process");
 const StaticWado = require("../../lib");
 const deleteDir = require("../../lib/util/deleteDir");
 
-const TEST_DATA_PATH = path.resolve(__dirname, "../../../../testdata");
 
 // same level at package folder
-const outputDir = "./tmp/dicomweb";
-const junoDir = `${outputDir}/studies/1.2.840.113619.2.5.1762583153.215519.978957063.78`;
+const junoDir = `${OUTPUT_TEMP_PATH}/studies/1.2.840.113619.2.5.1762583153.215519.978957063.78`;
 const junoSeriesDir = `${junoDir}/series/1.2.840.113619.2.5.1762583153.215519.978957063.121`;
 const junoInstancesDir = `${junoSeriesDir}/instances/1.2.840.113619.2.5.1762583153.215519.978957063.122`;
 
@@ -27,22 +23,22 @@ describe("index", () => {
   });
 
   function assertExists(fileOrDir, exists = true) {
-    assert.equal(fs.existsSync(fileOrDir), exists);
+    fs.existsSync(fileOrDir).must.be.eql(exists);
   }
 
-  before(async () => {
-    await deleteDir(outputDir, true);
-    fs.mkdirSync(outputDir, { recursive: true });
+  beforeEach(async () => {
+    await deleteDir(OUTPUT_TEMP_PATH, true);
+    fs.mkdirSync(OUTPUT_TEMP_PATH, { recursive: true });
 
-    assertExists(outputDir, true);
+    assertExists(OUTPUT_TEMP_PATH, true);
 
-    console.log("Created directory", outputDir, fs.existsSync(outputDir));
+    console.log("Created directory", OUTPUT_TEMP_PATH, fs.existsSync(OUTPUT_TEMP_PATH));
   });
 
   const createJuno = () => {
     if (processes.createJuno) return;
     execSync(
-      `node bin/mkdicomweb.js -o ${outputDir} ${TEST_DATA_PATH}/dcm/MisterMr/1.2.840.113619.2.5.1762583153.215519.978957063.122`,
+      `node bin/mkdicomweb.js -o ${OUTPUT_TEMP_PATH} ${TEST_DATA_PATH}/dcm/MisterMr/1.2.840.113619.2.5.1762583153.215519.978957063.122`,
       (error, stdout, stderr) => {
         if (error) {
           console.log(`error: ${error.message}`);

packages/static-wado-creator/__tests__/unit/asyncIterable.js renamed to packages/static-wado-creator/tests/unit/asyncIterable.js

@@ -1,13 +1,11 @@
 const fs = require("fs");
-const path = require("path");
-const assert = require("assert");
 const asyncIteratorToBuffer = require("../../lib/operation/adapter/asyncIterableToBuffer");
 
-const TEST_DATA_PATH = path.resolve(__dirname, "../../../../testdata");
 describe("asyncIterableToBuffer", () => {
   let dicomp10stream;
 
   beforeEach(async () => {
+
     dicomp10stream = fs.createReadStream(
       `${TEST_DATA_PATH}/dcm/Juno/1.3.6.1.4.1.25403.345050719074.3824.20170125113606.8`
     );
@@ -17,10 +15,11 @@ describe("asyncIterableToBuffer", () => {
     const buffer = await asyncIteratorToBuffer(dicomp10stream);
     const dest = new Uint8Array(132);
     // D character in DICM prefix
-    assert.equal(buffer[128], 68);
+    (buffer[128]).must.be.eql(68);
     buffer.copy(dest, 0, 0, 132);
     // Should have copied
-    assert.equal(dest[128], buffer[128]);
+    
+    (dest[128]).must.be.eql(buffer[128]);
   });
 
   it("re-assembles buffers correctly", async () => {
@@ -38,7 +37,7 @@ describe("asyncIterableToBuffer", () => {
           `At position ${i} relative to ${start} buffer is ${bufVal} but subVal is ${subVal}`
         );
       }
-      assert.equal(buffer[i + start], subBuffer[i]);
+      (buffer[i + start]).must.be.eql(subBuffer[i]);
     }
   });
 });

packages/static-wado-creator/__tests__/unit/index.js renamed to packages/static-wado-creator/tests/unit/index.js

@@ -1,11 +1,8 @@
 "use strict";
 
 const fs = require("fs");
-const path = require("path");
-const assert = require("assert");
 const StaticWado = require("../../lib");
 
-const TEST_DATA_PATH = path.resolve(__dirname, "../../../../testdata");
 describe("index", () => {
   let dicomp10stream;
 
@@ -23,7 +20,7 @@ describe("index", () => {
   });
 
   it("exports", () => {
-    assert.notStrictEqual(importer, undefined);
+    importer.must.not.be.undefined();
   });
 
   // TODO - add integration tests