fix path and test command

webarkit · Mar 9, 2022 · 6a34026 · 6a34026
1 parent b233ece
commit 6a34026
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -23,7 +23,7 @@ module.exports = function(config) {
     files: [
       { pattern: 'build/artoolkitNFT.min.js', included: true },
       { pattern: 'tests/*.js', included: true },
-      { pattern: 'tests/camera_para.dat', watched: false, included: false, served: true, nocache: false }
+      { pattern: 'examples/Data/camera_para.dat', watched: false, included: false, served: true, nocache: false }
     ],
 
 
@@ -64,8 +64,6 @@ module.exports = function(config) {
     // start these browsers
     // available browser launchers: https://www.npmjs.com/search?q=keywords:karma-launcher
     browsers: [
-      //'Firefox', 
-      //'Chrome',
       (process.platform === 'linux') ? 'ChromiumHeadless' : 'ChromeHeadless',
       'FirefoxHeadless'
       ],

diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "build": "node tools/makem.js; echo Built at `date`",
     "build-no-libar": "node tools/makem.js --no-libar; echo Built at `date`",
     "test-browser": "karma start --browsers Chrome,Firefox,ChromeHeadless,FirefoxHeadless",
-    "test-headless-browser": "karma start --browsers ChromeHeadless,FirefoxHeadless",
+    "test-headless-browser": "karma start",
     "watch": "./node_modules/.bin/watch 'npm run build' ./js/",
     "format-check": "prettier --check .",
     "format": "prettier --write ."

diff --git a/tests/camera_para.dat b/tests/camera_para.dat
diff --git a/tests/tests.js b/tests/tests.js
@@ -1,7 +1,6 @@
 QUnit.module("ARCameraParaNFT");
 QUnit.test("Create object and load camera parameter", function (assert) {
-  const cParaUrl = "./base/tests/camera_para.dat";
-  //const cParaUrl = "./camera_para.dat";
+  const cParaUrl = "./base/examples/Data/camera_para.dat";
   const done = assert.async();
   const success = function () {
     assert.ok(true, "Successfully loaded camera para");
@@ -21,7 +20,7 @@ QUnit.test("Create object and load camera parameter", function (assert) {
 QUnit.test(
   "Create object and fail to load camera parameter",
   function (assert) {
-    const cParaUrl = "./camera_para_error.dat";
+    const cParaUrl = "./base/examples/Data/camera_para_error.dat";
     const done = assert.async();
     const success = function () {
       assert.ok(false, "Successfully loaded camera para");
@@ -35,26 +34,26 @@ QUnit.test(
   }
 );
 QUnit.test("Try to load twice", (assert) => {
-  const cParaUrl = "./camera_para_error.dat";
+  const cParaUrl = "./base/examples/Data/camera_para_error.dat";
   const success = function () {};
   const error = function () {};
   const cameraPara = new ARCameraParamNFT(cParaUrl, success, error);
 
   assert.throws(() => {
-    cameraPara.load("./camera_para.dat");
+    cameraPara.load("./base/examples/Data/camera_para.dat");
   }, "Throws an error that calibration tried to load twice");
 });
 QUnit.test(
   "Try to load twice but empty existing ARCameraParamNFT before loading",
   (assert) => {
-    const cParaUrl = "./camera_para_error.dat";
+    const cParaUrl = "./base/examples/Data/camera_para_error.dat";
     const success = function () {};
     const error = function () {};
     const cameraPara = new ARCameraParamNFT(cParaUrl, success, error);
     cameraPara.dispose();
     assert.deepEqual("", cameraPara.src);
 
-    const cameraParaString = "./camera_para.dat";
+    const cameraParaString = "./base/examples/Data/camera_para.dat";
     cameraPara.load(cameraParaString);
     assert.deepEqual(
       cameraParaString,
@@ -69,7 +68,7 @@ QUnit.module("ARControllerNFT", {
   beforeEach: (assert) => {
     this.timeout = 5000;
     this.cleanUpTimeout = 500;
-    this.cParaUrl = "./base/tests/camera_para.dat";
+    this.cParaUrl = "./base/examples/Data/camera_para.dat";
     this.checkDefault = (arController) => {
       assert.ok(arController);
       assert.deepEqual(