SDC component upliftment of janusgraph version1.14.1

- Janusgraph version update from 0.3.3 to 0.5.0

Issue-ID: SDC-4717
Change-Id: Ib7f7c7f0113a854e119ff7bd32ce5ec34da1692f
Signed-off-by: Anamika Khantwal <anamika.khantwal@accenture.com>

3 files changed, 15 insertions, 16 deletions

diff --git a/openecomp-ui/test/softwareProduct/components/monitoring/test.js b/openecomp-ui/test/softwareProduct/components/monitoring/test.js
index 50fda91871..f7f690851e 100644
--- a/openecomp-ui/test/softwareProduct/components/monitoring/test.js
+++ b/openecomp-ui/test/softwareProduct/components/monitoring/test.js
@@ -34,25 +34,24 @@ describe('Software Product Components Monitoring Module Tests', function () {
 	});
 
 
-	it('Fetch for existing files - no files', done => {
-
+	it('Fetch for existing files - no files', (done) => {
 		let emptyResult = VSPComponentsMonitoringRestFactory.build();
-
-		mockRest.addHandler('fetch', ({ baseUrl}) => {
+	
+		mockRest.addHandler('fetch', ({ baseUrl }) => {
 			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/versions/${version.id}/components/${componentId}/uploads`);
 			return emptyResult;
 		});
-
-		return SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {softwareProductId, version, componentId}).then(() => {
-			var {softwareProduct: {softwareProductComponents: {monitoring}}} = store.getState();
+	
+		// Return the promise so Jest knows to wait for it
+		SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, { softwareProductId, version, componentId }).then(() => {
+			var { softwareProduct: { softwareProductComponents: { monitoring } } } = store.getState();
 			expect(monitoring[trap]).toEqual(emptyResult[trap]);
 			expect(monitoring[poll]).toEqual(emptyResult[poll]);
 			expect(monitoring[ves]).toEqual(emptyResult[ves]);
 			done();
 		});
-
-
 	});
+	
 
 	it('Fetch for existing files - only snmp trap file exists', done => {
 		let response = VSPComponentsMonitoringRestFactory.build({}, {createTrap: true});
@@ -62,7 +61,7 @@ describe('Software Product Components Monitoring Module Tests', function () {
 			return response;
 		});
 
-		return SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {softwareProductId, version, componentId}).then(() => {
+		SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {softwareProductId, version, componentId}).then(() => {
 
 			var {softwareProduct: {softwareProductComponents: {monitoring}}} = store.getState();
 			expect(monitoring[poll]).toEqual(undefined);
@@ -81,7 +80,7 @@ describe('Software Product Components Monitoring Module Tests', function () {
 			return response;
 		});
 
-		return SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {softwareProductId, version, componentId}).then(() => {
+		SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {softwareProductId, version, componentId}).then(() => {
 
 			var {softwareProduct: {softwareProductComponents: {monitoring}}} = store.getState();
 			expect(monitoring[trap]).toEqual(response[trap]);
@@ -101,7 +100,7 @@ describe('Software Product Components Monitoring Module Tests', function () {
 		let file = new Blob([JSON.stringify(debug, null, 2)], {type: 'application/json'});;
 		let formData = new FormData();
 		formData.append('upload', file);
-		return SoftwareProductComponentsMonitoringActionHelper.uploadFile(store.dispatch, {
+		SoftwareProductComponentsMonitoringActionHelper.uploadFile(store.dispatch, {
 			softwareProductId,
 			version,
 			componentId,
@@ -125,7 +124,7 @@ describe('Software Product Components Monitoring Module Tests', function () {
 		});
 
 
-		return SoftwareProductComponentsMonitoringActionHelper.deleteFile(store.dispatch, {
+		SoftwareProductComponentsMonitoringActionHelper.deleteFile(store.dispatch, {
 			softwareProductId,
 			version,
 			componentId,
diff --git a/openecomp-ui/test/softwareProduct/dependencies/SoftwareProductDependencies.test.js b/openecomp-ui/test/softwareProduct/dependencies/SoftwareProductDependencies.test.js
index 15b2960191..38c84f0b45 100644
--- a/openecomp-ui/test/softwareProduct/dependencies/SoftwareProductDependencies.test.js
+++ b/openecomp-ui/test/softwareProduct/dependencies/SoftwareProductDependencies.test.js
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import {mount} from 'enzyme';
+// import {mount} from 'enzyme';
 import {mapStateToProps} from 'sdc-app/onboarding/softwareProduct/dependencies/SoftwareProductDependencies.js';
 import {
 	SoftwareProductDependenciesResponseFactory,
diff --git a/openecomp-ui/test/softwareProduct/validation/SoftwareProductValidationActionHelper.test.js b/openecomp-ui/test/softwareProduct/validation/SoftwareProductValidationActionHelper.test.js
index 3be1d68bbc..bb8bb3f638 100644
--- a/openecomp-ui/test/softwareProduct/validation/SoftwareProductValidationActionHelper.test.js
+++ b/openecomp-ui/test/softwareProduct/validation/SoftwareProductValidationActionHelper.test.js
@@ -78,13 +78,13 @@ describe('Software Product Validation Action Helper Tests', function() {
             'softwareProduct.softwareProductValidation.vspChecks',
             vspChecksList
         );
-        mockRest.addHandler('fetch', ({ baseUrl }) => {
+        mockRest.addHandler('fetch', ({ options, data, baseUrl }) => {
             expect(baseUrl).toEqual(
                 `${restPrefix}/v1.0/externaltesting/testcasetree`
             );
             return vspChecksList;
         });
-        return SoftwareProductValidationActionHelper.fetchVspChecks(
+        SoftwareProductValidationActionHelper.fetchVspChecks(
             store.dispatch
         )
             .then(() => {