Refactor test/main

Author: calebsander

test/main.ts

@@ -1,72 +1,68 @@
+#!/usr/bin/env node
+
 import * as fs from 'fs'
 import {promisify} from 'util'
 
+let passed = 0, total = 0, asyncErrors = 0
+function success() {
+	passed++
+}
+process
+	.on('uncaughtException', err => {
+		console.error('Error occurred in async test:')
+		console.error(err)
+		asyncErrors++
+	})
+	.on('exit', _ => {
+		console.log(
+			String(passed) +
+			' tests out of ' +
+			String(total) +
+			' passed (' +
+			Math.round(passed / total * 100) +
+			'%)'
+		)
+		process.exitCode = (total - passed) + asyncErrors
+	})
 promisify(fs.readdir)(__dirname)
 	.then(testSuites => {
-		let passed = 0
-		let total = 0
-		let asyncErrors = 0
-		function success() {
-			passed++
-		}
-		function testFile(dir: string, test: string) {
+		function testFile(dir: string, test: string): Promise<void> {
 			const file = dir + '/' + test
 			total++
 			function error(err: Error) {
-				console.error('Error in test file ' + file)
+				console.error('Error in test file', file)
 				console.error(err)
 			}
 			let runTest: Promise<void> | (() => void)
 			try { runTest = require(file) }
 			catch (e) {
 				error(e)
-				return
+				return Promise.resolve()
 			}
 			if (runTest instanceof Promise) {
-				runTest
-					.then(success)
-					.catch(error)
+				return runTest.then(success, error)
 			}
 			else {
 				try {
 					runTest()
 					success()
 				}
 				catch (e) { error(e) }
+				return Promise.resolve()
 			}
 		}
-		Promise.all(
+		return Promise.all(
 			testSuites
 				.filter(suite => !suite.includes('.'))
 				.map(testSuite => {
 					const dir = __dirname + '/' + testSuite
 					return promisify(fs.readdir)(dir)
-						.then(tests => {
-							for (const test of tests.filter(test => test.endsWith('.ts'))) {
-								testFile(dir, test.replace('.ts', '.js'))
-							}
-						})
-						.catch(err => {})
+						.then(tests => Promise.all(tests
+							.filter(test => test.endsWith('.ts'))
+							.map(test => testFile(dir, test.replace('.ts', '.js')))
+						))
+						.catch(err => { throw err })
 					})
 		)
-		process
-			.on('exit', () => {
-				console.log(
-					String(passed) +
-					' tests out of ' +
-					String(total) +
-					' passed (' +
-					Math.round(passed / total * 100) +
-					'%)'
-				)
-				process.exitCode = (total - passed) + asyncErrors
-			})
-			.on('uncaughtException', err => {
-				console.error('Error occurred in async test:')
-				console.log(err)
-				asyncErrors++
-			})
 	})
-	.catch(err => {
-		throw err
-	})
+	.catch(err => { throw err })