Allow instanceof.js and writableProperties.js to be run when located outside the git clone

Author: cjbj

test/instanceof.js

@@ -35,62 +35,15 @@ var oracledb = require('oracledb');
 var should   = require('should');
 var dbConfig = require('./dbconfig.js');
 
-try {
-  oracledbCLib =  require('../build/Release/oracledb');
-} catch (err) {
-  if (err.code === 'MODULE_NOT_FOUND') {
-    oracledbCLib = require('../build/Debug/oracledb');
-  } else {
-    throw err;
-  }
-}
-
 describe('45. instanceof.js', function() {
 
-  it('45.1 all constructors have been accounted for', function(done) {
-    var cLibKeysIdx;
-    var cLibKeys;
-    var instKeysIdx;
-    var instKeys;
-    var foundAllConstructors = true;
-
-    cLibKeys = Object.keys(oracledbCLib);
-    instKeys = Object.keys(oracledb);
-
-    cLibLoop:
-    for (cLibKeysIdx = 0; cLibKeysIdx < cLibKeys.length; cLibKeysIdx += 1) {
-      if (typeof oracledbCLib[cLibKeys[cLibKeysIdx]] !== 'function') {
-        continue cLibLoop;
-      }
-
-      for (instKeysIdx = 0; instKeysIdx < instKeys.length; instKeysIdx += 1) {
-        if (cLibKeys[cLibKeysIdx] === instKeys[instKeysIdx] ||
-          // The following exception is because the Lob class is documented as "Lob"
-          // so that's how it was exposed on the instance
-          cLibKeys[cLibKeysIdx] === 'ILob' && instKeys[instKeysIdx] === 'Lob'
-        ) {
-          continue cLibLoop;
-        }
-      }
-
-      foundAllConstructors = false;
-      console.log('Failed to account for ' + cLibKeys[cLibKeysIdx]);
-
-      break cLibLoop;
-    }
-
-    foundAllConstructors.should.be.true;
-
-    done();
-  });
-
-  it('45.2 instanceof works for the oracledb instance', function(done) {
+  it('45.1 instanceof works for the oracledb instance', function(done) {
     (oracledb instanceof oracledb.Oracledb).should.be.true;
 
     done();
   });
 
-  it('45.3 instanceof works for pool instances', function(done) {
+  it('45.2 instanceof works for pool instances', function(done) {
     oracledb.createPool(
       {
         externalAuth    : dbConfig.externalAuth,
@@ -115,7 +68,7 @@ describe('45. instanceof.js', function() {
     );
   });
 
-  it('45.4 instanceof works for connection instances', function(done) {
+  it('45.3 instanceof works for connection instances', function(done) {
     oracledb.getConnection(dbConfig, function(err, conn) {
       should.not.exist(err);
 
@@ -129,7 +82,7 @@ describe('45. instanceof.js', function() {
     });
   });
 
-  it('45.5 instanceof works for resultset instances', function(done) {
+  it('45.4 instanceof works for resultset instances', function(done) {
     oracledb.getConnection(dbConfig, function(err, conn) {
       should.not.exist(err);
 
@@ -158,7 +111,7 @@ describe('45. instanceof.js', function() {
     });
   });
 
-  it('45.6 instanceof works for lob instances', function(done) {
+  it('45.5 instanceof works for lob instances', function(done) {
     oracledb.getConnection(dbConfig, function(err, conn) {
       should.not.exist(err);
 

test/list.txt

@@ -528,12 +528,11 @@ Overview of node-oracledb functional tests
   - 44.8 maxSize option applies to each elements of an array
 
 45. instanceof.js
-    45.1 all constructors have been accounted for
-    45.2 instanceof works for the oracledb instance
-    45.3 instanceof works for pool instances
-    45.4 instanceof works for connection instances
-    45.5 instanceof works for resultset instances
-    45.6 instanceof works for lob instances
+    45.1 instanceof works for the oracledb instance
+    45.2 instanceof works for pool instances
+    45.3 instanceof works for connection instances
+    45.4 instanceof works for resultset instances
+    45.5 instanceof works for lob instances
 
 51. accessTerminatedPoolAttributes.js
     can not access attributes of terminated pool
@@ -667,8 +666,7 @@ Overview of node-oracledb functional tests
     65.1 an uninitialized Lob is returned from a PL/SQL block
 
 66. writableProperties.js
-    66.1 allows overwriting of public methods on the oracledb instance
-    66.2 allows overwriting of public methods on pool instances
-    66.3 allows overwriting of public methods on connection instances
-    66.4 allows overwriting of public methods on resultset instances
-    66.5 allows overwriting of public methods on lob instances
+    66.1 allows overwriting of public methods on pool instances
+    66.2 allows overwriting of public methods on connection instances
+    66.3 allows overwriting of public methods on resultset instances
+    66.4 allows overwriting of public methods on lob instances

test/writableProperties.js

@@ -23,48 +23,9 @@ var oracledb = require('oracledb');
 var should   = require('should');
 var dbConfig = require('./dbconfig.js');
 
-try {
-  oracledbCLib =  require('../build/Release/oracledb');
-} catch (err) {
-  if (err.code === 'MODULE_NOT_FOUND') {
-    oracledbCLib = require('../build/Debug/oracledb');
-  } else {
-    throw err;
-  }
-}
-
 describe('66. writeableProperties.js', function() {
-  it('66.1 allows overwriting of public methods on the oracledb instance', function(done) {
-    var keys = Object.keys(oracledb);
-    var keysIdx;
-    var originalFunction;
-
-    function isConstructorFunction(name) {
-      // The following has an exception for ILob, which was documented and
-      // exposed on oracledb as Lob
-      return typeof oracledbCLib[name] === 'function' || name === 'Lob';
-    }
-
-    for (keysIdx = 0; keysIdx < keys.length; keysIdx += 1) {
-      if (typeof oracledb[keys[keysIdx]] === 'function' &&
-        !isConstructorFunction(keys[keysIdx]) // skip constructor functions from the C layer
-      ) {
-        try {
-          originalFunction = oracledb[keys[keysIdx]];
-
-          oracledb[keys[keysIdx]] = function() {};
-
-          oracledb[keys[keysIdx]] = originalFunction;
-        } catch (err) {
-          should.not.exist(err);
-        }
-      }
-    }
-
-    done();
-  });
 
-  it('66.2 allows overwriting of public methods on pool instances', function(done) {
+  it('66.1 allows overwriting of public methods on pool instances', function(done) {
     oracledb.createPool(
       {
         externalAuth      : dbConfig.externalAuth,
@@ -107,7 +68,7 @@ describe('66. writeableProperties.js', function() {
     );
   });
 
-  it('66.3 allows overwriting of public methods on connection instances', function(done) {
+  it('66.2 allows overwriting of public methods on connection instances', function(done) {
     oracledb.getConnection(dbConfig, function(err, conn) {
       var keys;
       var keysIdx;
@@ -139,7 +100,7 @@ describe('66. writeableProperties.js', function() {
     });
   });
 
-  it('66.4 allows overwriting of public methods on resultset instances', function(done) {
+  it('66.3 allows overwriting of public methods on resultset instances', function(done) {
     oracledb.getConnection(dbConfig, function(err, conn) {
       should.not.exist(err);
 
@@ -186,7 +147,7 @@ describe('66. writeableProperties.js', function() {
     });
   });
 
-  it('66.5 allows overwriting of public methods on lob instances', function(done) {
+  it('66.4 allows overwriting of public methods on lob instances', function(done) {
     oracledb.getConnection(dbConfig, function(err, conn) {
       should.not.exist(err);