summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--js/console.ts6
-rw-r--r--js/console_test.ts279
-rw-r--r--tests/console_group.test2
-rw-r--r--tests/console_group.ts15
-rw-r--r--tests/console_group.ts.out7
-rw-r--r--tests/console_group_warn.test3
-rw-r--r--tests/console_group_warn.ts20
-rw-r--r--tests/console_group_warn.ts.out9
-rw-r--r--tests/console_table.test3
-rw-r--r--tests/console_table.ts18
-rw-r--r--tests/console_table.ts.out71
11 files changed, 281 insertions, 152 deletions
diff --git a/js/console.ts b/js/console.ts
index 0fa4ea6c7..93a9c72f0 100644
--- a/js/console.ts
+++ b/js/console.ts
@@ -581,8 +581,8 @@ export class Console {
table = (data: unknown, properties?: string[]): void => {
if (properties !== undefined && !Array.isArray(properties)) {
throw new Error(
- "The 'properties' argument must be of type Array\
- . Received type string"
+ "The 'properties' argument must be of type Array. " +
+ "Received type string"
);
}
@@ -615,7 +615,7 @@ export class Console {
let idx = 0;
resultData = {};
- data.forEach((k: unknown, v: unknown) => {
+ data.forEach((v: unknown, k: unknown) => {
resultData[idx] = { Key: k, Values: v };
idx++;
});
diff --git a/js/console_test.ts b/js/console_test.ts
index d61c87307..85ec16de8 100644
--- a/js/console_test.ts
+++ b/js/console_test.ts
@@ -4,7 +4,15 @@ import { test, assertEqual, assert } from "./test_util.ts";
// Some of these APIs aren't exposed in the types and so we have to cast to any
// in order to "trick" TypeScript.
// tslint:disable-next-line:no-any
-const { Console, libdeno, stringifyArgs, inspect, write, stdout } = Deno as any;
+const {
+ Console,
+ libdeno,
+ stringifyArgs,
+ inspect,
+ readAll,
+ write,
+ stdout
+} = Deno as any;
const console = new Console(libdeno.print);
@@ -310,3 +318,272 @@ test(function consoleDetachedLog() {
consoleGroupEnd();
consoleClear();
});
+
+class StringBuffer {
+ chunks: string[] = [];
+ add(x: string) {
+ this.chunks.push(x);
+ }
+ toString() {
+ return this.chunks.join("");
+ }
+}
+
+type ConsoleExamineFunc = (
+ csl: any, // tslint:disable-line:no-any
+ out: StringBuffer,
+ err?: StringBuffer,
+ both?: StringBuffer
+) => void;
+
+function mockConsole(f: ConsoleExamineFunc) {
+ const out = new StringBuffer();
+ const err = new StringBuffer();
+ const both = new StringBuffer();
+ const csl = new Console(
+ (x: string, isErr: boolean, printsNewLine: boolean) => {
+ const content = x + (printsNewLine ? "\n" : "");
+ const buf = isErr ? err : out;
+ buf.add(content);
+ both.add(content);
+ }
+ );
+ f(csl, out, err, both);
+}
+
+// console.group test
+test(function consoleGroup() {
+ mockConsole((console, out) => {
+ console.group("1");
+ console.log("2");
+ console.group("3");
+ console.log("4");
+ console.groupEnd();
+ console.groupEnd();
+
+ console.groupCollapsed("5");
+ console.log("6");
+ console.group("7");
+ console.log("8");
+ console.groupEnd();
+ console.groupEnd();
+ console.log("9");
+ console.log("10");
+
+ assertEqual(
+ out.toString(),
+ `1
+ 2
+ 3
+ 4
+5678
+9
+10
+`
+ );
+ });
+});
+
+// console.group with console.warn test
+test(function consoleGroupWarn() {
+ mockConsole((console, _out, _err, both) => {
+ console.warn("1");
+ console.group();
+ console.warn("2");
+ console.group();
+ console.warn("3");
+ console.groupEnd();
+ console.warn("4");
+ console.groupEnd();
+ console.warn("5");
+
+ console.groupCollapsed();
+ console.warn("6");
+ console.group();
+ console.warn("7");
+ console.groupEnd();
+ console.warn("8");
+ console.groupEnd();
+
+ console.warn("9");
+ console.warn("10");
+ assertEqual(
+ both.toString(),
+ `1
+ 2
+ 3
+ 4
+5
+678
+9
+10
+`
+ );
+ });
+});
+
+// console.table test
+test(function consoleTable() {
+ mockConsole((console, out) => {
+ console.table({ a: "test", b: 1 });
+ assertEqual(
+ out.toString(),
+ `┌─────────┬────────┐
+│ (index) │ Values │
+├─────────┼────────┤
+│ a │ "test" │
+│ b │ 1 │
+└─────────┴────────┘
+`
+ );
+ });
+ mockConsole((console, out) => {
+ console.table({ a: { b: 10 }, b: { b: 20, c: 30 } }, ["c"]);
+ assertEqual(
+ out.toString(),
+ `┌─────────┬────┐
+│ (index) │ c │
+├─────────┼────┤
+│ a │ │
+│ b │ 30 │
+└─────────┴────┘
+`
+ );
+ });
+ mockConsole((console, out) => {
+ console.table([1, 2, [3, [4]], [5, 6], [[7], [8]]]);
+ assertEqual(
+ out.toString(),
+ `┌─────────┬───────┬───────┬────────┐
+│ (index) │ 0 │ 1 │ Values │
+├─────────┼───────┼───────┼────────┤
+│ 0 │ │ │ 1 │
+│ 1 │ │ │ 2 │
+│ 2 │ 3 │ [ 4 ] │ │
+│ 3 │ 5 │ 6 │ │
+│ 4 │ [ 7 ] │ [ 8 ] │ │
+└─────────┴───────┴───────┴────────┘
+`
+ );
+ });
+ mockConsole((console, out) => {
+ console.table(new Set([1, 2, 3, "test"]));
+ assertEqual(
+ out.toString(),
+ `┌───────────────────┬────────┐
+│ (iteration index) │ Values │
+├───────────────────┼────────┤
+│ 0 │ 1 │
+│ 1 │ 2 │
+│ 2 │ 3 │
+│ 3 │ "test" │
+└───────────────────┴────────┘
+`
+ );
+ });
+ mockConsole((console, out) => {
+ console.table(new Map([[1, "one"], [2, "two"]]));
+ assertEqual(
+ out.toString(),
+ `┌───────────────────┬─────┬────────┐
+│ (iteration index) │ Key │ Values │
+├───────────────────┼─────┼────────┤
+│ 0 │ 1 │ "one" │
+│ 1 │ 2 │ "two" │
+└───────────────────┴─────┴────────┘
+`
+ );
+ });
+ mockConsole((console, out) => {
+ console.table({
+ a: true,
+ b: { c: { d: 10 }, e: [1, 2, [5, 6]] },
+ f: "test",
+ g: new Set([1, 2, 3, "test"]),
+ h: new Map([[1, "one"]])
+ });
+ assertEqual(
+ out.toString(),
+ `┌─────────┬───────────┬───────────────────┬────────┐
+│ (index) │ c │ e │ Values │
+├─────────┼───────────┼───────────────────┼────────┤
+│ a │ │ │ true │
+│ b │ { d: 10 } │ [ 1, 2, [Array] ] │ │
+│ f │ │ │ "test" │
+│ g │ │ │ │
+│ h │ │ │ │
+└─────────┴───────────┴───────────────────┴────────┘
+`
+ );
+ });
+ mockConsole((console, out) => {
+ console.table([
+ 1,
+ "test",
+ false,
+ { a: 10 },
+ ["test", { b: 20, c: "test" }]
+ ]);
+ assertEqual(
+ out.toString(),
+ `┌─────────┬────────┬──────────────────────┬────┬────────┐
+│ (index) │ 0 │ 1 │ a │ Values │
+├─────────┼────────┼──────────────────────┼────┼────────┤
+│ 0 │ │ │ │ 1 │
+│ 1 │ │ │ │ "test" │
+│ 2 │ │ │ │ false │
+│ 3 │ │ │ 10 │ │
+│ 4 │ "test" │ { b: 20, c: "test" } │ │ │
+└─────────┴────────┴──────────────────────┴────┴────────┘
+`
+ );
+ });
+ mockConsole((console, out) => {
+ console.table([]);
+ assertEqual(
+ out.toString(),
+ `┌─────────┐
+│ (index) │
+├─────────┤
+└─────────┘
+`
+ );
+ });
+ mockConsole((console, out) => {
+ console.table({});
+ assertEqual(
+ out.toString(),
+ `┌─────────┐
+│ (index) │
+├─────────┤
+└─────────┘
+`
+ );
+ });
+ mockConsole((console, out) => {
+ console.table(new Set());
+ assertEqual(
+ out.toString(),
+ `┌───────────────────┐
+│ (iteration index) │
+├───────────────────┤
+└───────────────────┘
+`
+ );
+ });
+ mockConsole((console, out) => {
+ console.table(new Map());
+ assertEqual(
+ out.toString(),
+ `┌───────────────────┐
+│ (iteration index) │
+├───────────────────┤
+└───────────────────┘
+`
+ );
+ });
+ mockConsole((console, out) => {
+ console.table("test");
+ assertEqual(out.toString(), "test\n");
+ });
+});
diff --git a/tests/console_group.test b/tests/console_group.test
deleted file mode 100644
index 9b9a0c7bd..000000000
--- a/tests/console_group.test
+++ /dev/null
@@ -1,2 +0,0 @@
-args: tests/console_group.ts --reload
-output: tests/console_group.ts.out
diff --git a/tests/console_group.ts b/tests/console_group.ts
deleted file mode 100644
index 990acc35c..000000000
--- a/tests/console_group.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-console.group("1");
-console.log("2");
-console.group("3");
-console.log("4");
-console.groupEnd();
-console.groupEnd();
-
-console.groupCollapsed("5");
-console.log("6");
-console.group("7");
-console.log("8");
-console.groupEnd();
-console.groupEnd();
-console.log("9");
-console.log("10");
diff --git a/tests/console_group.ts.out b/tests/console_group.ts.out
deleted file mode 100644
index a3eff7094..000000000
--- a/tests/console_group.ts.out
+++ /dev/null
@@ -1,7 +0,0 @@
-1
- 2
- 3
- 4
-5678
-9
-10
diff --git a/tests/console_group_warn.test b/tests/console_group_warn.test
deleted file mode 100644
index eb71c0b2f..000000000
--- a/tests/console_group_warn.test
+++ /dev/null
@@ -1,3 +0,0 @@
-args: tests/console_group_warn.ts --reload
-check_stderr: true
-output: tests/console_group_warn.ts.out
diff --git a/tests/console_group_warn.ts b/tests/console_group_warn.ts
deleted file mode 100644
index 8ab871338..000000000
--- a/tests/console_group_warn.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-console.warn("1");
-console.group();
-console.warn("2");
-console.group();
-console.warn("3");
-console.groupEnd();
-console.warn("4");
-console.groupEnd();
-console.warn("5");
-
-console.groupCollapsed();
-console.warn("6");
-console.group();
-console.warn("7");
-console.groupEnd();
-console.warn("8");
-console.groupEnd();
-
-console.warn("9");
-console.warn("10");
diff --git a/tests/console_group_warn.ts.out b/tests/console_group_warn.ts.out
deleted file mode 100644
index e09019f2b..000000000
--- a/tests/console_group_warn.ts.out
+++ /dev/null
@@ -1,9 +0,0 @@
-Compiling [WILDCARD].ts
-1
- 2
- 3
- 4
-5
-678
-9
-10
diff --git a/tests/console_table.test b/tests/console_table.test
deleted file mode 100644
index 4f2c5c4ac..000000000
--- a/tests/console_table.test
+++ /dev/null
@@ -1,3 +0,0 @@
-args: tests/console_table.ts --reload
-check_stderr: true
-output: tests/console_table.ts.out
diff --git a/tests/console_table.ts b/tests/console_table.ts
deleted file mode 100644
index 6ff391d99..000000000
--- a/tests/console_table.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-console.table({ a: "test", b: 1 });
-console.table({ a: { b: 10 }, b: { b: 20, c: 30 } }, ["c"]);
-console.table([1, 2, [3, [4]], [5, 6], [[7], [8]]]);
-console.table(new Set([1, 2, 3, "test"]));
-console.table(new Map([[1, "one"], [2, "two"]]));
-console.table({
- a: true,
- b: { c: { d: 10 }, e: [1, 2, [5, 6]] },
- f: "test",
- g: new Set([1, 2, 3, "test"]),
- h: new Map([[1, "one"]])
-});
-console.table([1, "test", false, { a: 10 }, ["test", { b: 20, c: "test" }]]);
-console.table([]);
-console.table({});
-console.table(new Set());
-console.table(new Map());
-console.table("test");
diff --git a/tests/console_table.ts.out b/tests/console_table.ts.out
deleted file mode 100644
index b4651bc65..000000000
--- a/tests/console_table.ts.out
+++ /dev/null
@@ -1,71 +0,0 @@
-Compiling [WILDCARD].ts
-┌─────────┬────────┐
-│ (index) │ Values │
-├─────────┼────────┤
-│ a │ "test" │
-│ b │ 1 │
-└─────────┴────────┘
-┌─────────┬────┐
-│ (index) │ c │
-├─────────┼────┤
-│ a │ │
-│ b │ 30 │
-└─────────┴────┘
-┌─────────┬───────┬───────┬────────┐
-│ (index) │ 0 │ 1 │ Values │
-├─────────┼───────┼───────┼────────┤
-│ 0 │ │ │ 1 │
-│ 1 │ │ │ 2 │
-│ 2 │ 3 │ [ 4 ] │ │
-│ 3 │ 5 │ 6 │ │
-│ 4 │ [ 7 ] │ [ 8 ] │ │
-└─────────┴───────┴───────┴────────┘
-┌───────────────────┬────────┐
-│ (iteration index) │ Values │
-├───────────────────┼────────┤
-│ 0 │ 1 │
-│ 1 │ 2 │
-│ 2 │ 3 │
-│ 3 │ "test" │
-└───────────────────┴────────┘
-┌───────────────────┬───────┬────────┐
-│ (iteration index) │ Key │ Values │
-├───────────────────┼───────┼────────┤
-│ 0 │ "one" │ 1 │
-│ 1 │ "two" │ 2 │
-└───────────────────┴───────┴────────┘
-┌─────────┬───────────┬───────────────────┬────────┐
-│ (index) │ c │ e │ Values │
-├─────────┼───────────┼───────────────────┼────────┤
-│ a │ │ │ true │
-│ b │ { d: 10 } │ [ 1, 2, [Array] ] │ │
-│ f │ │ │ "test" │
-│ g │ │ │ │
-│ h │ │ │ │
-└─────────┴───────────┴───────────────────┴────────┘
-┌─────────┬────────┬──────────────────────┬────┬────────┐
-│ (index) │ 0 │ 1 │ a │ Values │
-├─────────┼────────┼──────────────────────┼────┼────────┤
-│ 0 │ │ │ │ 1 │
-│ 1 │ │ │ │ "test" │
-│ 2 │ │ │ │ false │
-│ 3 │ │ │ 10 │ │
-│ 4 │ "test" │ { b: 20, c: "test" } │ │ │
-└─────────┴────────┴──────────────────────┴────┴────────┘
-┌─────────┐
-│ (index) │
-├─────────┤
-└─────────┘
-┌─────────┐
-│ (index) │
-├─────────┤
-└─────────┘
-┌───────────────────┐
-│ (iteration index) │
-├───────────────────┤
-└───────────────────┘
-┌───────────────────┐
-│ (iteration index) │
-├───────────────────┤
-└───────────────────┘
-test
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 21:50:43 +0000