Ensure soda tests all have soda* prefix

test/list.txt

@@ -4392,7 +4392,7 @@ oracledb.OUT_FORMAT_OBJECT and resultSet =  true
     185.8 Negative - unsubscribe nonexistent subscriptions
     185.9 Negative - unsubscribe the invalid subscription
 
-186. instanceof2.js
+186. sodaInstanceof.js
     186.1 instanceof checks for SODA classes
 
 187. plsqlBindList.js
@@ -4427,7 +4427,7 @@ oracledb.OUT_FORMAT_OBJECT and resultSet =  true
     188.9 Insert a string exceeds maximum lenght of RAW
     188.10 Insert null to RAW column then fetch it as string
 
-189. writableProperties2.js
+189. sodaOverwrite.js
     189.1 Allows overwriting of public methods on SodaDatabase instance
     189.2 Allows overwriting of public methods on SodaDocument instance
     189.3 Allows overwriting of public methods on SodaCollection instance

test/opts/.mocharc.yaml

@@ -176,10 +176,10 @@ spec:
   - test/dataTypeXML.js
   - test/deferLibInit.js
   - test/sessionTag.js
-  - test/instanceof2.js
+  - test/sodaInstanceof.js
   - test/plsqlBindList.js
   - test/fetchRawAsString.js
-  - test/writableProperties2.js
+  - test/sodaOverwrite.js
   - test/fetchBinaryTypesAsString.js
   - test/currentSchema.js
   - test/implicitResults.js

test/sodaInstanceof.js

@@ -16,7 +16,7 @@
  * limitations under the License.
  *
  * NAME
- *   186. instanceof2.js
+ *   186. sodaInstanceof.js
  *
  * DESCRIPTION
  *   The instanceof checks for SODA classes.
@@ -30,11 +30,21 @@ const dbConfig  = require('./dbconfig.js');
 const sodaUtil  = require('./sodaUtil.js');
 const testsUtil = require('./testsUtil.js');
 
-describe('186. instanceof2.js', function() {
+describe('186. sodaInstanceof.js', function() {
 
   before(async function() {
-    const runnable = await testsUtil.checkPrerequisites();
-    if (!runnable) {
+    let isSodaRunnable = await testsUtil.isSodaRunnable();
+
+    const clientVersion = oracledb.oracleClientVersion;
+    let isClientOK;
+    if (clientVersion < 2000000000) {
+      isClientOK = false;
+    } else {
+      isClientOK = true;
+    }
+
+    const isRunnable = isClientOK && isSodaRunnable;
+    if (!isRunnable) {
       this.skip();
       return;
     }

test/sodaOverwrite.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. */
 
 /******************************************************************************
  *
@@ -16,10 +16,10 @@
  * limitations under the License.
  *
  * NAME
- *   186. instanceof2.js
+ *   189. sodaOverwrite.js
  *
  * DESCRIPTION
- *   The instanceof checks for SODA classes.
+ *   Test overwriting of public methods on SodaDatabase instance
  *
  *****************************************************************************/
 'use strict';
@@ -30,16 +30,28 @@ const dbConfig  = require('./dbconfig.js');
 const sodaUtil  = require('./sodaUtil.js');
 const testsUtil = require('./testsUtil.js');
 
-describe('189. writableProperties2.js', function() {
+describe('189. sodaOverwrite.js', function() {
 
   let conn, sodaDocument, sodaDB, sodaCollection, sodaOperation, sodaCursor;
 
   before(async function() {
-    const runnable = await testsUtil.checkPrerequisites();
-    if (!runnable) {
+
+    let isSodaRunnable = await testsUtil.isSodaRunnable();
+
+    const clientVersion = oracledb.oracleClientVersion;
+    let isClientOK;
+    if (clientVersion < 2000000000) {
+      isClientOK = false;
+    } else {
+      isClientOK = true;
+    }
+
+    const isRunnable = isClientOK && isSodaRunnable;
+    if (!isRunnable) {
       this.skip();
       return;
     }
+
     await sodaUtil.cleanup();
 
     try {