Added more tests

Author: cemremengu

plugin.js

@@ -28,13 +28,13 @@ function decorateFastifyInstance (pool, fastify, options, next) {
     }
 
     if (fastify.oracle[options.name]) {
-      return next(new Error('Connection name has already been registered: ' + options.name))
+      return next(Error('fastify-oracle: connection name "' + options.name + '" has already been registered'))
     }
 
     fastify.oracle[options.name] = oracle
   } else {
     if (fastify.oracle) {
-      return next(new Error('fastify-oracle has already been registered'))
+      return next(Error('fastify-oracle has already been registered'))
     } else {
       fastify.decorate('oracle', Object.assign(oracle, { db: oracledb }))
     }
@@ -47,24 +47,30 @@ function decorateFastifyInstance (pool, fastify, options, next) {
 
 function fastifyOracleDB (fastify, options, next) {
   if (options.client) {
-    if (oracledb.Pool.prototype.isPrototypeOf(options.client) === false) {
-      return next(Error('supplied client must be an instance of oracledb.pool'))
+    if (oracledb.Pool.prototype.isPrototypeOf(options.client)) {
+      return decorateFastifyInstance(options.client, fastify, options, next)
+    } else {
+      return next(Error('fastify-oracle: supplied client must be an instance of oracledb.pool'))
     }
-    return decorateFastifyInstance(options.client, fastify, options, next)
   }
 
   if (options.poolAlias) {
-    const pool = oracledb.getPool(options.poolAlias)
-    if (!pool) return next(Error('could not get default pool from oracledb instance'))
-    return decorateFastifyInstance(pool, fastify, options, next)
+    try {
+      const pool = oracledb.getPool(options.poolAlias) // synchronous, throws error
+      return decorateFastifyInstance(pool, fastify, options, next)
+    } catch (err) {
+      return next(Error('fastify-oracle: could not get pool alias' + '-' + err.message))
+    }
   }
 
   if (!options.pool) {
-    return next(Error('must supply options.pool oracledb pool options'))
+    return next(Error('fastify-oracle: must supply options.pool oracledb pool options'))
   }
 
   oracledb.createPool(options.pool, (err, pool) => {
-    if (err) return next(err)
+    if (err) {
+      return next(Error('fastify-oracle: failed to create pool' + '-' + err.message))
+    }
     return decorateFastifyInstance(pool, fastify, options, next)
   })
 }

test/client.test.js

@@ -3,6 +3,7 @@
 const test = require('tap').test
 const oracledb = require('oracledb')
 const plugin = require('../plugin')
+const Fastify = require('fastify')
 
 test('accepts singleton client', (t) => {
   t.plan(5)
@@ -60,3 +61,15 @@ test('retrieves a cached pool', (t) => {
     })
   })
 })
+
+test('client must be instance of oracledb.pool', (t) => {
+  t.plan(1)
+
+  const fastify = Fastify()
+
+  fastify.register(plugin, { client: 'hello world' })
+
+  fastify.ready(err => {
+    t.is(err.message, 'fastify-oracle: supplied client must be an instance of oracledb.pool')
+  })
+})

test/pool.test.js

@@ -106,6 +106,61 @@ test('duplicate connection names should throw', (t) => {
     .register(plugin, { pool: opts, name: 'testdb' })
 
   fastify.ready(err => {
-    t.is(err.message, 'Connection name has already been registered: testdb')
+    t.is(err.message, 'fastify-oracle: connection name "testdb" has already been registered')
+  })
+})
+
+test('duplicate plugin registration should throw', (t) => {
+  t.plan(1)
+
+  const fastify = Fastify()
+
+  const opts = {
+    user: 'travis',
+    password: 'travis',
+    connectString: 'localhost/xe'
+  }
+
+  fastify
+    .register(plugin, { pool: opts })
+    .register(plugin, { pool: opts })
+
+  fastify.ready(err => {
+    t.is(err.message, 'fastify-oracle has already been registered')
+  })
+})
+
+test('should throw if no pool option is provided', (t) => {
+  t.plan(1)
+
+  const fastify = Fastify()
+
+  fastify.register(plugin, {})
+  fastify.ready(err => {
+    t.is(err.message, 'fastify-oracle: must supply options.pool oracledb pool options')
+  })
+})
+
+test('should throw if could not get pool alias', (t) => {
+  t.plan(1)
+
+  const fastify = Fastify()
+
+  fastify.register(plugin, { poolAlias: 'test' })
+
+  fastify.ready(err => {
+    t.match(err.message, 'fastify-oracle: could not get pool alias')
+  })
+})
+
+test('should throw if pool cannot be created', (t) => {
+  t.plan(1)
+
+  const fastify = Fastify()
+
+  fastify.register(plugin, { pool: { poolMin: -5 } })
+
+  fastify.ready(err => {
+    t.match(err.message, 'fastify-oracle: failed to create pool')
   })
 })