From 0ea0c87b15377a3a3035a7ca6b1b3ef14488c394 Mon Sep 17 00:00:00 2001 From: Casper Beyer Date: Mon, 31 Aug 2020 02:39:51 +0800 Subject: test(std/uuid): reorganize to use one test module per public module (#7272) --- std/uuid/test.ts | 28 +++++++-------- std/uuid/tests/isNil.ts | 13 ------- std/uuid/tests/v1/generate.ts | 36 ------------------- std/uuid/tests/v1/validate.ts | 16 --------- std/uuid/tests/v4/generate.ts | 22 ------------ std/uuid/tests/v4/validate.ts | 16 --------- std/uuid/tests/v5/generate.ts | 67 ---------------------------------- std/uuid/tests/v5/validate.ts | 19 ---------- std/uuid/v1_test.ts | 50 ++++++++++++++++++++++++++ std/uuid/v4_test.ts | 35 ++++++++++++++++++ std/uuid/v5_test.ts | 83 +++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 180 insertions(+), 205 deletions(-) mode change 100755 => 100644 std/uuid/test.ts delete mode 100644 std/uuid/tests/isNil.ts delete mode 100644 std/uuid/tests/v1/generate.ts delete mode 100644 std/uuid/tests/v1/validate.ts delete mode 100644 std/uuid/tests/v4/generate.ts delete mode 100644 std/uuid/tests/v4/validate.ts delete mode 100644 std/uuid/tests/v5/generate.ts delete mode 100644 std/uuid/tests/v5/validate.ts create mode 100644 std/uuid/v1_test.ts create mode 100644 std/uuid/v4_test.ts create mode 100644 std/uuid/v5_test.ts (limited to 'std/uuid') diff --git a/std/uuid/test.ts b/std/uuid/test.ts old mode 100755 new mode 100644 index 58eae2fff..643ad6b55 --- a/std/uuid/test.ts +++ b/std/uuid/test.ts @@ -1,17 +1,13 @@ -#!/usr/bin/env -S deno run // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. - -// Generic Tests -import "./tests/isNil.ts"; - -// V1 Tests -import "./tests/v1/validate.ts"; -import "./tests/v1/generate.ts"; - -// V4 Tests -import "./tests/v4/validate.ts"; -import "./tests/v4/generate.ts"; - -// V5 Tests -import "./tests/v5/validate.ts"; -import "./tests/v5/generate.ts"; +import { assert } from "../testing/asserts.ts"; +import { NIL_UUID, isNil } from "./mod.ts"; + +Deno.test({ + name: "[UUID] isNil", + fn(): void { + const nil = NIL_UUID; + const u = "582cbcff-dad6-4f28-888a-e062ae36bafc"; + assert(isNil(nil)); + assert(!isNil(u)); + }, +}); diff --git a/std/uuid/tests/isNil.ts b/std/uuid/tests/isNil.ts deleted file mode 100644 index 4877a9da4..000000000 --- a/std/uuid/tests/isNil.ts +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { assert } from "../../testing/asserts.ts"; -import { NIL_UUID, isNil } from "../mod.ts"; - -Deno.test({ - name: "[UUID] isNil", - fn(): void { - const nil = NIL_UUID; - const u = "582cbcff-dad6-4f28-888a-e062ae36bafc"; - assert(isNil(nil)); - assert(!isNil(u)); - }, -}); diff --git a/std/uuid/tests/v1/generate.ts b/std/uuid/tests/v1/generate.ts deleted file mode 100644 index 548b81403..000000000 --- a/std/uuid/tests/v1/generate.ts +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { assert, assertEquals } from "../../../testing/asserts.ts"; -import { generate, validate } from "../../v1.ts"; - -Deno.test({ - name: "[UUID] test_uuid_v1", - fn(): void { - const u = generate(); - assertEquals(typeof u, "string", "returns a string"); - assert(u !== "", "return string is not empty"); - }, -}); - -Deno.test({ - name: "[UUID] test_uuid_v1_format", - fn(): void { - for (let i = 0; i < 10000; i++) { - const u = generate() as string; - assert(validate(u), `${u} is not a valid uuid v1`); - } - }, -}); - -Deno.test({ - name: "[UUID] test_uuid_v1_static", - fn(): void { - const v1options = { - node: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab], - clockseq: 0x1234, - msecs: new Date("2011-11-01").getTime(), - nsecs: 5678, - }; - const u = generate(v1options); - assertEquals(u, "710b962e-041c-11e1-9234-0123456789ab"); - }, -}); diff --git a/std/uuid/tests/v1/validate.ts b/std/uuid/tests/v1/validate.ts deleted file mode 100644 index 1d066eb02..000000000 --- a/std/uuid/tests/v1/validate.ts +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { assert } from "../../../testing/asserts.ts"; -import { generate, validate } from "../../v1.ts"; - -Deno.test({ - name: "[UUID] is_valid_uuid_v1", - fn(): void { - const u = generate(); - const t = "63655efa-7ee6-11ea-bc55-0242ac130003"; - const n = "63655efa-7ee6-11eg-bc55-0242ac130003"; - - assert(validate(u as string), `generated ${u} should be valid`); - assert(validate(t), `${t} should be valid`); - assert(!validate(n), `${n} should not be valid`); - }, -}); diff --git a/std/uuid/tests/v4/generate.ts b/std/uuid/tests/v4/generate.ts deleted file mode 100644 index 181d63ff4..000000000 --- a/std/uuid/tests/v4/generate.ts +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { assert, assertEquals } from "../../../testing/asserts.ts"; -import { generate, validate } from "../../v4.ts"; - -Deno.test({ - name: "[UUID] test_uuid_v4", - fn(): void { - const u = generate(); - assertEquals(typeof u, "string", "returns a string"); - assert(u !== "", "return string is not empty"); - }, -}); - -Deno.test({ - name: "[UUID] test_uuid_v4_format", - fn(): void { - for (let i = 0; i < 10000; i++) { - const u = generate() as string; - assert(validate(u), `${u} is not a valid uuid v4`); - } - }, -}); diff --git a/std/uuid/tests/v4/validate.ts b/std/uuid/tests/v4/validate.ts deleted file mode 100644 index 3735de51e..000000000 --- a/std/uuid/tests/v4/validate.ts +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { assert } from "../../../testing/asserts.ts"; -import { generate, validate } from "../../v4.ts"; - -Deno.test({ - name: "[UUID] is_valid_uuid_v4", - fn(): void { - const u = generate(); - const t = "84fb7824-b951-490e-8afd-0c13228a8282"; - const n = "84fb7824-b951-490g-8afd-0c13228a8282"; - - assert(validate(u), `generated ${u} should be valid`); - assert(validate(t), `${t} should be valid`); - assert(!validate(n), `${n} should not be valid`); - }, -}); diff --git a/std/uuid/tests/v5/generate.ts b/std/uuid/tests/v5/generate.ts deleted file mode 100644 index 4e73489d0..000000000 --- a/std/uuid/tests/v5/generate.ts +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { assert, assertEquals } from "../../../testing/asserts.ts"; -import { generate, validate } from "../../v5.ts"; - -const NAMESPACE = "1b671a64-40d5-491e-99b0-da01ff1f3341"; - -Deno.test({ - name: "[UUID] test_uuid_v5", - fn(): void { - const u = generate({ value: "", namespace: NAMESPACE }); - assertEquals(typeof u, "string", "returns a string"); - assert(u !== "", "return string is not empty"); - }, -}); - -Deno.test({ - name: "[UUID] test_uuid_v5_format", - fn(): void { - for (let i = 0; i < 10000; i++) { - const u = generate({ value: String(i), namespace: NAMESPACE }) as string; - assert(validate(u), `${u} is not a valid uuid v5`); - } - }, -}); - -Deno.test({ - name: "[UUID] test_uuid_v5_option", - fn(): void { - const v5Options = { - value: "Hello, World", - namespace: NAMESPACE, - }; - const u = generate(v5Options); - assertEquals(u, "4b4f2adc-5b27-57b5-8e3a-c4c4bcf94f05"); - }, -}); - -Deno.test({ - name: "[UUID] test_uuid_v5_buf_offset", - fn(): void { - const buf = [ - 75, - 79, - 42, - 220, - 91, - 39, - 87, - 181, - 142, - 58, - 196, - 196, - 188, - 249, - 79, - 5, - ]; - const origin = JSON.parse(JSON.stringify(buf)); - generate({ value: "Hello, World", namespace: NAMESPACE }, buf); - assertEquals(origin, buf); - - generate({ value: "Hello, World", namespace: NAMESPACE }, buf, 3); - assertEquals(origin.slice(0, 3), buf.slice(0, 3)); - assertEquals(origin, buf.slice(3)); - }, -}); diff --git a/std/uuid/tests/v5/validate.ts b/std/uuid/tests/v5/validate.ts deleted file mode 100644 index 888acb1c5..000000000 --- a/std/uuid/tests/v5/validate.ts +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { assert } from "../../../testing/asserts.ts"; -import { generate, validate } from "../../v5.ts"; - -Deno.test({ - name: "[UUID] is_valid_uuid_v5", - fn(): void { - const u = generate({ - value: "Hello, World", - namespace: "1b671a64-40d5-491e-99b0-da01ff1f3341", - }) as string; - const t = "4b4f2adc-5b27-57b5-8e3a-c4c4bcf94f05"; - const n = "4b4f2adc-5b27-17b5-8e3a-c4c4bcf94f05"; - - assert(validate(u), `generated ${u} should be valid`); - assert(validate(t), `${t} should be valid`); - assert(!validate(n), `${n} should not be valid`); - }, -}); diff --git a/std/uuid/v1_test.ts b/std/uuid/v1_test.ts new file mode 100644 index 000000000..488492732 --- /dev/null +++ b/std/uuid/v1_test.ts @@ -0,0 +1,50 @@ +// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. + +import { assert, assertEquals } from "../testing/asserts.ts"; +import { generate, validate } from "./v1.ts"; + +Deno.test({ + name: "[UUID] is_valid_uuid_v1", + fn(): void { + const u = generate(); + const t = "63655efa-7ee6-11ea-bc55-0242ac130003"; + const n = "63655efa-7ee6-11eg-bc55-0242ac130003"; + + assert(validate(u as string), `generated ${u} should be valid`); + assert(validate(t), `${t} should be valid`); + assert(!validate(n), `${n} should not be valid`); + }, +}); + +Deno.test({ + name: "[UUID] test_uuid_v1", + fn(): void { + const u = generate(); + assertEquals(typeof u, "string", "returns a string"); + assert(u !== "", "return string is not empty"); + }, +}); + +Deno.test({ + name: "[UUID] test_uuid_v1_format", + fn(): void { + for (let i = 0; i < 10000; i++) { + const u = generate() as string; + assert(validate(u), `${u} is not a valid uuid v1`); + } + }, +}); + +Deno.test({ + name: "[UUID] test_uuid_v1_static", + fn(): void { + const v1options = { + node: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab], + clockseq: 0x1234, + msecs: new Date("2011-11-01").getTime(), + nsecs: 5678, + }; + const u = generate(v1options); + assertEquals(u, "710b962e-041c-11e1-9234-0123456789ab"); + }, +}); diff --git a/std/uuid/v4_test.ts b/std/uuid/v4_test.ts new file mode 100644 index 000000000..f8daf132e --- /dev/null +++ b/std/uuid/v4_test.ts @@ -0,0 +1,35 @@ +// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. +import { assert, assertEquals } from "../testing/asserts.ts"; +import { generate, validate } from "./v4.ts"; + +Deno.test({ + name: "[UUID] test_uuid_v4", + fn(): void { + const u = generate(); + assertEquals(typeof u, "string", "returns a string"); + assert(u !== "", "return string is not empty"); + }, +}); + +Deno.test({ + name: "[UUID] test_uuid_v4_format", + fn(): void { + for (let i = 0; i < 10000; i++) { + const u = generate() as string; + assert(validate(u), `${u} is not a valid uuid v4`); + } + }, +}); + +Deno.test({ + name: "[UUID] is_valid_uuid_v4", + fn(): void { + const u = generate(); + const t = "84fb7824-b951-490e-8afd-0c13228a8282"; + const n = "84fb7824-b951-490g-8afd-0c13228a8282"; + + assert(validate(u), `generated ${u} should be valid`); + assert(validate(t), `${t} should be valid`); + assert(!validate(n), `${n} should not be valid`); + }, +}); diff --git a/std/uuid/v5_test.ts b/std/uuid/v5_test.ts new file mode 100644 index 000000000..d24da36b5 --- /dev/null +++ b/std/uuid/v5_test.ts @@ -0,0 +1,83 @@ +// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. +import { assert, assertEquals } from "../testing/asserts.ts"; +import { generate, validate } from "./v5.ts"; + +const NAMESPACE = "1b671a64-40d5-491e-99b0-da01ff1f3341"; + +Deno.test({ + name: "[UUID] test_uuid_v5", + fn(): void { + const u = generate({ value: "", namespace: NAMESPACE }); + assertEquals(typeof u, "string", "returns a string"); + assert(u !== "", "return string is not empty"); + }, +}); + +Deno.test({ + name: "[UUID] test_uuid_v5_format", + fn(): void { + for (let i = 0; i < 10000; i++) { + const u = generate({ value: String(i), namespace: NAMESPACE }) as string; + assert(validate(u), `${u} is not a valid uuid v5`); + } + }, +}); + +Deno.test({ + name: "[UUID] test_uuid_v5_option", + fn(): void { + const v5Options = { + value: "Hello, World", + namespace: NAMESPACE, + }; + const u = generate(v5Options); + assertEquals(u, "4b4f2adc-5b27-57b5-8e3a-c4c4bcf94f05"); + }, +}); + +Deno.test({ + name: "[UUID] test_uuid_v5_buf_offset", + fn(): void { + const buf = [ + 75, + 79, + 42, + 220, + 91, + 39, + 87, + 181, + 142, + 58, + 196, + 196, + 188, + 249, + 79, + 5, + ]; + const origin = JSON.parse(JSON.stringify(buf)); + generate({ value: "Hello, World", namespace: NAMESPACE }, buf); + assertEquals(origin, buf); + + generate({ value: "Hello, World", namespace: NAMESPACE }, buf, 3); + assertEquals(origin.slice(0, 3), buf.slice(0, 3)); + assertEquals(origin, buf.slice(3)); + }, +}); + +Deno.test({ + name: "[UUID] is_valid_uuid_v5", + fn(): void { + const u = generate({ + value: "Hello, World", + namespace: "1b671a64-40d5-491e-99b0-da01ff1f3341", + }) as string; + const t = "4b4f2adc-5b27-57b5-8e3a-c4c4bcf94f05"; + const n = "4b4f2adc-5b27-17b5-8e3a-c4c4bcf94f05"; + + assert(validate(u), `generated ${u} should be valid`); + assert(validate(t), `${t} should be valid`); + assert(!validate(n), `${n} should not be valid`); + }, +}); -- cgit v1.2.3