summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/js/lib.deno.ns.d.ts18
-rw-r--r--cli/js/testing.ts8
-rw-r--r--cli/js/tests/testing_test.ts10
-rw-r--r--cli/tests/057_revoke_permissions.ts10
-rw-r--r--cli/tests/compiler_api_test.ts24
-rw-r--r--cli/tests/test_runner_test.ts8
6 files changed, 22 insertions, 56 deletions
diff --git a/cli/js/lib.deno.ns.d.ts b/cli/js/lib.deno.ns.d.ts
index 4d06d07e4..a421b46aa 100644
--- a/cli/js/lib.deno.ns.d.ts
+++ b/cli/js/lib.deno.ns.d.ts
@@ -63,24 +63,6 @@ declare namespace Deno {
*
* import {assert, fail, assertEquals} from "https://deno.land/std/testing/asserts.ts";
*
- * Deno.test(function myTestFunction():void {
- * assertEquals("hello", "hello");
- * });
- *
- * Deno.test(async function myAsyncTestFunction():Promise<void> {
- * const decoder = new TextDecoder("utf-8");
- * const data = await Deno.readFile("hello_world.txt");
- * assertEquals(decoder.decode(data), "Hello world")
- * });
- **/
- export function test(fn: () => void | Promise<void>): void;
-
- /** Register a test which will be run when `deno test` is used on the command
- * line and the containing module looks like a test module.
- * `fn` can be async if required.
- *
- * import {assert, fail, assertEquals} from "https://deno.land/std/testing/asserts.ts";
- *
* Deno.test("My test description", ():void => {
* assertEquals("hello", "hello");
* });
diff --git a/cli/js/testing.ts b/cli/js/testing.ts
index 93b603419..09acdc23d 100644
--- a/cli/js/testing.ts
+++ b/cli/js/testing.ts
@@ -93,12 +93,11 @@ export interface TestDefinition {
const TEST_REGISTRY: TestDefinition[] = [];
export function test(t: TestDefinition): void;
-export function test(fn: () => void | Promise<void>): void;
export function test(name: string, fn: () => void | Promise<void>): void;
// Main test function provided by Deno, as you can see it merely
// creates a new object with "name" and "fn" fields.
export function test(
- t: string | TestDefinition | (() => void | Promise<void>),
+ t: string | TestDefinition,
fn?: () => void | Promise<void>
): void {
let testDef: TestDefinition;
@@ -116,11 +115,6 @@ export function test(
throw new TypeError("The test name can't be empty");
}
testDef = { fn: fn as () => void | Promise<void>, name: t, ...defaults };
- } else if (typeof t === "function") {
- if (!t.name) {
- throw new TypeError("The test function can't be anonymous");
- }
- testDef = { fn: t, name: t.name, ...defaults };
} else {
if (!t.fn) {
throw new TypeError("Missing test function");
diff --git a/cli/js/tests/testing_test.ts b/cli/js/tests/testing_test.ts
index 09378ec30..854e7161c 100644
--- a/cli/js/tests/testing_test.ts
+++ b/cli/js/tests/testing_test.ts
@@ -25,13 +25,3 @@ unitTest(function nameOfTestCaseCantBeEmpty(): void {
"The test name can't be empty"
);
});
-
-unitTest(function testFnCantBeAnonymous(): void {
- assertThrows(
- () => {
- Deno.test(function () {});
- },
- TypeError,
- "The test function can't be anonymous"
- );
-});
diff --git a/cli/tests/057_revoke_permissions.ts b/cli/tests/057_revoke_permissions.ts
index d93ae3538..de8deecb4 100644
--- a/cli/tests/057_revoke_permissions.ts
+++ b/cli/tests/057_revoke_permissions.ts
@@ -16,7 +16,7 @@ export function assert(cond: unknown): asserts cond {
}
}
-function genFunc(grant: Deno.PermissionName): () => Promise<void> {
+function genFunc(grant: Deno.PermissionName): [string, () => Promise<void>] {
const gen: () => Promise<void> = async function Granted(): Promise<void> {
const status0 = await Deno.permissions.query({ name: grant });
assert(status0 != null);
@@ -26,11 +26,11 @@ function genFunc(grant: Deno.PermissionName): () => Promise<void> {
assert(status1 != null);
assert(status1.state === "prompt");
};
- // Properly name these generated functions.
- Object.defineProperty(gen, "name", { value: grant + "Granted" });
- return gen;
+ const name = grant + "Granted";
+ return [name, gen];
}
for (const grant of knownPermissions) {
- Deno.test(genFunc(grant));
+ const [name, fn] = genFunc(grant);
+ Deno.test(name, fn);
}
diff --git a/cli/tests/compiler_api_test.ts b/cli/tests/compiler_api_test.ts
index 4886e03b8..cdc2be6d2 100644
--- a/cli/tests/compiler_api_test.ts
+++ b/cli/tests/compiler_api_test.ts
@@ -3,7 +3,7 @@
import { assert, assertEquals } from "../../std/testing/asserts.ts";
const { compile, transpileOnly, bundle, test } = Deno;
-test(async function compilerApiCompileSources() {
+test("compilerApiCompileSources", async function () {
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`,
@@ -18,7 +18,7 @@ test(async function compilerApiCompileSources() {
]);
});
-test(async function compilerApiCompileNoSources() {
+test("compilerApiCompileNoSources", async function () {
const [diagnostics, actual] = await compile("./subdir/mod1.ts");
assert(diagnostics == null);
assert(actual);
@@ -28,7 +28,7 @@ test(async function compilerApiCompileNoSources() {
assert(keys[1].endsWith("print_hello.js"));
});
-test(async function compilerApiCompileOptions() {
+test("compilerApiCompileOptions", async function () {
const [diagnostics, actual] = await compile(
"/foo.ts",
{
@@ -45,7 +45,7 @@ test(async function compilerApiCompileOptions() {
assert(actual["/foo.js"].startsWith("define("));
});
-test(async function compilerApiCompileLib() {
+test("compilerApiCompileLib", async function () {
const [diagnostics, actual] = await compile(
"/foo.ts",
{
@@ -61,7 +61,7 @@ test(async function compilerApiCompileLib() {
assertEquals(Object.keys(actual), ["/foo.js.map", "/foo.js"]);
});
-test(async function compilerApiCompileTypes() {
+test("compilerApiCompileTypes", async function () {
const [diagnostics, actual] = await compile(
"/foo.ts",
{
@@ -76,7 +76,7 @@ test(async function compilerApiCompileTypes() {
assertEquals(Object.keys(actual), ["/foo.js.map", "/foo.js"]);
});
-test(async function transpileOnlyApi() {
+test("transpileOnlyApi", async function () {
const actual = await transpileOnly({
"foo.ts": `export enum Foo { Foo, Bar, Baz };\n`,
});
@@ -86,7 +86,7 @@ test(async function transpileOnlyApi() {
assert(actual["foo.ts"].map);
});
-test(async function transpileOnlyApiConfig() {
+test("transpileOnlyApiConfig", async function () {
const actual = await transpileOnly(
{
"foo.ts": `export enum Foo { Foo, Bar, Baz };\n`,
@@ -102,7 +102,7 @@ test(async function transpileOnlyApiConfig() {
assert(actual["foo.ts"].map == null);
});
-test(async function bundleApiSources() {
+test("bundleApiSources", async function () {
const [diagnostics, actual] = await bundle("/foo.ts", {
"/foo.ts": `export * from "./bar.ts";\n`,
"/bar.ts": `export const bar = "bar";\n`,
@@ -112,14 +112,14 @@ test(async function bundleApiSources() {
assert(actual.includes(`__exp["bar"]`));
});
-test(async function bundleApiNoSources() {
+test("bundleApiNoSources", async function () {
const [diagnostics, actual] = await bundle("./subdir/mod1.ts");
assert(diagnostics == null);
assert(actual.includes(`__instantiate("mod1")`));
assert(actual.includes(`__exp["printHello3"]`));
});
-test(async function bundleApiConfig() {
+test("bundleApiConfig", async function () {
const [diagnostics, actual] = await bundle(
"/foo.ts",
{
@@ -134,7 +134,7 @@ test(async function bundleApiConfig() {
assert(!actual.includes(`random`));
});
-test(async function bundleApiJsModules() {
+test("bundleApiJsModules", async function () {
const [diagnostics, actual] = await bundle("/foo.js", {
"/foo.js": `export * from "./bar.js";\n`,
"/bar.js": `export const bar = "bar";\n`,
@@ -143,7 +143,7 @@ test(async function bundleApiJsModules() {
assert(actual.includes(`System.register("bar",`));
});
-test(async function diagnosticsTest() {
+test("diagnosticsTest", async function () {
const [diagnostics] = await compile("/foo.ts", {
"/foo.ts": `document.getElementById("foo");`,
});
diff --git a/cli/tests/test_runner_test.ts b/cli/tests/test_runner_test.ts
index 006eca07c..680bc5c2f 100644
--- a/cli/tests/test_runner_test.ts
+++ b/cli/tests/test_runner_test.ts
@@ -2,18 +2,18 @@
import { assert } from "../../std/testing/asserts.ts";
-Deno.test(function fail1() {
+Deno.test("fail1", function () {
assert(false, "fail1 assertion");
});
-Deno.test(function fail2() {
+Deno.test("fail2", function () {
assert(false, "fail2 assertion");
});
-Deno.test(function success1() {
+Deno.test("success1", function () {
assert(true);
});
-Deno.test(function fail3() {
+Deno.test("fail3", function () {
assert(false, "fail3 assertion");
});
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-24 17:56:06 +0000