Testing refactor (denoland/deno_std#240)

Original: https://github.com/denoland/deno_std/commit/e1d5c00279132aa639030c6c6d9b4e308bd4775e

1 files changed, 55 insertions, 57 deletions

diff --git a/fs/path/basename_test.ts b/fs/path/basename_test.ts
index ffe9e051c..b4b6f1303 100644
--- a/fs/path/basename_test.ts
+++ b/fs/path/basename_test.ts
@@ -1,75 +1,73 @@
 // Copyright the Browserify authors. MIT License.
 // Ported from https://github.com/browserify/path-browserify/
 
-import { test, assertEqual } from "../../testing/mod.ts";
+import { test } from "../../testing/mod.ts";
+import { assertEq } from "../../testing/asserts.ts";
 import * as path from "./mod.ts";
 
 test(function basename() {
-  assertEqual(path.basename(".js", ".js"), "");
-  assertEqual(path.basename(""), "");
-  assertEqual(path.basename("/dir/basename.ext"), "basename.ext");
-  assertEqual(path.basename("/basename.ext"), "basename.ext");
-  assertEqual(path.basename("basename.ext"), "basename.ext");
-  assertEqual(path.basename("basename.ext/"), "basename.ext");
-  assertEqual(path.basename("basename.ext//"), "basename.ext");
-  assertEqual(path.basename("aaa/bbb", "/bbb"), "bbb");
-  assertEqual(path.basename("aaa/bbb", "a/bbb"), "bbb");
-  assertEqual(path.basename("aaa/bbb", "bbb"), "bbb");
-  assertEqual(path.basename("aaa/bbb//", "bbb"), "bbb");
-  assertEqual(path.basename("aaa/bbb", "bb"), "b");
-  assertEqual(path.basename("aaa/bbb", "b"), "bb");
-  assertEqual(path.basename("/aaa/bbb", "/bbb"), "bbb");
-  assertEqual(path.basename("/aaa/bbb", "a/bbb"), "bbb");
-  assertEqual(path.basename("/aaa/bbb", "bbb"), "bbb");
-  assertEqual(path.basename("/aaa/bbb//", "bbb"), "bbb");
-  assertEqual(path.basename("/aaa/bbb", "bb"), "b");
-  assertEqual(path.basename("/aaa/bbb", "b"), "bb");
-  assertEqual(path.basename("/aaa/bbb"), "bbb");
-  assertEqual(path.basename("/aaa/"), "aaa");
-  assertEqual(path.basename("/aaa/b"), "b");
-  assertEqual(path.basename("/a/b"), "b");
-  assertEqual(path.basename("//a"), "a");
+  assertEq(path.basename(".js", ".js"), "");
+  assertEq(path.basename(""), "");
+  assertEq(path.basename("/dir/basename.ext"), "basename.ext");
+  assertEq(path.basename("/basename.ext"), "basename.ext");
+  assertEq(path.basename("basename.ext"), "basename.ext");
+  assertEq(path.basename("basename.ext/"), "basename.ext");
+  assertEq(path.basename("basename.ext//"), "basename.ext");
+  assertEq(path.basename("aaa/bbb", "/bbb"), "bbb");
+  assertEq(path.basename("aaa/bbb", "a/bbb"), "bbb");
+  assertEq(path.basename("aaa/bbb", "bbb"), "bbb");
+  assertEq(path.basename("aaa/bbb//", "bbb"), "bbb");
+  assertEq(path.basename("aaa/bbb", "bb"), "b");
+  assertEq(path.basename("aaa/bbb", "b"), "bb");
+  assertEq(path.basename("/aaa/bbb", "/bbb"), "bbb");
+  assertEq(path.basename("/aaa/bbb", "a/bbb"), "bbb");
+  assertEq(path.basename("/aaa/bbb", "bbb"), "bbb");
+  assertEq(path.basename("/aaa/bbb//", "bbb"), "bbb");
+  assertEq(path.basename("/aaa/bbb", "bb"), "b");
+  assertEq(path.basename("/aaa/bbb", "b"), "bb");
+  assertEq(path.basename("/aaa/bbb"), "bbb");
+  assertEq(path.basename("/aaa/"), "aaa");
+  assertEq(path.basename("/aaa/b"), "b");
+  assertEq(path.basename("/a/b"), "b");
+  assertEq(path.basename("//a"), "a");
 
   // On unix a backslash is just treated as any other character.
-  assertEqual(
-    path.posix.basename("\\dir\\basename.ext"),
-    "\\dir\\basename.ext"
-  );
-  assertEqual(path.posix.basename("\\basename.ext"), "\\basename.ext");
-  assertEqual(path.posix.basename("basename.ext"), "basename.ext");
-  assertEqual(path.posix.basename("basename.ext\\"), "basename.ext\\");
-  assertEqual(path.posix.basename("basename.ext\\\\"), "basename.ext\\\\");
-  assertEqual(path.posix.basename("foo"), "foo");
+  assertEq(path.posix.basename("\\dir\\basename.ext"), "\\dir\\basename.ext");
+  assertEq(path.posix.basename("\\basename.ext"), "\\basename.ext");
+  assertEq(path.posix.basename("basename.ext"), "basename.ext");
+  assertEq(path.posix.basename("basename.ext\\"), "basename.ext\\");
+  assertEq(path.posix.basename("basename.ext\\\\"), "basename.ext\\\\");
+  assertEq(path.posix.basename("foo"), "foo");
 
   // POSIX filenames may include control characters
   const controlCharFilename = "Icon" + String.fromCharCode(13);
-  assertEqual(
+  assertEq(
     path.posix.basename("/a/b/" + controlCharFilename),
     controlCharFilename
   );
 });
 
 test(function basenameWin32() {
-  assertEqual(path.win32.basename("\\dir\\basename.ext"), "basename.ext");
-  assertEqual(path.win32.basename("\\basename.ext"), "basename.ext");
-  assertEqual(path.win32.basename("basename.ext"), "basename.ext");
-  assertEqual(path.win32.basename("basename.ext\\"), "basename.ext");
-  assertEqual(path.win32.basename("basename.ext\\\\"), "basename.ext");
-  assertEqual(path.win32.basename("foo"), "foo");
-  assertEqual(path.win32.basename("aaa\\bbb", "\\bbb"), "bbb");
-  assertEqual(path.win32.basename("aaa\\bbb", "a\\bbb"), "bbb");
-  assertEqual(path.win32.basename("aaa\\bbb", "bbb"), "bbb");
-  assertEqual(path.win32.basename("aaa\\bbb\\\\\\\\", "bbb"), "bbb");
-  assertEqual(path.win32.basename("aaa\\bbb", "bb"), "b");
-  assertEqual(path.win32.basename("aaa\\bbb", "b"), "bb");
-  assertEqual(path.win32.basename("C:"), "");
-  assertEqual(path.win32.basename("C:."), ".");
-  assertEqual(path.win32.basename("C:\\"), "");
-  assertEqual(path.win32.basename("C:\\dir\\base.ext"), "base.ext");
-  assertEqual(path.win32.basename("C:\\basename.ext"), "basename.ext");
-  assertEqual(path.win32.basename("C:basename.ext"), "basename.ext");
-  assertEqual(path.win32.basename("C:basename.ext\\"), "basename.ext");
-  assertEqual(path.win32.basename("C:basename.ext\\\\"), "basename.ext");
-  assertEqual(path.win32.basename("C:foo"), "foo");
-  assertEqual(path.win32.basename("file:stream"), "file:stream");
+  assertEq(path.win32.basename("\\dir\\basename.ext"), "basename.ext");
+  assertEq(path.win32.basename("\\basename.ext"), "basename.ext");
+  assertEq(path.win32.basename("basename.ext"), "basename.ext");
+  assertEq(path.win32.basename("basename.ext\\"), "basename.ext");
+  assertEq(path.win32.basename("basename.ext\\\\"), "basename.ext");
+  assertEq(path.win32.basename("foo"), "foo");
+  assertEq(path.win32.basename("aaa\\bbb", "\\bbb"), "bbb");
+  assertEq(path.win32.basename("aaa\\bbb", "a\\bbb"), "bbb");
+  assertEq(path.win32.basename("aaa\\bbb", "bbb"), "bbb");
+  assertEq(path.win32.basename("aaa\\bbb\\\\\\\\", "bbb"), "bbb");
+  assertEq(path.win32.basename("aaa\\bbb", "bb"), "b");
+  assertEq(path.win32.basename("aaa\\bbb", "b"), "bb");
+  assertEq(path.win32.basename("C:"), "");
+  assertEq(path.win32.basename("C:."), ".");
+  assertEq(path.win32.basename("C:\\"), "");
+  assertEq(path.win32.basename("C:\\dir\\base.ext"), "base.ext");
+  assertEq(path.win32.basename("C:\\basename.ext"), "basename.ext");
+  assertEq(path.win32.basename("C:basename.ext"), "basename.ext");
+  assertEq(path.win32.basename("C:basename.ext\\"), "basename.ext");
+  assertEq(path.win32.basename("C:basename.ext\\\\"), "basename.ext");
+  assertEq(path.win32.basename("C:foo"), "foo");
+  assertEq(path.win32.basename("file:stream"), "file:stream");
 });