From 6a34026c40f7fc1746d97d88edcb4e2e982a6b02 Mon Sep 17 00:00:00 2001 From: kalwalt Date: Wed, 9 Mar 2022 17:59:42 +0100 Subject: [PATCH] fix path and test command --- karma.conf.js | 4 +--- package.json | 2 +- tests/camera_para.dat | Bin 176 -> 0 bytes tests/tests.js | 15 +++++++-------- 4 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 tests/camera_para.dat diff --git a/karma.conf.js b/karma.conf.js index 5569af1c..e66eaaa5 100644 --- 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 index 29ad6746..8142d152 100644 --- 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 deleted file mode 100644 index 73450c75bdf4b3f430f23b152b7eac62fb9abda6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmZQzU}a!nU}12WY83hI%q(pn2MipVpBz2_Wg}A#Q=P)jO(~h`P`@J#Ssa~h{{dCR zes7ZN0ie+S2djD-K(w}Er~`;DSWuq;q#dRT#y5azMQ1P#wI61W{rhuf+k6BA0jHcJ A_y7O^ diff --git a/tests/tests.js b/tests/tests.js index aecaa273..f932c7ff 100644 --- 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(