Add tests

Author: code-asher

package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "lint": "eslint src/**",
     "prepare": "tsc",
-    "test": "jest"
+    "test": "mocha --require ts-node/register ./test/*.test.ts"
   },
   "version": "2.0.0",
   "main": "out/index.js",
@@ -16,27 +16,18 @@
   },
   "devDependencies": {
     "@google-cloud/logging": "^9.2.1",
-    "@types/jest": "^24.0.16",
+    "@types/mocha": "^8.2.2",
     "@types/node": "^12.6.8",
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
     "eslint": "^7.25.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-prettier": "^3.4.0",
-    "jest": "^24.8.0",
+    "mocha": "^8.3.2",
     "prettier": "^2.2.1",
-    "ts-jest": "^24.0.2",
+    "ts-node": "^9.1.1",
     "typescript": "^3.5.3"
   },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "ts"
-    ],
-    "transform": {
-      "^.+\\.tsx?$": "ts-jest"
-    },
-    "testRegex": ".*\\.test\\.ts"
-  }
+  "dependencies": {}
 }

src/extender.ts

@@ -15,7 +15,7 @@ export const createStackdriverExtender = (projectId: string, logId: string): Ext
         return gcl.protos.google.logging.type.LogSeverity.DEBUG
       case Level.Info:
         return gcl.protos.google.logging.type.LogSeverity.INFO
-      case Level.Warning:
+      case Level.Warn:
         return gcl.protos.google.logging.type.LogSeverity.WARNING
       case Level.Error:
         return gcl.protos.google.logging.type.LogSeverity.ERROR

src/logger.ts

@@ -5,7 +5,7 @@ export enum Level {
   Trace,
   Debug,
   Info,
-  Warning,
+  Warn,
   Error,
 }
 
@@ -103,7 +103,7 @@ export function doLog(level: Level, ...args: Argument): void {
       return console.debug(...args)
     case Level.Info:
       return console.info(...args)
-    case Level.Warning:
+    case Level.Warn:
       return console.warn(...args)
     case Level.Error:
       return console.error(...args)
@@ -160,7 +160,7 @@ export abstract class Formatter {
     if (Array.isArray(arg) && arg.every((a) => a instanceof Field)) {
       return void this.message.fields.push(...arg)
     }
-    if (this.colors) {
+    if (this.colors && (color || weight)) {
       this.message.format += `${this.formatType}${this.getType(arg)}${this.formatType}`
       this.message.args.push(this.style(color, weight), arg, this.reset())
     } else {
@@ -325,7 +325,7 @@ export class Logger {
           this.level = Level.Info
           break
         case "warn":
-          this.level = Level.Warning
+          this.level = Level.Warn
           break
         case "error":
           this.level = Level.Error
@@ -367,7 +367,7 @@ export class Logger {
       message,
       fields,
       tagColor: "#FF9D00",
-      level: Level.Warning,
+      level: Level.Warn,
     })
   }
 

test/logger.test.ts

@@ -0,0 +1,79 @@
+import * as assert from "assert"
+import { Argument, logger } from "../src/logger"
+
+function testLog(level: "trace" | "debug" | "info" | "warn" | "error", skip = false): void {
+  const original = console[level]
+  const fn = logger[level].bind(logger)
+
+  let called = 0
+  const args: Argument[] = []
+  const message = `log: ${level}`
+
+  console[level] = (...a: Argument[]) => {
+    ++called
+    args.push(...a)
+  }
+
+  try {
+    fn(message)
+  } finally {
+    console[level] = original
+  }
+
+  if (skip) {
+    return assert.strictEqual(0, called)
+  }
+
+  // Colors are only used for TTYs.
+  const colors = !!process.stdout.isTTY
+
+  assert.strictEqual(1, called)
+
+  const expectedLength = colors ? 6 : 4
+  assert.strictEqual(args.length, expectedLength)
+
+  // The first argument contains all the formats for the arguments.
+  let i = 0
+  assert.strictEqual(args[i++], "[%s] " + "%s".repeat(expectedLength - 2))
+
+  // The next part is the date.
+  assert.strictEqual(true, /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z/.test(args[i++]))
+
+  // Then the log level color.
+  if (colors) {
+    assert.strictEqual(true, args[i++].startsWith("\x1B["))
+  }
+
+  // The log level.
+  assert.strictEqual(args[i++].trim(), level)
+
+  // Reset colors back to base.
+  if (colors) {
+    assert.strictEqual(true, args[i++].startsWith("\x1B[0m"))
+  }
+
+  // The actual message.
+  assert.strictEqual(args[i++], message)
+}
+
+describe("Logger", () => {
+  it("should *NOT* log a trace message", () => {
+    testLog("trace", true)
+  })
+
+  it("should *NOT* log a debug message", () => {
+    testLog("debug", true)
+  })
+
+  it("should log an info message", () => {
+    testLog("info")
+  })
+
+  it("should log a warning message", () => {
+    testLog("warn")
+  })
+
+  it("should log an error message", () => {
+    testLog("error")
+  })
+})

tsconfig.json

@@ -1,17 +1,17 @@
 {
-	"compilerOptions": {
-		"declaration": true,
-		"module": "commonjs",
-		"moduleResolution": "node",
-		"outDir": "out",
-		"sourceMap": true,
-		"strict": true,
-		"target": "esnext"
-	},
-	"include": [
-		"src/*.ts"
-	],
-	"exclude": [
-		"src/*test.ts"
-	]
+  "compilerOptions": {
+    "declaration": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "out",
+    "sourceMap": true,
+    "strict": true,
+    "target": "es2017"
+  },
+  "include": [
+    "src/*.ts"
+  ],
+  "exclude": [
+    "src/*test.ts"
+  ]
 }