From 0ea0c87b15377a3a3035a7ca6b1b3ef14488c394 Mon Sep 17 00:00:00 2001 From: Casper Beyer Date: Mon, 31 Aug 2020 02:39:51 +0800 Subject: [PATCH] test(std/uuid): reorganize to use one test module per public module (#7272) --- std/uuid/test.ts | 26 ++++++++----------- std/uuid/tests/isNil.ts | 13 ---------- std/uuid/tests/v1/validate.ts | 16 ------------ std/uuid/tests/v4/validate.ts | 16 ------------ std/uuid/tests/v5/validate.ts | 19 -------------- std/uuid/{tests/v1/generate.ts => v1_test.ts} | 18 +++++++++++-- std/uuid/{tests/v4/generate.ts => v4_test.ts} | 17 ++++++++++-- std/uuid/{tests/v5/generate.ts => v5_test.ts} | 20 ++++++++++++-- 8 files changed, 60 insertions(+), 85 deletions(-) mode change 100755 => 100644 std/uuid/test.ts delete mode 100644 std/uuid/tests/isNil.ts delete mode 100644 std/uuid/tests/v1/validate.ts delete mode 100644 std/uuid/tests/v4/validate.ts delete mode 100644 std/uuid/tests/v5/validate.ts rename std/uuid/{tests/v1/generate.ts => v1_test.ts} (63%) rename std/uuid/{tests/v4/generate.ts => v4_test.ts} (50%) rename std/uuid/{tests/v5/generate.ts => v5_test.ts} (71%) diff --git a/std/uuid/test.ts b/std/uuid/test.ts old mode 100755 new mode 100644 index 58eae2fff8..643ad6b55f --- 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. +import { assert } from "../testing/asserts.ts"; +import { NIL_UUID, isNil } from "./mod.ts"; -// 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"; +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 4877a9da40..0000000000 --- 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/validate.ts b/std/uuid/tests/v1/validate.ts deleted file mode 100644 index 1d066eb022..0000000000 --- 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/validate.ts b/std/uuid/tests/v4/validate.ts deleted file mode 100644 index 3735de51e5..0000000000 --- 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/validate.ts b/std/uuid/tests/v5/validate.ts deleted file mode 100644 index 888acb1c59..0000000000 --- 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/tests/v1/generate.ts b/std/uuid/v1_test.ts similarity index 63% rename from std/uuid/tests/v1/generate.ts rename to std/uuid/v1_test.ts index 548b81403c..4884927327 100644 --- a/std/uuid/tests/v1/generate.ts +++ b/std/uuid/v1_test.ts @@ -1,6 +1,20 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { assert, assertEquals } from "../../../testing/asserts.ts"; -import { generate, validate } from "../../v1.ts"; + +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", diff --git a/std/uuid/tests/v4/generate.ts b/std/uuid/v4_test.ts similarity index 50% rename from std/uuid/tests/v4/generate.ts rename to std/uuid/v4_test.ts index 181d63ff4b..f8daf132ed 100644 --- a/std/uuid/tests/v4/generate.ts +++ b/std/uuid/v4_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { assert, assertEquals } from "../../../testing/asserts.ts"; -import { generate, validate } from "../../v4.ts"; +import { assert, assertEquals } from "../testing/asserts.ts"; +import { generate, validate } from "./v4.ts"; Deno.test({ name: "[UUID] test_uuid_v4", @@ -20,3 +20,16 @@ Deno.test({ } }, }); + +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/v5_test.ts similarity index 71% rename from std/uuid/tests/v5/generate.ts rename to std/uuid/v5_test.ts index 4e73489d07..d24da36b57 100644 --- a/std/uuid/tests/v5/generate.ts +++ b/std/uuid/v5_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { assert, assertEquals } from "../../../testing/asserts.ts"; -import { generate, validate } from "../../v5.ts"; +import { assert, assertEquals } from "../testing/asserts.ts"; +import { generate, validate } from "./v5.ts"; const NAMESPACE = "1b671a64-40d5-491e-99b0-da01ff1f3341"; @@ -65,3 +65,19 @@ Deno.test({ 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`); + }, +});