test(std/uuid): reorganize to use one test module per public module (#7272)

8 files changed, 61 insertions, 86 deletions

diff --git a/std/uuid/test.ts b/std/uuid/test.ts
index 58eae2fff..643ad6b55 100755..100644
--- 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/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/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/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/tests/v1/generate.ts b/std/uuid/v1_test.ts
index 548b81403..488492732 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
index 181d63ff4..f8daf132e 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
index 4e73489d0..d24da36b5 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`);
+  },
+});