From a28761bf3ed12aa2eee1c1e0d8dc761e7aecab0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= Date: Wed, 19 Jun 2019 00:07:09 +0200 Subject: [PATCH] restructured test folder --- benchmarks/tsconfig.json | 32 ----------------- package.json | 8 ++--- src/tsconfig.json | 1 - test/{ => api}/CharWidth.api.ts | 0 test/{ => api}/InputHandler.api.ts | 0 test/{ => api}/Terminal.api.ts | 0 test/{ => api}/tsconfig.json | 6 ++-- .../EscapeSequenceParser.benchmark.ts | 0 .../benchmark}/Terminal.benchmark.ts | 0 {benchmarks => test/benchmark}/benchmark.json | 0 test/benchmark/tsconfig.json | 34 +++++++++++++++++++ tsconfig.all.json | 4 +-- 12 files changed, 43 insertions(+), 42 deletions(-) delete mode 100644 benchmarks/tsconfig.json rename test/{ => api}/CharWidth.api.ts (100%) rename test/{ => api}/InputHandler.api.ts (100%) rename test/{ => api}/Terminal.api.ts (100%) rename test/{ => api}/tsconfig.json (69%) rename {benchmarks => test/benchmark}/EscapeSequenceParser.benchmark.ts (100%) rename {benchmarks => test/benchmark}/Terminal.benchmark.ts (100%) rename {benchmarks => test/benchmark}/benchmark.json (100%) create mode 100644 test/benchmark/tsconfig.json diff --git a/benchmarks/tsconfig.json b/benchmarks/tsconfig.json deleted file mode 100644 index 4dcf9b65..00000000 --- a/benchmarks/tsconfig.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "compilerOptions": { - "lib": [ - "dom", - "es6", - ], - "outDir": "../out/test", - "types": [ - "../../node_modules/@types/node" - ], - "baseUrl": "..", - "strict": true, - "baseUrl": ".", - "paths": { - "common/*": [ "../src/common/*" ], - "browser/*": [ "../src/browser/*" ], - "Terminal": [ "../src/Terminal" ] - }, - }, - "include": [ - "./**/*", - "../typings/xterm.d.ts" - ], - "exclude": [ - "../**/*test.ts" - ], - "references": [ - { "path": "../src/common" }, - { "path": "../src/browser" }, - { "path": "../src" }, - ] -} diff --git a/package.json b/package.json index 5d7cb5b4..118578aa 100644 --- a/package.json +++ b/package.json @@ -14,16 +14,16 @@ "lint": "tslint 'src/**/*.ts' './demo/**/*.ts' './addons/**/*.ts'", "test": "npm run test-unit", "posttest": "npm run lint", - "test-api": "mocha \"**/*.api.js\"", + "test-api": "mocha \"./out-test/api/*.api.js\"", "test-unit": "node ./bin/test.js", "build": "tsc -b ./tsconfig.all.json", "prepare": "npm run build", "prepublishOnly": "npm run package", "watch": "tsc -b -w ./tsconfig.all.json --preserveWatchOutput", "clean": "rm -rf lib out addons/*/lib", - "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmarks/benchmark.json", - "benchmark-baseline": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmarks/benchmark.json --baseline out/test/*benchmark.js", - "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmarks/benchmark.json --eval out/test/*benchmark.js" + "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json", + "benchmark-baseline": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --baseline out-test/benchmark/test/benchmark/*benchmark.js", + "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/test/benchmark/*benchmark.js" }, "devDependencies": { "@types/chai": "^3.4.34", diff --git a/src/tsconfig.json b/src/tsconfig.json index afaabfbb..97576668 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -11,7 +11,6 @@ ], "rootDir": ".", "outDir": "../out", - "composite": true, "baseUrl": ".", "paths": { "common/*": [ "./common/*" ], diff --git a/test/CharWidth.api.ts b/test/api/CharWidth.api.ts similarity index 100% rename from test/CharWidth.api.ts rename to test/api/CharWidth.api.ts diff --git a/test/InputHandler.api.ts b/test/api/InputHandler.api.ts similarity index 100% rename from test/InputHandler.api.ts rename to test/api/InputHandler.api.ts diff --git a/test/Terminal.api.ts b/test/api/Terminal.api.ts similarity index 100% rename from test/Terminal.api.ts rename to test/api/Terminal.api.ts diff --git a/test/tsconfig.json b/test/api/tsconfig.json similarity index 69% rename from test/tsconfig.json rename to test/api/tsconfig.json index fce9a1ba..2bd0a92b 100644 --- a/test/tsconfig.json +++ b/test/api/tsconfig.json @@ -5,9 +5,9 @@ "es6", ], "rootDir": ".", - "outDir": "../out/test", + "outDir": "../../out-test/api", "types": [ - "../node_modules/@types/mocha" + "../../node_modules/@types/mocha" ], "sourceMap": true, "removeComments": true, @@ -16,6 +16,6 @@ }, "include": [ "./**/*", - "../typings/xterm.d.ts" + "../../typings/xterm.d.ts" ] } diff --git a/benchmarks/EscapeSequenceParser.benchmark.ts b/test/benchmark/EscapeSequenceParser.benchmark.ts similarity index 100% rename from benchmarks/EscapeSequenceParser.benchmark.ts rename to test/benchmark/EscapeSequenceParser.benchmark.ts diff --git a/benchmarks/Terminal.benchmark.ts b/test/benchmark/Terminal.benchmark.ts similarity index 100% rename from benchmarks/Terminal.benchmark.ts rename to test/benchmark/Terminal.benchmark.ts diff --git a/benchmarks/benchmark.json b/test/benchmark/benchmark.json similarity index 100% rename from benchmarks/benchmark.json rename to test/benchmark/benchmark.json diff --git a/test/benchmark/tsconfig.json b/test/benchmark/tsconfig.json new file mode 100644 index 00000000..8b93dcb1 --- /dev/null +++ b/test/benchmark/tsconfig.json @@ -0,0 +1,34 @@ +{ + "compilerOptions": { + "lib": [ + "dom", + "es6", + ], + "outDir": "../../out-test/benchmark", + "types": [ + "../../node_modules/@types/node" + ], + "moduleResolution": "node", + "strict": false, + "target": "es2015", + "module": "commonjs", + "baseUrl": ".", + "paths": { + "common/*": [ "../../src/common/*" ], + "browser/*": [ "../../src/browser/*" ], + "Terminal": [ "../../src/Terminal" ] + }, + }, + "include": [ + "./**/*", + "../../typings/xterm.d.ts", + "../../out/**/*" + ], + "exclude": [ + "../../**/*test.ts" + ], + "references": [ + { "path": "../../src/common" }, + { "path": "../../src/browser" }, + ] +} \ No newline at end of file diff --git a/tsconfig.all.json b/tsconfig.all.json index aa368d5b..a6ea0e28 100644 --- a/tsconfig.all.json +++ b/tsconfig.all.json @@ -3,8 +3,8 @@ "include": [], "references": [ { "path": "./src" }, - { "path": "./test" }, - { "path": "./benchmarks" }, + { "path": "./test/api" }, + { "path": "./test/benchmark" }, { "path": "./addons/xterm-addon-attach/src" }, { "path": "./addons/xterm-addon-fit/src" }, { "path": "./addons/xterm-addon-search/src" },