From e36edfdb3fd4709358a5f499f13cfe3d53c2b4f7 Mon Sep 17 00:00:00 2001
From: Vincent LE GOFF <g_n_s@hotmail.fr>
Date: Wed, 6 Mar 2019 22:39:50 +0100
Subject: Testing refactor (denoland/deno_std#240)

Original: https://github.com/denoland/deno_std/commit/e1d5c00279132aa639030c6c6d9b4e308bd4775e
---
 log/handlers_test.ts | 13 +++++++------
 log/logger_test.ts   | 25 +++++++++++++------------
 log/test.ts          | 17 +++++++++--------
 3 files changed, 29 insertions(+), 26 deletions(-)

(limited to 'log')

diff --git a/log/handlers_test.ts b/log/handlers_test.ts
index 7dc4e2089..9898d88d1 100644
--- a/log/handlers_test.ts
+++ b/log/handlers_test.ts
@@ -1,5 +1,6 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { assertEqual, test } from "../testing/mod.ts";
+import { test } from "../testing/mod.ts";
+import { assertEq } from "../testing/asserts.ts";
 import { LogLevel, getLevelName, getLevelByName } from "./levels.ts";
 import { BaseHandler } from "./handlers.ts";
 
@@ -55,9 +56,9 @@ test(function simpleHandler() {
       });
     }
 
-    assertEqual(handler.level, testCase);
-    assertEqual(handler.levelName, testLevel);
-    assertEqual(handler.messages, messages);
+    assertEq(handler.level, testCase);
+    assertEq(handler.levelName, testLevel);
+    assertEq(handler.messages, messages);
   }
 });
 
@@ -74,7 +75,7 @@ test(function testFormatterAsString() {
     levelName: "DEBUG"
   });
 
-  assertEqual(handler.messages, ["test DEBUG Hello, world!"]);
+  assertEq(handler.messages, ["test DEBUG Hello, world!"]);
 });
 
 test(function testFormatterAsFunction() {
@@ -91,5 +92,5 @@ test(function testFormatterAsFunction() {
     levelName: "ERROR"
   });
 
-  assertEqual(handler.messages, ["fn formmatter ERROR Hello, world!"]);
+  assertEq(handler.messages, ["fn formmatter ERROR Hello, world!"]);
 });
diff --git a/log/logger_test.ts b/log/logger_test.ts
index 8ff328c48..96d0993be 100644
--- a/log/logger_test.ts
+++ b/log/logger_test.ts
@@ -1,5 +1,6 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { assertEqual, test } from "../testing/mod.ts";
+import { test } from "../testing/mod.ts";
+import { assertEq } from "../testing/asserts.ts";
 import { LogRecord, Logger } from "./logger.ts";
 import { LogLevel } from "./levels.ts";
 import { BaseHandler } from "./handlers.ts";
@@ -22,13 +23,13 @@ test(function simpleLogger() {
   const handler = new TestHandler("DEBUG");
   let logger = new Logger("DEBUG");
 
-  assertEqual(logger.level, LogLevel.DEBUG);
-  assertEqual(logger.levelName, "DEBUG");
-  assertEqual(logger.handlers, []);
+  assertEq(logger.level, LogLevel.DEBUG);
+  assertEq(logger.levelName, "DEBUG");
+  assertEq(logger.handlers, []);
 
   logger = new Logger("DEBUG", [handler]);
 
-  assertEqual(logger.handlers, [handler]);
+  assertEq(logger.handlers, [handler]);
 });
 
 test(function customHandler() {
@@ -37,7 +38,7 @@ test(function customHandler() {
 
   logger.debug("foo", 1, 2);
 
-  assertEqual(handler.records, [
+  assertEq(handler.records, [
     {
       msg: "foo",
       args: [1, 2],
@@ -47,7 +48,7 @@ test(function customHandler() {
     }
   ]);
 
-  assertEqual(handler.messages, ["DEBUG foo"]);
+  assertEq(handler.messages, ["DEBUG foo"]);
 });
 
 test(function logFunctions() {
@@ -65,7 +66,7 @@ test(function logFunctions() {
 
   doLog("DEBUG");
 
-  assertEqual(handler.messages, [
+  assertEq(handler.messages, [
     "DEBUG foo",
     "INFO bar",
     "WARNING baz",
@@ -75,7 +76,7 @@ test(function logFunctions() {
 
   doLog("INFO");
 
-  assertEqual(handler.messages, [
+  assertEq(handler.messages, [
     "INFO bar",
     "WARNING baz",
     "ERROR boo",
@@ -84,13 +85,13 @@ test(function logFunctions() {
 
   doLog("WARNING");
 
-  assertEqual(handler.messages, ["WARNING baz", "ERROR boo", "CRITICAL doo"]);
+  assertEq(handler.messages, ["WARNING baz", "ERROR boo", "CRITICAL doo"]);
 
   doLog("ERROR");
 
-  assertEqual(handler.messages, ["ERROR boo", "CRITICAL doo"]);
+  assertEq(handler.messages, ["ERROR boo", "CRITICAL doo"]);
 
   doLog("CRITICAL");
 
-  assertEqual(handler.messages, ["CRITICAL doo"]);
+  assertEq(handler.messages, ["CRITICAL doo"]);
 });
diff --git a/log/test.ts b/log/test.ts
index 3599247bd..0dc44cba6 100644
--- a/log/test.ts
+++ b/log/test.ts
@@ -1,5 +1,6 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { assertEqual, test } from "../testing/mod.ts";
+import { test } from "../testing/mod.ts";
+import { assertEq } from "../testing/asserts.ts";
 import * as log from "./mod.ts";
 import { LogLevel } from "./levels.ts";
 
@@ -54,7 +55,7 @@ test(async function defaultHandlers() {
     logger("foo");
     logger("bar", 1, 2);
 
-    assertEqual(handler.messages, [`${levelName} foo`, `${levelName} bar`]);
+    assertEq(handler.messages, [`${levelName} foo`, `${levelName} bar`]);
   }
 });
 
@@ -75,8 +76,8 @@ test(async function getLogger() {
 
   const logger = log.getLogger();
 
-  assertEqual(logger.levelName, "DEBUG");
-  assertEqual(logger.handlers, [handler]);
+  assertEq(logger.levelName, "DEBUG");
+  assertEq(logger.handlers, [handler]);
 });
 
 test(async function getLoggerWithName() {
@@ -96,8 +97,8 @@ test(async function getLoggerWithName() {
 
   const logger = log.getLogger("bar");
 
-  assertEqual(logger.levelName, "INFO");
-  assertEqual(logger.handlers, [fooHandler]);
+  assertEq(logger.levelName, "INFO");
+  assertEq(logger.handlers, [fooHandler]);
 });
 
 test(async function getLoggerUnknown() {
@@ -108,6 +109,6 @@ test(async function getLoggerUnknown() {
 
   const logger = log.getLogger("nonexistent");
 
-  assertEqual(logger.levelName, "NOTSET");
-  assertEqual(logger.handlers, []);
+  assertEq(logger.levelName, "NOTSET");
+  assertEq(logger.handlers, []);
 });
-- 
cgit v1.2.3