Modified code for node SDK integration testing

Modified code for node SDK integration testing

Author: silpidhua

package.json

@@ -36,13 +36,13 @@
   "dependencies": {
     "@types/node": "^12.12.34",
     "extend": "^3.0.2",
-    "ibm-cloud-sdk-core": "^2.3.0",
-    "jest": "^25.2.7"
+    "ibm-cloud-sdk-core": "^2.11.3",
+    "jest": "^25.5.4"
   },
   "devDependencies": {
     "@semantic-release/changelog": "^3.0.4",
     "@semantic-release/git": "^7.0.12",
-    "axios": "^0.19.0",
+    "axios": "^0.21.1",
     "codecov": "^3.5.0",
     "eslint": "^5.16.0",
     "eslint-config-google": "^0.12.0",

test/integration/ibm-analytics-engine-api.v3.test.js

@@ -18,31 +18,34 @@
 'use strict';
 const IbmAnalyticsEngineApiV3 = require('../../dist/ibm-analytics-engine-api/v3');
 const { readExternalSources } = require('ibm-cloud-sdk-core');
-const authHelper = require('../resources/auth-helper.js');
-const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
+// const authHelper = require('../resources/auth-helper.js');
+const authHelper = require('../resources/auth.js');
+// const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 // testcase timeout value (200s).
 const timeout = 200000;
-
+const { IamAuthenticator } = require('../../dist/auth');
 // Location of our config file.
-const configFile = 'ibm_analytics_engine_api_v3.env';
+// const configFile = 'ibm_analytics_engine_api_v3.env';
 
-//describe = authHelper.prepareTests(configFile);
+// describe = authHelper.prepareTests(configFile);
 
 describe('IbmAnalyticsEngineApiV3_integration', () => {
-  const ibmAnalyticsEngineApiService = IbmAnalyticsEngineApiV3.newInstance({});
+  const options = authHelper.ibm_analytics_engine_api_v3;
+  options.authenticator = new IamAuthenticator({ apikey: options.apikey });
+  const instanceGuid = options.instance_guid;
+  let applicationId = '';
+  const ibmAnalyticsEngineApiService = IbmAnalyticsEngineApiV3.newInstance(options);
 
   expect(ibmAnalyticsEngineApiService).not.toBeNull();
 
   const config = readExternalSources(IbmAnalyticsEngineApiV3.DEFAULT_SERVICE_NAME);
   expect(config).not.toBeNull();
 
   jest.setTimeout(timeout);
-
   test('getInstanceById()', async () => {
     const params = {
-      instanceId: 'testString',
+      instanceId: instanceGuid,
     };
-
     const res = await ibmAnalyticsEngineApiService.getInstanceById(params);
     expect(res).toBeDefined();
     expect(res.result).toBeDefined();
@@ -52,25 +55,23 @@ describe('IbmAnalyticsEngineApiV3_integration', () => {
 
     // ApplicationRequestApplicationDetails
     const applicationRequestApplicationDetailsModel = {
-      application: 'testString',
-      class: 'testString',
-      application_arguments: ['testString'],
-      conf: { 'key1': 'testString' },
-      env: { 'key1': 'testString' },
+      application: '/opt/ibm/spark/examples/src/main/python/wordcount.py',
+      application_arguments: ['/opt/ibm/spark/examples/src/main/resources/people.txt'],
     };
 
     const params = {
-      instanceId: 'testString',
+      instanceId: instanceGuid,
       applicationDetails: applicationRequestApplicationDetailsModel,
     };
 
     const res = await ibmAnalyticsEngineApiService.createApplication(params);
+    applicationId = res.result.application_id;
     expect(res).toBeDefined();
     expect(res.result).toBeDefined();
   });
   test('getApplications()', async () => {
     const params = {
-      instanceId: 'testString',
+      instanceId: instanceGuid,
     };
 
     const res = await ibmAnalyticsEngineApiService.getApplications(params);
@@ -79,8 +80,8 @@ describe('IbmAnalyticsEngineApiV3_integration', () => {
   });
   test('getApplicationById()', async () => {
     const params = {
-      instanceId: 'testString',
-      applicationId: 'testString',
+      instanceId: instanceGuid,
+      applicationId: applicationId,
     };
 
     const res = await ibmAnalyticsEngineApiService.getApplicationById(params);
@@ -89,8 +90,8 @@ describe('IbmAnalyticsEngineApiV3_integration', () => {
   });
   test('getApplicationState()', async () => {
     const params = {
-      instanceId: 'testString',
-      applicationId: 'testString',
+      instanceId: instanceGuid,
+      applicationId: applicationId,
     };
 
     const res = await ibmAnalyticsEngineApiService.getApplicationState(params);
@@ -99,8 +100,8 @@ describe('IbmAnalyticsEngineApiV3_integration', () => {
   });
   test('deleteApplicationById()', async () => {
     const params = {
-      instanceId: 'testString',
-      applicationId: 'testString',
+      instanceId: instanceGuid,
+      applicationId: applicationId,
     };
 
     const res = await ibmAnalyticsEngineApiService.deleteApplicationById(params);

test/resources/auth.example.js

@@ -16,15 +16,14 @@
 
 'use strict';
 
-const testingHeaders = {
-  // any headers desired for testing (like opting out of analytics)
-};
+// const testingHeaders = {
+//   // any headers desired for testing (like opting out of analytics)
+// };
 
 module.exports = {
   ibm_analytics_engine_api_v2: {
     serviceUrl: '',
     apikey: '',
-    instance_guid:''
+    instance_guid: '',
   },
 };
-

test/unit/ibm-analytics-engine-api.v3.test.js

@@ -21,12 +21,7 @@ const { NoAuthAuthenticator, unitTestUtils } = core;
 
 const IbmAnalyticsEngineApiV3 = require('../../dist/ibm-analytics-engine-api/v3');
 
-const {
-  getOptions,
-  checkUrlAndMethod,
-  checkMediaHeaders,
-  expectToBePromise,
-} = unitTestUtils;
+const { getOptions, checkUrlAndMethod, checkMediaHeaders, expectToBePromise } = unitTestUtils;
 
 const service = {
   authenticator: new NoAuthAuthenticator(),
@@ -55,7 +50,9 @@ describe('IbmAnalyticsEngineApiV3', () => {
 
       expect(getAuthenticatorMock).toHaveBeenCalled();
       expect(testInstance.baseOptions.authenticator).toBeInstanceOf(NoAuthAuthenticator);
-      expect(testInstance.baseOptions.serviceName).toBe(IbmAnalyticsEngineApiV3.DEFAULT_SERVICE_NAME);
+      expect(testInstance.baseOptions.serviceName).toBe(
+        IbmAnalyticsEngineApiV3.DEFAULT_SERVICE_NAME
+      );
       expect(testInstance.baseOptions.serviceUrl).toBe(IbmAnalyticsEngineApiV3.DEFAULT_SERVICE_URL);
       expect(testInstance).toBeInstanceOf(IbmAnalyticsEngineApiV3);
     });
@@ -198,7 +195,11 @@ describe('IbmAnalyticsEngineApiV3', () => {
 
         const options = getOptions(createRequestMock);
 
-        checkUrlAndMethod(options, '/v3/analytics_engines/{instance_id}/spark/applications', 'POST');
+        checkUrlAndMethod(
+          options,
+          '/v3/analytics_engines/{instance_id}/spark/applications',
+          'POST'
+        );
         const expectedAccept = 'application/json';
         const expectedContentType = 'application/json';
         checkMediaHeaders(createRequestMock, expectedAccept, expectedContentType);
@@ -337,7 +338,11 @@ describe('IbmAnalyticsEngineApiV3', () => {
 
         const options = getOptions(createRequestMock);
 
-        checkUrlAndMethod(options, '/v3/analytics_engines/{instance_id}/spark/applications/{application_id}', 'GET');
+        checkUrlAndMethod(
+          options,
+          '/v3/analytics_engines/{instance_id}/spark/applications/{application_id}',
+          'GET'
+        );
         const expectedAccept = 'application/json';
         const expectedContentType = undefined;
         checkMediaHeaders(createRequestMock, expectedAccept, expectedContentType);
@@ -400,7 +405,9 @@ describe('IbmAnalyticsEngineApiV3', () => {
           applicationId: applicationId,
         };
 
-        const deleteApplicationByIdResult = ibmAnalyticsEngineApiService.deleteApplicationById(params);
+        const deleteApplicationByIdResult = ibmAnalyticsEngineApiService.deleteApplicationById(
+          params
+        );
 
         // all methods should return a Promise
         expectToBePromise(deleteApplicationByIdResult);
@@ -410,7 +417,11 @@ describe('IbmAnalyticsEngineApiV3', () => {
 
         const options = getOptions(createRequestMock);
 
-        checkUrlAndMethod(options, '/v3/analytics_engines/{instance_id}/spark/applications/{application_id}', 'DELETE');
+        checkUrlAndMethod(
+          options,
+          '/v3/analytics_engines/{instance_id}/spark/applications/{application_id}',
+          'DELETE'
+        );
         const expectedAccept = undefined;
         const expectedContentType = undefined;
         checkMediaHeaders(createRequestMock, expectedAccept, expectedContentType);
@@ -483,7 +494,11 @@ describe('IbmAnalyticsEngineApiV3', () => {
 
         const options = getOptions(createRequestMock);
 
-        checkUrlAndMethod(options, '/v3/analytics_engines/{instance_id}/spark/applications/{application_id}/state', 'GET');
+        checkUrlAndMethod(
+          options,
+          '/v3/analytics_engines/{instance_id}/spark/applications/{application_id}/state',
+          'GET'
+        );
         const expectedAccept = 'application/json';
         const expectedContentType = undefined;
         checkMediaHeaders(createRequestMock, expectedAccept, expectedContentType);

tsconfig.json

@@ -22,6 +22,6 @@
 
     /* Module Resolution Options */
     "moduleResolution": "node",               /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    "types": ["node", "extend"], /* Type declaration files to be included in compilation. */
+    "types": ["node", "jest"], /* Type declaration files to be included in compilation. */
   }
 }