Run shared test from both v3 and v4 of juggler

.eslintignore

@@ -0,0 +1 @@
+**/node_modules/

deps/juggler-v3/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "juggler-v3",
+  "version": "3.0.0",
+  "dependencies": {
+    "loopback-datasource-juggler": "3.x",
+    "should": "^13.2.3"
+  }
+}

deps/juggler-v3/test.js

@@ -0,0 +1,32 @@
+// Copyright IBM Corp. 2020. All Rights Reserved.
+// Node module: loopback-connector-dashdb
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+'use strict';
+
+const should = require('should');
+const juggler = require('loopback-datasource-juggler');
+
+require('../../test/init');
+
+describe('dashdb imported feature v3', function() {
+  before(function() {
+    return global.resetDataSourceClass(juggler.DataSource);
+  });
+
+  after(function() {
+    return global.resetDataSourceClass();
+  });
+
+  require('loopback-datasource-juggler/test/common.batch.js');
+  require('loopback-datasource-juggler/test/include.test.js');
+
+  /* TODO: run persistence-hooks test suite too
+  const suite = require("loopback-datasource-juggler/test/persistence-hooks.suite.js");
+  const customConfig = Object.assign({}, global.config);
+  suite(global.getDataSource(customConfig, juggler.DataSource), should, {
+    replaceOrCreateReportsNewInstance: false
+  });
+  */
+});

deps/juggler-v4/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "juggler-v4",
+  "version": "4.0.0",
+  "dependencies": {
+    "loopback-datasource-juggler": "4.x",
+    "should": "^13.2.3"
+  }
+}

deps/juggler-v4/test.js

@@ -0,0 +1,32 @@
+// Copyright IBM Corp. 2020. All Rights Reserved.
+// Node module: loopback-connector-dashdb
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+'use strict';
+
+const should = require('should');
+const juggler = require('loopback-datasource-juggler');
+
+require('../../test/init');
+
+describe('dashdb imported feature v4', function() {
+  before(function() {
+    return global.resetDataSourceClass(juggler.DataSource);
+  });
+
+  after(function() {
+    return global.resetDataSourceClass();
+  });
+
+  require('loopback-datasource-juggler/test/common.batch.js');
+  require('loopback-datasource-juggler/test/include.test.js');
+
+  /* TODO: run persistence-hooks test suite too
+  const suite = require("loopback-datasource-juggler/test/persistence-hooks.suite.js");
+  const customConfig = Object.assign({}, global.config);
+  suite(global.getDataSource(customConfig, juggler.DataSource), should, {
+    replaceOrCreateReportsNewInstance: false
+  });
+  */
+});

package.json

@@ -18,7 +18,7 @@
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "pretest": "node pretest.js",
-    "test": "mocha --timeout 20000 --require test/init.js",
+    "test": "mocha --timeout 60000 --require test/init.js test/*.test.js node_modules/juggler-v3/test.js node_modules/juggler-v4/test.js",
     "posttest": "npm run lint"
   },
   "dependencies": {
@@ -30,10 +30,12 @@
   },
   "devDependencies": {
     "bluebird": "^3.5.1",
-    "eslint": "^6.1.0",
+    "eslint": "^6.8.0",
     "eslint-config-loopback": "^13.1.0",
+    "juggler-v3": "file:./deps/juggler-v3",
+    "juggler-v4": "file:./deps/juggler-v4",
+    "loopback-datasource-juggler": "^3.0.0 || ^4.0.0",
     "lodash": "^4.17.10",
-    "loopback-datasource-juggler": "^3.23.0",
     "mocha": "^6.2.0",
     "ms": "^2.1.1",
     "rc": "^1.2.8",

test/init.js

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2016,2019. All Rights Reserved.
+// Copyright IBM Corp. 2016,2020. All Rights Reserved.
 // Node module: loopback-connector-dashdb
 // This file is licensed under the Artistic License 2.0.
 // License text available at https://opensource.org/licenses/Artistic-2.0
@@ -7,9 +7,11 @@
 
 module.exports = require('should');
 
-const DataSource = require('loopback-datasource-juggler').DataSource;
+const Connector = require('../');
+const juggler = require('loopback-datasource-juggler');
+let DataSource = juggler.DataSource;
 
-let schemaName;
+let schemaName, db;
 
 /** these are the env variables in jenkins **/
 if (process.env.CI && process.env.PACKAGE_NAME &&
@@ -35,10 +37,20 @@ const config = {
 global.config = config;
 
 global.getDataSource = global.getSchema = function(options) {
-  const db = new DataSource(require('../'), config);
+  db = new DataSource(Connector, global.config);
+  db.log = function(a) {
+    console.log(a);
+  };
   return db;
 };
 
+global.resetDataSourceClass = function(ctor) {
+  DataSource = ctor || juggler.DataSource;
+  const promise = db ? db.disconnect() : Promise.resolve();
+  db = undefined;
+  return promise;
+};
+
 global.connectorCapabilities = {
   ilike: false,
   nilike: false,