summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2020-03-11 21:54:53 +0100
committerGitHub <noreply@github.com>2020-03-11 21:54:53 +0100
commitb8fa3fd5e7dd906e5616bf2ab8ad6df3f74f244d (patch)
tree85addd5ed0b097f481d1c953bd0225efe3b5af24
parenta28fa2415f8ae6bad63469a0c9e4dce3197970f9 (diff)
move compiler API tests to integration tests (#4319)
-rw-r--r--cli/js/tests/unit_tests.ts1
-rw-r--r--cli/tests/compiler_api_test.out16
-rw-r--r--cli/tests/compiler_api_test.ts (renamed from cli/js/tests/compiler_api_test.ts)35
-rw-r--r--cli/tests/integration_tests.rs7
-rw-r--r--cli/tests/workers_test.ts2
5 files changed, 39 insertions, 22 deletions
diff --git a/cli/js/tests/unit_tests.ts b/cli/js/tests/unit_tests.ts
index 9ae724d53..9c80859d6 100644
--- a/cli/js/tests/unit_tests.ts
+++ b/cli/js/tests/unit_tests.ts
@@ -9,7 +9,6 @@ import "./buffer_test.ts";
import "./build_test.ts";
import "./chmod_test.ts";
import "./chown_test.ts";
-import "./compiler_api_test.ts";
import "./console_test.ts";
import "./copy_file_test.ts";
import "./custom_event_test.ts";
diff --git a/cli/tests/compiler_api_test.out b/cli/tests/compiler_api_test.out
new file mode 100644
index 000000000..23f44b092
--- /dev/null
+++ b/cli/tests/compiler_api_test.out
@@ -0,0 +1,16 @@
+running 12 tests
+OK compilerApiCompileSources [WILDCARD]
+OK compilerApiCompileNoSources [WILDCARD]
+OK compilerApiCompileOptions [WILDCARD]
+OK compilerApiCompileLib [WILDCARD]
+OK compilerApiCompileTypes [WILDCARD]
+OK transpileOnlyApi [WILDCARD]
+OK transpileOnlyApiConfig [WILDCARD]
+OK bundleApiSources [WILDCARD]
+OK bundleApiNoSources [WILDCARD]
+OK bundleApiConfig [WILDCARD]
+OK bundleApiJsModules [WILDCARD]
+OK diagnosticsTest [WILDCARD]
+
+test result: OK 12 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out [WILDCARD]
+
diff --git a/cli/js/tests/compiler_api_test.ts b/cli/tests/compiler_api_test.ts
index 3b0449f9a..540ac6680 100644
--- a/cli/js/tests/compiler_api_test.ts
+++ b/cli/tests/compiler_api_test.ts
@@ -1,10 +1,9 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { assert, assertEquals, unitTest } from "./test_util.ts";
+import { assert, assertEquals } from "../../std/testing/asserts.ts";
+const { compile, transpileOnly, bundle, test } = Deno;
-const { compile, transpileOnly, bundle } = Deno;
-
-unitTest(async function compilerApiCompileSources() {
+test(async function compilerApiCompileSources() {
const [diagnostics, actual] = await compile("/foo.ts", {
"/foo.ts": `import * as bar from "./bar.ts";\n\nconsole.log(bar);\n`,
"/bar.ts": `export const bar = "bar";\n`
@@ -19,8 +18,8 @@ unitTest(async function compilerApiCompileSources() {
]);
});
-unitTest(async function compilerApiCompileNoSources() {
- const [diagnostics, actual] = await compile("./cli/tests/subdir/mod1.ts");
+test(async function compilerApiCompileNoSources() {
+ const [diagnostics, actual] = await compile("./subdir/mod1.ts");
assert(diagnostics == null);
assert(actual);
const keys = Object.keys(actual);
@@ -29,7 +28,7 @@ unitTest(async function compilerApiCompileNoSources() {
assert(keys[1].endsWith("print_hello.js"));
});
-unitTest(async function compilerApiCompileOptions() {
+test(async function compilerApiCompileOptions() {
const [diagnostics, actual] = await compile(
"/foo.ts",
{
@@ -46,7 +45,7 @@ unitTest(async function compilerApiCompileOptions() {
assert(actual["/foo.js"].startsWith("define("));
});
-unitTest(async function compilerApiCompileLib() {
+test(async function compilerApiCompileLib() {
const [diagnostics, actual] = await compile(
"/foo.ts",
{
@@ -62,14 +61,14 @@ unitTest(async function compilerApiCompileLib() {
assertEquals(Object.keys(actual), ["/foo.js.map", "/foo.js"]);
});
-unitTest(async function compilerApiCompileTypes() {
+test(async function compilerApiCompileTypes() {
const [diagnostics, actual] = await compile(
"/foo.ts",
{
"/foo.ts": `console.log(Foo.bar);`
},
{
- types: ["./cli/tests/subdir/foo_types.d.ts"]
+ types: ["./subdir/foo_types.d.ts"]
}
);
assert(diagnostics == null);
@@ -77,7 +76,7 @@ unitTest(async function compilerApiCompileTypes() {
assertEquals(Object.keys(actual), ["/foo.js.map", "/foo.js"]);
});
-unitTest(async function transpileOnlyApi() {
+test(async function transpileOnlyApi() {
const actual = await transpileOnly({
"foo.ts": `export enum Foo { Foo, Bar, Baz };\n`
});
@@ -87,7 +86,7 @@ unitTest(async function transpileOnlyApi() {
assert(actual["foo.ts"].map);
});
-unitTest(async function transpileOnlyApiConfig() {
+test(async function transpileOnlyApiConfig() {
const actual = await transpileOnly(
{
"foo.ts": `export enum Foo { Foo, Bar, Baz };\n`
@@ -103,7 +102,7 @@ unitTest(async function transpileOnlyApiConfig() {
assert(actual["foo.ts"].map == null);
});
-unitTest(async function bundleApiSources() {
+test(async function bundleApiSources() {
const [diagnostics, actual] = await bundle("/foo.ts", {
"/foo.ts": `export * from "./bar.ts";\n`,
"/bar.ts": `export const bar = "bar";\n`
@@ -113,14 +112,14 @@ unitTest(async function bundleApiSources() {
assert(actual.includes(`__exp["bar"]`));
});
-unitTest(async function bundleApiNoSources() {
- const [diagnostics, actual] = await bundle("./cli/tests/subdir/mod1.ts");
+test(async function bundleApiNoSources() {
+ const [diagnostics, actual] = await bundle("./subdir/mod1.ts");
assert(diagnostics == null);
assert(actual.includes(`__instantiate("mod1")`));
assert(actual.includes(`__exp["printHello3"]`));
});
-unitTest(async function bundleApiConfig() {
+test(async function bundleApiConfig() {
const [diagnostics, actual] = await bundle(
"/foo.ts",
{
@@ -135,7 +134,7 @@ unitTest(async function bundleApiConfig() {
assert(!actual.includes(`random`));
});
-unitTest(async function bundleApiJsModules() {
+test(async function bundleApiJsModules() {
const [diagnostics, actual] = await bundle("/foo.js", {
"/foo.js": `export * from "./bar.js";\n`,
"/bar.js": `export const bar = "bar";\n`
@@ -144,7 +143,7 @@ unitTest(async function bundleApiJsModules() {
assert(actual.includes(`System.register("bar",`));
});
-unitTest(async function diagnosticsTest() {
+test(async function diagnosticsTest() {
const [diagnostics] = await compile("/foo.ts", {
"/foo.ts": `document.getElementById("foo");`
});
diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs
index 1e8274294..d5a3fb8c8 100644
--- a/cli/tests/integration_tests.rs
+++ b/cli/tests/integration_tests.rs
@@ -865,11 +865,16 @@ itest!(_026_redirect_javascript {
});
itest!(workers {
- args: "run --reload --allow-net workers_test.ts",
+ args: "test --reload --allow-net workers_test.ts",
http_server: true,
output: "workers_test.out",
});
+itest!(compiler_api {
+ args: "test --reload compiler_api_test.ts",
+ output: "compiler_api_test.out",
+});
+
itest!(_027_redirect_typescript {
args: "run --reload 027_redirect_typescript.ts",
output: "027_redirect_typescript.ts.out",
diff --git a/cli/tests/workers_test.ts b/cli/tests/workers_test.ts
index 44e7a1776..370b3cd1a 100644
--- a/cli/tests/workers_test.ts
+++ b/cli/tests/workers_test.ts
@@ -111,5 +111,3 @@ Deno.test(async function workerCanUseFetch(): Promise<void> {
await promise;
});
-
-await Deno.runTests();