Merge pull request brianc#2221 from sehrope/misc-test-cleanup

charmander · web-flow · commit ff302b10cea2 · 2020-05-17T18:12:07.000Z
Test require clean up and refactoring to remove BufferList global
diff --git a/packages/pg/test/buffer-list.js b/packages/pg/test/buffer-list.js
@@ -1,5 +1,6 @@
 'use strict'
-global.BufferList = function () {
+
+const BufferList = function () {
   this.buffers = []
 }
 var p = BufferList.prototype
diff --git a/packages/pg/test/cli.js b/packages/pg/test/cli.js
@@ -1,5 +1,5 @@
 'use strict'
-var ConnectionParameters = require(__dirname + '/../lib/connection-parameters')
+var ConnectionParameters = require('../lib/connection-parameters')
 var config = new ConnectionParameters(process.argv[2])
 
 for (var i = 0; i < process.argv.length; i++) {
diff --git a/packages/pg/test/integration/client/api-tests.js b/packages/pg/test/integration/client/api-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var pg = helper.pg
 
 var suite = new helper.Suite()
diff --git a/packages/pg/test/integration/client/appname-tests.js b/packages/pg/test/integration/client/appname-tests.js
@@ -71,7 +71,7 @@ suite.test('application_name has precedence over fallback_application_name', fun
 
 suite.test('application_name from connection string', function (done) {
   var appName = 'my app'
-  var conParams = require(__dirname + '/../../../lib/connection-parameters')
+  var conParams = require('../../../lib/connection-parameters')
   var conf
   if (process.argv[2]) {
     conf = new conParams(process.argv[2] + '?application_name=' + appName)
diff --git a/packages/pg/test/integration/client/array-tests.js b/packages/pg/test/integration/client/array-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var pg = helper.pg
 
 var suite = new helper.Suite()
diff --git a/packages/pg/test/integration/client/query-as-promise-tests.js b/packages/pg/test/integration/client/query-as-promise-tests.js
@@ -1,6 +1,6 @@
 'use strict'
 var bluebird = require('bluebird')
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var pg = helper.pg
 
 process.on('unhandledRejection', function (e) {
diff --git a/packages/pg/test/integration/client/query-column-names-tests.js b/packages/pg/test/integration/client/query-column-names-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var pg = helper.pg
 
 new helper.Suite().test('support for complex column names', function () {
diff --git a/packages/pg/test/integration/client/ssl-tests.js b/packages/pg/test/integration/client/ssl-tests.js
@@ -1,6 +1,6 @@
 'use strict'
-var pg = require(__dirname + '/../../../lib')
-var config = require(__dirname + '/test-helper').config
+var pg = require('../../../lib')
+var config = require('./test-helper').config
 test('can connect with ssl', function () {
   return false
   config.ssl = {
diff --git a/packages/pg/test/integration/client/type-coercion-tests.js b/packages/pg/test/integration/client/type-coercion-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var pg = helper.pg
 var sink
 const suite = new helper.Suite()
diff --git a/packages/pg/test/integration/connection/bound-command-tests.js b/packages/pg/test/integration/connection/bound-command-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 // http://developer.postgresql.org/pgdocs/postgres/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY
 
 test('flushing once', function () {
diff --git a/packages/pg/test/integration/connection/copy-tests.js b/packages/pg/test/integration/connection/copy-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var assert = require('assert')
 
 test('COPY FROM events check', function () {
diff --git a/packages/pg/test/integration/connection/notification-tests.js b/packages/pg/test/integration/connection/notification-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 // http://www.postgresql.org/docs/8.3/static/libpq-notify.html
 test('recieves notification from same connection with no payload', function () {
   helper.connect(function (con) {
diff --git a/packages/pg/test/integration/connection/query-tests.js b/packages/pg/test/integration/connection/query-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var assert = require('assert')
 
 var rows = []
diff --git a/packages/pg/test/integration/connection/test-helper.js b/packages/pg/test/integration/connection/test-helper.js
@@ -1,8 +1,8 @@
 'use strict'
 var net = require('net')
-var helper = require(__dirname + '/../test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
-var utils = require(__dirname + '/../../../lib/utils')
+var helper = require('../test-helper')
+var Connection = require('../../../lib/connection')
+var utils = require('../../../lib/utils')
 var connect = function (callback) {
   var username = helper.args.user
   var database = helper.args.database
diff --git a/packages/pg/test/integration/gh-issues/130-tests.js b/packages/pg/test/integration/gh-issues/130-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var exec = require('child_process').exec
 
 helper.pg.defaults.poolIdleTimeout = 1000
diff --git a/packages/pg/test/integration/gh-issues/507-tests.js b/packages/pg/test/integration/gh-issues/507-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var pg = helper.pg
 
 new helper.Suite().test('parsing array results', function (cb) {
diff --git a/packages/pg/test/native/stress-tests.js b/packages/pg/test/native/stress-tests.js
@@ -1,6 +1,6 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
-var Client = require(__dirname + '/../../lib/native')
+var helper = require('../test-helper')
+var Client = require('../../lib/native')
 var Query = Client.Query
 
 test('many rows', function () {
diff --git a/packages/pg/test/test-buffers.js b/packages/pg/test/test-buffers.js
@@ -1,5 +1,6 @@
 'use strict'
-require(__dirname + '/test-helper')
+require('./test-helper')
+const BufferList = require('./buffer-list')
 // http://developer.postgresql.org/pgdocs/postgres/protocol-message-formats.html
 
 var buffers = {}
diff --git a/packages/pg/test/test-helper.js b/packages/pg/test/test-helper.js
@@ -1,15 +1,11 @@
 'use strict'
 // make assert a global...
 global.assert = require('assert')
-var EventEmitter = require('events').EventEmitter
 var sys = require('util')
 
-var BufferList = require('./buffer-list')
 const Suite = require('./suite')
 const args = require('./cli')
 
-var Connection = require('./../lib/connection')
-
 global.Client = require('./../lib').Client
 
 process.on('uncaughtException', function (d) {
@@ -171,12 +167,6 @@ assert.isNull = function (item, message) {
   assert.ok(item === null, message)
 }
 
-const getMode = () => {
-  if (args.native) return 'native'
-  if (args.binary) return 'binary'
-  return ''
-}
-
 global.test = function (name, action) {
   test.testCount++
   test[name] = action
@@ -203,8 +193,6 @@ process.on('uncaughtException', function (err) {
   process.exit(255)
 })
 
-var count = 0
-
 var Sink = function (expected, timeout, callback) {
   var defaultTimeout = 5000
   if (typeof timeout === 'function') {
diff --git a/packages/pg/test/unit/client/configuration-tests.js b/packages/pg/test/unit/client/configuration-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-require(__dirname + '/test-helper')
+require('./test-helper')
 var assert = require('assert')
 
 var pguser = process.env['PGUSER'] || process.env.USER
diff --git a/packages/pg/test/unit/client/escape-tests.js b/packages/pg/test/unit/client/escape-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 
 function createClient(callback) {
   var client = new Client(helper.config)
diff --git a/packages/pg/test/unit/client/md5-password-tests.js b/packages/pg/test/unit/client/md5-password-tests.js
@@ -1,5 +1,6 @@
 'use strict'
 var helper = require('./test-helper')
+const BufferList = require('../../buffer-list')
 var utils = require('../../../lib/utils')
 
 test('md5 authentication', function () {
diff --git a/packages/pg/test/unit/client/notification-tests.js b/packages/pg/test/unit/client/notification-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 
 test('passes connection notification', function () {
   var client = helper.client()
diff --git a/packages/pg/test/unit/client/query-queue-tests.js b/packages/pg/test/unit/client/query-queue-tests.js
@@ -1,6 +1,6 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
+var helper = require('./test-helper')
+var Connection = require('../../../lib/connection')
 
 test('drain', function () {
   var con = new Connection({ stream: 'NO' })
diff --git a/packages/pg/test/unit/client/result-metadata-tests.js b/packages/pg/test/unit/client/result-metadata-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 
 var testForTag = function (tagText, callback) {
   test('includes command tag data for tag ' + tagText, function () {
diff --git a/packages/pg/test/unit/client/simple-query-tests.js b/packages/pg/test/unit/client/simple-query-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var Query = require('../../../lib/query')
 
 test('executing query', function () {
diff --git a/packages/pg/test/unit/client/stream-and-query-error-interaction-tests.js b/packages/pg/test/unit/client/stream-and-query-error-interaction-tests.js
@@ -1,7 +1,7 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
-var Client = require(__dirname + '/../../../lib/client')
+var helper = require('./test-helper')
+var Connection = require('../../../lib/connection')
+var Client = require('../../../lib/client')
 
 test('emits end when not in query', function () {
   var stream = new (require('events').EventEmitter)()
diff --git a/packages/pg/test/unit/connection-parameters/creation-tests.js b/packages/pg/test/unit/connection-parameters/creation-tests.js
@@ -1,8 +1,8 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var assert = require('assert')
-var ConnectionParameters = require(__dirname + '/../../../lib/connection-parameters')
-var defaults = require(__dirname + '/../../../lib').defaults
+var ConnectionParameters = require('../../../lib/connection-parameters')
+var defaults = require('../../../lib').defaults
 
 // clear process.env
 for (var key in process.env) {
diff --git a/packages/pg/test/unit/connection-parameters/environment-variable-tests.js b/packages/pg/test/unit/connection-parameters/environment-variable-tests.js
@@ -1,10 +1,10 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 const Suite = require('../../suite')
 
 var assert = require('assert')
-var ConnectionParameters = require(__dirname + '/../../../lib/connection-parameters')
-var defaults = require(__dirname + '/../../../lib').defaults
+var ConnectionParameters = require('../../../lib/connection-parameters')
+var defaults = require('../../../lib').defaults
 
 // clear process.env
 var realEnv = {}
diff --git a/packages/pg/test/unit/connection/error-tests.js b/packages/pg/test/unit/connection/error-tests.js
@@ -1,6 +1,6 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
+var helper = require('./test-helper')
+var Connection = require('../../../lib/connection')
 var net = require('net')
 
 const suite = new helper.Suite()
diff --git a/packages/pg/test/unit/connection/inbound-parser-tests.js b/packages/pg/test/unit/connection/inbound-parser-tests.js
@@ -1,7 +1,8 @@
 'use strict'
-require(__dirname + '/test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
-var buffers = require(__dirname + '/../../test-buffers')
+require('./test-helper')
+const BufferList = require('../../buffer-list')
+var Connection = require('../../../lib/connection')
+var buffers = require('../../test-buffers')
 var PARSE = function (buffer) {
   return new Parser(buffer).parse()
 }
diff --git a/packages/pg/test/unit/connection/startup-tests.js b/packages/pg/test/unit/connection/startup-tests.js
@@ -1,6 +1,6 @@
 'use strict'
-require(__dirname + '/test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
+require('./test-helper')
+var Connection = require('../../../lib/connection')
 test('connection can take existing stream', function () {
   var stream = new MemoryStream()
   var con = new Connection({ stream: stream })
diff --git a/packages/pg/test/unit/connection/test-helper.js b/packages/pg/test/unit/connection/test-helper.js
@@ -1,2 +1,2 @@
 'use strict'
-module.exports = require(__dirname + '/../test-helper')
+module.exports = require('../test-helper')

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`'use strict'`
`2`		`-global.BufferList = function () {`
	`2`	`+`
	`3`	`+const BufferList = function () {`
`3`	`4`	`this.buffers = []`
`4`	`5`	`}`
`5`	`6`	`var p = BufferList.prototype`